summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| * [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 master into filesystemRobin Appelman2012-11-085-5/+10
|\| |
| * | 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
| | |/
| * / fix the broken image path on the apps pageFrank Karlitschek2012-11-083-2/+2
| |/
| * Correct more data vs attr to fix #189Brice Maron2012-11-071-2/+2
* | merge master into filesystemRobin Appelman2012-11-0710-22/+25
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-071-0/+5
| * Style: Remove all the dangling white spacesFelix Moeller2012-11-048-17/+17
| * Checkstyle: Fix last six NewlineBeforeOpenBraceFelix Moeller2012-11-042-4/+2
| * Checkstyle: Fix the last 25 NoSpaceAfterCommaFelix Moeller2012-11-041-1/+1
* | merge master into filesystemRobin Appelman2012-11-046-13/+13
|\|
| * Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-044-6/+6
| * Checkstyle: many fixesFelix Moeller2012-11-023-7/+7
* | merge master into filesystemRobin Appelman2012-11-021-0/+3
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-021-0/+3
* | Merge branch 'master' into filesystemRobin Appelman2012-11-013-3/+23
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-313-3/+23
* | merge master into filesystemRobin Appelman2012-10-303-4/+24
|\|
| * Merge pull request #136 from scambra/users-fixesBart Visscher2012-10-291-2/+2
| |\
| | * fix settings routesscambra2012-10-291-2/+2