summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13949 from rullzer/no_negative_expireVincent Petry2015-08-071-0/+7
|\
| * Do not allow invalid default expire daysRoeland Jago Douma2015-07-041-0/+7
* | Merge pull request #18083 from owncloud/user-search-boxJan-Christoph Borchardt2015-08-074-45/+29
|\ \
| * | use the main search box to filter users in user managementRobin Appelman2015-08-054-45/+29
* | | Merge pull request #17810 from owncloud/better-enc-warningsBernhard Posselt2015-08-062-3/+16
|\ \ \
| * | | condense doc warnings into small section that gets showed to the user before ...Bernhard Posselt2015-07-222-3/+16
* | | | also block certificate management in the back-end if external storages are di...Bjoern Schiessle2015-08-042-2/+35
* | | | only add the possibility to import ssl root certificates to the personalBjoern Schiessle2015-08-042-1/+19
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-032-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-024-0/+10
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-0116-0/+54
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-3196-228/+92
* | | Merge pull request #17805 from owncloud/avatar-handle-errorsRoeland Douma2015-07-312-2/+34
|\ \ \
| * | | [avatar] add error handlers for avatar setupMorris Jobke2015-07-302-2/+34
* | | | Merge pull request #17994 from owncloud/server-statusRobin McCorkell2015-07-302-13/+14
|\ \ \ \ | |/ / / |/| | |
| * | | correct order and capitalization of 'Server status' admin settings entry, fix...Jan-Christoph Borchardt2015-07-302-13/+14
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-306-2/+16
* | | | [admin settings] only retrieve log file size if file existsMorris Jobke2015-07-291-1/+4
|/ / /
* | | Merge pull request #17946 from owncloud/settings-users-apprenderedforsearchboxMorris Jobke2015-07-291-0/+4
|\ \ \
| * | | Trigger "apprendered" event in users pageVincent Petry2015-07-291-0/+4
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-2962-0/+70
* | | | Merge pull request #17912 from owncloud/detect-old-openssl-versionsRobin McCorkell2015-07-282-2/+71
|\ \ \ \
| * | | | Detect old NSS and OpenSSL versionsLukas Reschke2015-07-282-2/+71
* | | | | Add unit testsLukas Reschke2015-07-281-13/+25
* | | | | set logger in constructorBjoern Schiessle2015-07-281-0/+1
|/ / / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-07-286-0/+36
|/ / /
* | | Allow classes in <h2> tagsLukas Reschke2015-07-262-4/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-268-4/+16
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-254-14/+24
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-2410-0/+24
* | | Merge pull request #17818 from owncloud/fix-password-change-error-always-show...Roeland Douma2015-07-231-2/+2
|\ \ \
| * | | assign error message to correct objectmichag862015-07-221-2/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-23116-266/+98
|/ / /
* | | use arrow to indicate external link, use correct quotes and capitalizationJan-Christoph Borchardt2015-07-221-2/+2
* | | make sure that there is a space between user- and admin-documentationBjoern Schiessle2015-07-221-4/+4
|/ /
* | don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-172-3/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-172-38/+38
* | Merge pull request #17500 from owncloud/encryption_migration_improvementsThomas Müller2015-07-161-0/+2
|\ \
| * | only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-081-0/+2
* | | Handle returned null value in app level codeMorris Jobke2015-07-131-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-114-2/+8
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-102-16/+16
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-07-092-2/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-082-4/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-072-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-054-0/+28
|/
* Remove OC_AppconfigThomas Müller2015-07-031-1/+1
* Remove OC_LogThomas Müller2015-07-031-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-036-2/+38
* Unit test for app listVincent Petry2015-07-021-0/+26