summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-16102-102/+16
* Put notice about checking logs in setup warningRobin McCorkell2015-03-151-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-142-0/+12
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-132-0/+26
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-126-8/+8
* Merge pull request #14705 from rullzer/avatarcontrollerLukas Reschke2015-03-111-1/+1
|\
| * Avatar controller moved to AppFrameWorkRoeland Jago Douma2015-03-111-1/+1
* | display app update error messages - fixes #14611Thomas Müller2015-03-111-1/+5
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-104-38/+280
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-094-6/+14
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-084-0/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-072-0/+2
* adjust list of errors, more compact and readableJan-Christoph Borchardt2015-03-063-3/+9
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-068-0/+20
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-05142-618/+16
* Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-b...Morris Jobke2015-03-045-132/+4
|\
| * Let users configure security headers in their WebserverLukas Reschke2015-03-025-132/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0416-10/+38
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0324-30/+92
|/
* Merge pull request #14593 from owncloud/fix/13994Morris Jobke2015-03-022-0/+23
|\
| * Add detection for invalid CLI configuration for settings pageLukas Reschke2015-02-272-0/+23
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0276-150/+0
* | Merge pull request #14614 from jakobsack/masterMorris Jobke2015-03-012-5/+12
|\ \
| * | Improve language on backgroundjob admin pageJakob Sack2015-03-011-2/+2
| * | Rename $human_time to $relative_time in cron settingsJakob Sack2015-02-281-3/+3
| * | Add absolute time of last cronjob as hover tipJakob Sack2015-02-282-4/+11
| * | Use relative time for cron statusJakob Sack2015-02-281-3/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-018-2/+302
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-02-2822-6/+42
|/
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-2735-750/+138
|\
| * Revert "Updating license headers"Morris Jobke2015-02-2635-750/+138
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2770-196/+2
* | Merge pull request #14527 from owncloud/clarify-linkMorris Jobke2015-02-261-1/+1
|\ \
| * | clarify link on apps management to the dev documentationMorris Jobke2015-02-261-1/+1
| |/
* | Merge pull request #14474 from owncloud/move-utf-8-check-to-setupMorris Jobke2015-02-262-16/+1
|\ \ | |/ |/|
| * Move UTF-8 check to setupLukas Reschke2015-02-242-16/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-268-94/+150
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-25120-118/+4
|/
* Merge pull request #10599 from owncloud/move_passwordchange_textLukas Reschke2015-02-243-9/+13
|\
| * Make the password changed msg inline to fix #10242kondou2015-02-113-9/+13
* | Merge pull request #14009 from owncloud/installing-installed-apps-is-stupidThomas Müller2015-02-241-6/+29
|\ \
| * | don't allow installation of already installed apps - fixes #14004Thomas Müller2015-02-231-6/+29
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-242-2/+2
|/ /
* | Merge pull request #13439 from owncloud/app-filterThomas Müller2015-02-232-48/+186
|\ \
| * | Added unit test for app filterVincent Petry2015-02-232-56/+167
| * | Make the search box filter appsRobin Appelman2015-02-191-0/+27
* | | Merge pull request #14403 from owncloud/update-license-headersThomas Müller2015-02-2335-138/+750
|\ \ \
| * | | Updating license headersJenkins for ownCloud2015-02-2335-138/+750
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-232-0/+2
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-226-2/+14