summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-12-2564-1085/+953
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-251-0/+12
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-242-0/+45
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-234-2/+15
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-227-0/+82
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-2154-1/+115
| * Merge pull request #970 from owncloud/fixing-950-masterJan-Christoph Borchardt2012-12-201-394/+402
| |\
| | * adding missing translations for various strings + fixing tool tip on deleteThomas Müller2012-12-201-394/+402
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-2057-537/+59
| |/
| * [l18n] fixing typos in source textThomas Müller2012-12-191-100/+121
| * Merge pull request #961 from owncloud/check_localeFrank Karlitschek2012-12-192-0/+15
| |\
| | * add a check and a warning if setlocale is workingFrank Karlitschek2012-12-192-0/+15
| * | Merge pull request #868 from owncloud/new_doc_systemFrank Karlitschek2012-12-193-42/+56
| |\ \ | | |/ | |/|
| | * fixing links docu/ ->doc/Thomas Mueller2012-12-141-2/+2
| | * make it more readableFrank Karlitschek2012-12-141-3/+7
| | * show the link to the issue tracker only for Admins as discussed with Björn a...Frank Karlitschek2012-12-131-1/+1
| | * a bit more polish. We are getting there.Frank Karlitschek2012-12-133-2/+12
| | * first version of the new documentation system integration.Frank Karlitschek2012-12-122-42/+42
| * | Merge pull request #913 from owncloud/fix_settingsFrank Karlitschek2012-12-182-16/+21
| |\ \
| | * | cleaning up the settings. standardize the format, add missing I10N and other ...Frank Karlitschek2012-12-152-16/+21
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-191-0/+1
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-181-0/+16
| |/ /
* | | merge master into filesystemRobin Appelman2012-12-155-3/+5
|\| |
| * | More style fixesBart Visscher2012-12-151-1/+1
| * | More whitespace fixesBart Visscher2012-12-151-1/+1
| * | Fix "There must be a single space between the closing parenthesis and the ope...Bart Visscher2012-12-151-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-142-0/+2
| |/
* | Merge branch 'master' into filesystemRobin Appelman2012-12-113-22/+25
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-111-1/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-101-22/+22
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-092-0/+2
* | merge master into filesystemRobin Appelman2012-12-069-1/+45
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-061-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-054-1/+40
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-044-0/+4
* | merge master into filesystemRobin Appelman2012-12-038-1/+11
|\|
| * Merge pull request #682 from VicDeo/masterThomas Müller2012-12-031-1/+1
| |\
| | * Check if we have an array with data. Fix #487Victor Dubiniuk2012-12-021-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-12-037-0/+10
| |/
* | merge master into filesystemRobin Appelman2012-12-0215-2/+30
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-024-0/+19
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-019-0/+9
| * Merge pull request #603 from owncloud/store_plain_groupnameBart Visscher2012-11-302-2/+2
| |\
| | * Group name does't need to be sanitized before storing it in the databaseBart Visscher2012-11-272-2/+2
* | | merge master into filesystemRobin Appelman2012-11-305-7/+12
|\| |
| * | use attr instead of dataGeorg Ehrke2012-11-291-7/+2
| * | Revert "fix group and subadmin managing for 'ajax-loaded' users"Georg Ehrke2012-11-291-2/+7
| * | add a client side checkGeorg Ehrke2012-11-281-0/+3
| * | fix group and subadmin managing for 'ajax-loaded' usersGeorg Ehrke2012-11-281-7/+2
| * | make some checks server-sideGeorg Ehrke2012-11-282-3/+6