summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-3036-52/+232
* Adding translations for settingsThomas Müller2014-10-291-1/+3
* update all translation files to js and jsonThomas Müller2014-10-29244-10890/+21588
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-291-1/+14
* Merge pull request #11600 from owncloud/refactor-appsettings-to-app-frameworkLukas Reschke2014-10-285-100/+143
|\
| * Migrate new app settings to AppFrameworkLukas Reschke2014-10-155-100/+143
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-286-8/+27
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-273-1/+28
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-265-3/+16
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2510-14/+106
* | Make files non executableLukas Reschke2014-10-241-0/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2461-62/+21
* | Merge pull request #11720 from sebomoto/groupadmin-headerJan-Christoph Borchardt2014-10-232-4/+4
|\ \
| * | "Group admin" default label (issue #7706)Sebastian Bolt2014-10-222-4/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2361-112/+114
|/ /
* | Merge pull request #11620 from owncloud/settings-sidebarLukas Reschke2014-10-222-6/+55
|\ \
| * | Add some basic sanitizationLukas Reschke2014-10-171-2/+2
| * | implement sidebar fro personal settings - bad kung-fuThomas Müller2014-10-172-10/+46
| * | first steps of sidebar for personal and admin settingsJan-Christoph Borchardt2014-10-171-0/+13
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-221-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-212-5/+16
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-203-0/+156
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-191-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1838-0/+53
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1768-1/+216
|/ /
* | fixing typo in English source stringThomas Müller2014-10-161-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-1673-1248/+558
|/
* Merge pull request #11570 from owncloud/backport-11408-masterLukas Reschke2014-10-157-207/+335
|\
| * fixing typosThomas Müller2014-10-142-1/+2
| * Refactor MailSettings controllerLukas Reschke2014-10-147-207/+334
* | introduce new app page layoutThomas Müller2014-10-1511-438/+480
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-141-4/+4
* Merge pull request #11543 from owncloud/closeSessionForAppsLoadingThomas Müller2014-10-131-0/+1
|\
| * Close session when loading appsLukas Reschke2014-10-131-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-132-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-121-0/+15
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-111-0/+3
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-102-15/+15
* Merge pull request #11428 from michag86/patch-1Morris Jobke2014-10-071-3/+6
|\
| * restrict $div to local scopemichag862014-10-071-1/+1
| * variable for found avatar divmichag862014-10-071-4/+5
| * fix for issue #10483michag862014-10-061-2/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-071-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-061-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-021-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-012-0/+10
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-302-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-292-2/+11
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-284-1/+6
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-273-0/+13