summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | | | | | | Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
| | * 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 doesn't need to be sanitized before storing it in the database
| | * Group name does't need to be sanitized before storing it in the databaseBart Visscher2012-11-272-2/+2
| | | | | | | | | | | | It should only be sanitized before display
* | | 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
| | | | | | | | | | | | This reverts commit a5774229a13ef307dabe3142d1a85f12bf41b391.
| * | 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
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-281-0/+1
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-271-0/+1
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-261-0/+2
| |
* | merge master into filesystemRobin Appelman2012-11-232-0/+31
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-231-0/+1
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-221-0/+30
| |
* | merge master into filesystemRobin Appelman2012-11-215-10/+36
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-212-5/+6
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-204-5/+30
| |
* | merge master into filesystemRobin Appelman2012-11-184-0/+49
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-182-0/+47
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-172-0/+2
| |
* | Merge branch 'master' into filesystemRobin Appelman2012-11-162-16/+14
|\|
| * Merge pull request #433 from owncloud/user_setting_fixesThomas Müller2012-11-152-16/+14
| |\ | | | | | | User setting fixes
| | * Better check and handing of user deletionBart Visscher2012-11-141-0/+2
| | |
| | * Better check and handling of user creationBart Visscher2012-11-141-2/+5
| | |
| | * Always have the username as string in user adminBart Visscher2012-11-141-6/+6
| | |
| | * Cleanup user settings jsBart Visscher2012-11-141-8/+1
| | |
* | | merge master into filesystemRobin Appelman2012-11-1564-684/+174
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-151-0/+2
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-142-0/+2
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-133-0/+14
| |
| * Fix deleting multiple user w-o reloading V2Brice Maron2012-11-121-1/+4
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-125-4/+12
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-111-0/+1
| |
| * Fixed new checkstyle issues in apps.php from build #1341.Diederik de Haas2012-11-101-1/+1
| |
| * Fixed new checkstyle issues in ocs.php from build #1341.Diederik de Haas2012-11-101-1/+1
| |