summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
...
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-117-0/+7
* | Use OC instead of oc to show alert at an error.kondou2013-07-101-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-106-0/+12
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0946-46/+0
* | Merge https://github.com/owncloud/core/pull/3827Björn Schießle2013-07-081-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-081-0/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-072-0/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-061-1/+24
|/
* Merge pull request #3927 from owncloud/Fix_new_user_empty_groupRaghu Nayyar2013-07-041-2/+4
|\
| * Do not add groups if user has no groupsVictor Dubiniuk2013-07-031-2/+4
* | revert changes which where introduced by accident during merge https://github...Björn Schießle2013-07-041-2/+3
* | move to non-static OC_DefaultsBjörn Schießle2013-07-043-8/+8
* | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-043-0/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-041-0/+3
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-022-0/+2
* Merge pull request #3894 from owncloud/ie8_compatibility_fixesThomas Müller2013-07-012-2/+11
|\
| * Use svg to png fallback on demand onlyVictor Dubiniuk2013-06-281-1/+1
| * Add fallback for svg app iconsVictor Dubiniuk2013-06-281-1/+5
| * Hide a ghost image on the apps management pageVictor Dubiniuk2013-06-282-1/+6
* | check for updates only in the community editionBjörn Schießle2013-07-011-1/+1
* | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-012-11/+17
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-291-18/+18
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-272-35/+37
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-252-0/+3
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-241-0/+1
* Merge pull request #3766 from owncloud/fix_display_name_editThomas Müller2013-06-211-1/+1
|\
| * Replace display name onlyVictor Dubiniuk2013-06-181-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-2166-19/+88
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-203-15/+56
* | Users page: username instead of login name as col header to avoid confusion w...Arthur Schiwon2013-06-181-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-181-0/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-161-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-1538-37/+40
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-144-5/+10
* Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-133-8/+13
|\
| * Merge branch 'template_updates' of github.com:owncloud/core into template_upd...Björn Schießle2013-06-122-9/+4
| |\
| | * move common settings footer fieldset out of conditionalJan-Christoph Borchardt2013-06-122-9/+4
| * | don't show translation hints in enterprise editionBjörn Schießle2013-06-121-0/+2
| |/
| * make footer and urls aware of ownCloud editionsBjörn Schießle2013-06-123-5/+13
* | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1314-16/+41
|\ \
| * \ Merge pull request #3677 from owncloud/apps-buttonsJan-Christoph Borchardt2013-06-132-6/+17
| |\ \
| | * | apps management: change misleading + to ...Jan-Christoph Borchardt2013-06-121-1/+1
| | * | remove App management top bar and move buttons more contextually in the inter...Jan-Christoph Borchardt2013-06-122-6/+17
| | |/
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-132-2/+4
| * | Merge pull request #3676 from owncloud/move-storage-barFrank Karlitschek2013-06-121-6/+9
| |\ \ | | |/ | |/|
| | * move storage bar below clients showcase to make it more visibleJan-Christoph Borchardt2013-06-111-6/+9
| * | Merge pull request #3681 from owncloud/fix_ajax_removeuser.phpMorris Jobke2013-06-121-0/+1
| |\ \
| | * | init language object before using itGeorg Ehrke2013-06-121-0/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-128-2/+10
| | |/ | |/|
* | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-111-0/+1
|\| |