summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [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
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-214-0/+18
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-206-0/+38
* | | Merge pull request #14199 from owncloud/cast-type-manuallyMorris Jobke2015-02-1913-17/+17
|\ \ \
| * | | This is an arrayLukas Reschke2015-02-131-1/+1
| * | | Manually type-case all AJAX filesLukas Reschke2015-02-1313-17/+17
* | | | Merge pull request #14295 from owncloud/encode-request-token-for-avatarsThomas Müller2015-02-191-2/+2
|\ \ \ \
| * | | | Encode Requesttoken for avatarsLukas Reschke2015-02-171-2/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1920-26/+82
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1822-12/+54
* | | | Use APCu only if available in version 4.0.6 and higherLukas Reschke2015-02-172-0/+19
|/ / /
* | | Merge pull request #14056 from owncloud/refactor/13976Lukas Reschke2015-02-171-2/+3
|\ \ \
| * | | Refactor OC_Request into TrustedDomainHelper and IRequestLukas Reschke2015-02-161-2/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-17112-180/+8
|/ / /
* | | Merge pull request #14261 from owncloud/fix-last-login-masterLukas Reschke2015-02-161-1/+1
|\ \ \
| * | | Return milliseconds instead of seconds for lastLogin - refs #14005Thomas Müller2015-02-161-1/+1
* | | | Merge pull request #14128 from owncloud/drop-unused-methodsMorris Jobke2015-02-162-21/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused function and correct PHPDocLukas Reschke2015-02-162-21/+0