aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-314-0/+76
* Check whether return is an error case before using itJoas Schilling2015-01-301-8/+12
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-3010-4/+14
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-2924-8/+32
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-284-0/+74
* Merge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not...Lukas Reschke2015-01-274-9/+69
|\
| * Add value if restore of data is possible for a userMorris Jobke2015-01-274-9/+69
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-272-0/+6
|/
* Merge pull request #13621 from owncloud/system-config-multisetThomas Müller2015-01-261-10/+11
|\
| * Use setConfigs() instead of calling setConfig() multiple timesJoas Schilling2015-01-231-10/+11
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-254-0/+12
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-246-0/+16
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-2222-2/+60
* Merge pull request #13519 from Sugaroverdose/fix_#13500Thomas Müller2015-01-211-1/+2
|\
| * do not clear fields until request return successSugaroverdose2015-01-201-1/+2
* | Merge pull request #13559 from owncloud/increase-log-table-marginMorris Jobke2015-01-211-1/+4
|\ \
| * | add margin to log table - fixes #13558Morris Jobke2015-01-211-1/+4
* | | use title instead of nameMorris Jobke2015-01-211-1/+1
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-01-212-2/+2
|/
* Merge pull request #13494 from owncloud/windows_warningMorris Jobke2015-01-202-5/+18
|\
| * add a Windows warningFrank Karlitschek2015-01-202-5/+18
* | Merge pull request #13454 from owncloud/improve-empty-displaynameJoas Schilling2015-01-201-2/+2
|\ \
| * | also show message for empty display name if change of it isn't allowedMorris Jobke2015-01-191-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-208-2/+30
| |/ |/|
* | Merge pull request #13419 from owncloud/drop-animation-user-listThomas Müller2015-01-191-7/+0
|\ \
| * | Drop the hide and show of new users in user listMorris Jobke2015-01-161-7/+0
* | | Merge pull request #13443 from owncloud/fix-filtering-for-usersThomas Müller2015-01-191-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix filtering for users when $gid is emptyLukas Reschke2015-01-181-1/+1
* | | Merge pull request #13447 from owncloud/fix_typoJoas Schilling2015-01-191-1/+1
|\ \ \
| * | | fix typo - caused by 3d997e8c62bd752f38bcc11f02fb2af0e46d9154Morris Jobke2015-01-181-1/+1
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-01-192-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-182-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1724-18/+252
|/
* Merge pull request #13413 from owncloud/apps-cancelloadonswitchMorris Jobke2015-01-161-2/+9
|\
| * Cancel app list load when switching categoriesVincent Petry2015-01-161-2/+9
* | sorting enabled and disabled apps alphabetically - fixes #13404Thomas Müller2015-01-161-0/+16
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-162-2/+2
* Show mail address & display name if it is read onlyMorris Jobke2015-01-151-0/+14
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-152-0/+62
* adapt decrypt all and restore/delete key backups to the new folder structure ...Bjoern Schiessle2015-01-132-17/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-134-20/+30
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-124-4/+18
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-1110-12/+32
* Merge pull request #13212 from owncloud/cache-appstore-responseMorris Jobke2015-01-106-44/+75
|\
| * Cache responses from the AppStore serverLukas Reschke2015-01-096-44/+75
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-1026-8/+124
|/
* Fix js error in personal settings if there is no password fieldRobin Appelman2015-01-091-1/+3
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-0924-6/+46
* Merge pull request #12988 from owncloud/logfile_downloadMorris Jobke2015-01-099-50/+168
|\
| * add Download logfile button to admin settingsGeorg Ehrke2015-01-079-50/+168