summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge master into ocs_api, fix conflicts.Tom Needham2012-12-1493-834/+589
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-142-0/+2
| * [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
| * [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 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
| |/
| * [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
| * | 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
| * | [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
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-231-0/+1
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-221-0/+30
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-212-5/+6
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-204-5/+30
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-182-0/+47
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-172-0/+2
| * Merge pull request #433 from owncloud/user_setting_fixesThomas Müller2012-11-152-16/+14
| |\
| | * 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
| * | [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
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-1049-620/+34
| * Merge pull request #330 from owncloud/check_connectionThomas Müller2012-11-093-0/+16
| |\
| | * add a check and a warning if the ownClodu server is not able to establish htt...Frank Karlitschek2012-11-083-0/+16
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0915-0/+57
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-0944-59/+25
| * | Fix delete link when new user is addedBrice Maron2012-11-081-1/+8
| * | Merge pull request #326 from owncloud/add_creditsThomas Müller2012-11-081-1/+6
| |\ \
| | * | add credits to personal page too so that non admins can see what they run.Frank Karlitschek2012-11-081-1/+6
| | |/