summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-174-10/+14
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-132-0/+2
* Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmtThomas Müller2015-12-111-3/+5
|\
| * reset mailadress/displayname on blurmichag862015-12-071-3/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-11122-316/+280
* | Merge pull request #21123 from owncloud/remove-db-locking-performance-warning...Thomas Müller2015-12-101-7/+1
|\ \
| * | Remove info about database locking performanceThomas Müller2015-12-101-7/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-102-2/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-092-6/+58
* | Merge pull request #21022 from owncloud/get-rid-of-by-referenceThomas Müller2015-12-082-2/+2
|\ \
| * | Use \OCP\Util::sanitizeHTML instead of \OC_Util::sanitizeHTMLLukas Reschke2015-12-082-2/+2
* | | Merge pull request #20979 from owncloud/settings-groups-entryThomas Müller2015-12-081-0/+1
|\ \ \ | |/ / |/| |
| * | Add 'my groups' anchor to the personal page sidebarPatrick Robertson2015-12-071-0/+1
| |/
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-12-071-1/+0
* | Merge pull request #20954 from owncloud/settings_user_only_load_avatar_if_ava...Thomas Müller2015-12-073-4/+21
|\ \
| * | Do not request an avatar if there is noneRoeland Jago Douma2015-12-041-2/+6
| * | Only try to load avatars in the user list if there is anyRoeland Jago Douma2015-12-042-2/+15
* | | Merge pull request #20959 from owncloud/drop-OC_App-setActiveNavigationEntryThomas Müller2015-12-073-3/+3
|\ \ \ | |_|/ |/| |
| * | Remove unused setActiveNavigationEntry of OC_App - it's also in OCP\AppMorris Jobke2015-12-043-3/+3
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-12-052-0/+2
|/
* [Avatars] JS should not load same avatar twiceRoeland Jago Douma2015-12-041-2/+1
* Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the...Thomas Müller2015-12-032-10/+15
|\
| * User IUser::getEMailAddress() all over the placeThomas Müller2015-12-022-10/+15
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-034-8/+10
|/
* Remove OC_Config from app management templateMorris Jobke2015-12-022-1/+2
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-022-6/+6
* Add code integrity checkLukas Reschke2015-12-013-3/+89
* Merge pull request #20850 from owncloud/use-text-instead-of-htmlThomas Müller2015-12-011-3/+3
|\
| * Use .text instead of .htmlLukas Reschke2015-11-301-3/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-012-6/+20
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-302-6/+8
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-282-6/+16
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-272-10/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-262-6/+14
* [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