summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-252-6/+8
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-244-12/+18
* Merge pull request #20222 from owncloud/federated_sharing_auto_completeThomas Müller2015-11-232-5/+5
|\
| * change 'cronstatus' to 'status' so that it can be used in other apps tooBjörn Schießle2015-11-192-5/+5
* | Merge pull request #20559 from owncloud/settings_app_to_controllerThomas Müller2015-11-235-71/+57
|\ \
| * | Moved changedisplayname to usercontrollerRoeland Jago Douma2015-11-205-71/+57
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-232-0/+16
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-224-0/+30
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-2110-0/+14
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-11-20114-124/+10
|/
* Merge pull request #20533 from owncloud/log-levelThomas Müller2015-11-191-9/+10
|\
| * clarify log level setting design, fix #20514Jan-Christoph Borchardt2015-11-181-9/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-192-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-114-0/+8
* Merge pull request #20176 from owncloud/font-styleThomas Müller2015-11-101-1/+2
|\
| * move font back from Light to Regular for body text on normal-res screens, fix...Jan-Christoph Borchardt2015-11-101-1/+2
* | Merge pull request #20436 from owncloud/checkboxThomas Müller2015-11-101-1/+1
|\ \ | |/ |/|
| * use new checkbox style for Apps mgmt settingsJan-Christoph Borchardt2015-11-101-1/+1
* | Fix #18072Thomas Müller2015-11-101-10/+2
|/
* Merge pull request #20383 from owncloud/fix-setupchecks-messagesThomas Müller2015-11-091-28/+36
|\
| * Properly detect setup check messages set in the HTML templateRobin McCorkell2015-11-081-28/+36
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-092-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-082-0/+4
|/
* Show the language code in personal settings for unknown languagesMorris Jobke2015-11-061-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-064-0/+46
* Merge pull request #20283 from owncloud/fix-varaible-typeThomas Müller2015-11-041-4/+4
|\
| * Fix typo in variable nameMorris Jobke2015-11-041-4/+4
* | Merge pull request #20157 from owncloud/users-fixeveryonecountThomas Müller2015-11-044-60/+41
|\ \ | |/ |/|
| * fix subadmin user count for empty groupsMorris Jobke2015-11-041-0/+1
| * Fix everyone count for subadminsVincent Petry2015-10-294-60/+40
* | [tx-robot] updated from transifexJenkins for ownCloud2015-11-044-0/+6
* | Merge pull request #20201 from owncloud/checkboxes-groups-enableThomas Müller2015-11-032-18/+10
|\ \
| * \ Merge branch 'master' into checkboxes-groups-enableRaghu Nayyar2015-11-026-0/+22
| |\ \
| * | | new checkbox style in app settingsHendrik Leppelsack2015-10-312-18/+10
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-032-0/+2
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-024-0/+16
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-012-0/+6
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-312-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-10-306-2/+6
|/
* Merge pull request #20135 from owncloud/check-if-null-subadminThomas Müller2015-10-2911-96/+124
|\
| * Drop OC_SubAdmin and replace usagesLukas Reschke2015-10-2911-96/+124
* | apply new checkbox style in users settingsHendrik Leppelsack2015-10-291-5/+5
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-296-2/+52
* Initially load at least 250 usersJörn Friedrich Dreyer2015-10-281-6/+11
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-2814-0/+16
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-2772-80/+140
* Merge pull request #19813 from owncloud/stay-on-apps-category-refreshThomas Müller2015-10-264-27/+172
|\
| * Fix backwards and forward buttonJoas Schilling2015-10-261-1/+12
| * Use speaking idsJoas Schilling2015-10-263-11/+44
| * Fix backspace in search and empty content messageJoas Schilling2015-10-261-4/+9