summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
...
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-207-6/+21
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-1949-186/+13
| * Fix grammer and dont split translatable stringTom Needham2012-09-181-2/+2
| * Added failsafes for retrieving remote apps on settings->apps page, in case ca...Sam Tuke2012-09-181-19/+25
| * Merge branch 'master' of https://github.com/owncloud/coreSam Tuke2012-09-1837-120/+215
| |\
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-1812-2/+100
| * | Fixed bug with duplicate entries for installed 3rd party apps in settings->appsSam Tuke2012-09-184-32/+82
* | | Merge branch 'master' into ocs_apiTom Needham2012-09-1734-59/+115
|\ \ \ | | |/ | |/|
| * | Use correct translation fileThomas Müller2012-09-171-1/+1
| * | $l was undefinedThomas Müller2012-09-171-0/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-1730-61/+3
| * | add a bit more spaceFrank Karlitschek2012-09-161-1/+1
| * | makes cron config layout similar to the sharing oneAlessandro Cosentino2012-09-161-6/+21
| * | structure the settings options a bit better.Frank Karlitschek2012-09-161-1/+5
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-161-0/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-153-4/+24
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-1411-0/+71
* | | Fix merge conflictsTom Needham2012-09-1392-508/+1861
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-1331-59/+0
| |/
| * Merge branch 'master' of https://github.com/owncloud/coreFrank Karlitschek2012-09-121-1/+1
| |\
| | * return a message when app could not be enabledJörn Friedrich Dreyer2012-09-121-1/+1
| * | improve the documentation for the cron config a bitFrank Karlitschek2012-09-121-2/+2
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-123-11/+43
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-111-1/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-091-0/+18
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-083-0/+31
| * adding space between) and {Thomas Mueller2012-09-0711-21/+21
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-072-1/+19
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-0613-21/+98
| * no more require_once()Thomas Mueller2012-09-054-4/+4
| * Add 'var' before some global js varsBart Visscher2012-09-051-1/+1
| * Add missing ; to js codeBart Visscher2012-09-053-5/+5
| * Merge branch 'master' of git://github.com/owncloud/coreBrice Maron2012-09-0549-95/+33
| |\
| | * Disable asking to save password when adding users.Thomas Tanghus2012-09-051-1/+1
| | * [tx-robot] updated from transifexJenkins for ownCloud2012-09-0548-94/+32
| * | Add more language name instead of codes for the setting choiceBrice Maron2012-09-051-0/+9
| |/
| * fixing translation - thx eMerzhThomas Mueller2012-09-041-1/+1
| * underline link to the app storeThomas Mueller2012-09-041-0/+2
| * Adding missing translationThomas Mueller2012-09-041-6/+8
| * [tx-robot] updated from transifexJenkins for ownCloud2012-09-0436-36/+38
| * Update settings/templates/users.phpThomas Müller2012-09-041-5/+5
| * Update settings/templates/help.phpThomas Müller2012-09-041-3/+4
| * Update settings/ajax/userlist.phpThomas Müller2012-09-041-2/+9
| * Update settings/ajax/togglegroups.phpThomas Müller2012-09-041-6/+6
| * Update settings/ajax/setloglevel.phpThomas Müller2012-09-041-3/+1
| * Update settings/ajax/setlanguage.phpThomas Müller2012-09-041-3/+3
| * Update settings/ajax/removeuser.phpThomas Müller2012-09-041-1/+1
| * Update settings/ajax/removeuser.phpThomas Müller2012-09-041-3/+3
| * Update settings/ajax/removegroup.phpThomas Müller2012-09-041-1/+1
| * Update settings/ajax/removegroup.phpThomas Müller2012-09-041-2/+2