summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
...
| * | Move and fix app setting navigation detectBart Visscher2012-10-293-2/+22
| |/
* | Merge branch 'master' into filesystemRobin Appelman2012-10-282-20/+20
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-282-20/+20
* | Merge branch 'master' into filesystemRobin Appelman2012-10-2725-55/+73
|\|
| * Merge branch 'routing'Bart Visscher2012-10-2725-55/+73
| |\
| | * Merge branch 'master' into routingBart Visscher2012-10-1734-66/+299
| | |\
| | * | Implement routing on javascript sideBart Visscher2012-10-051-1/+1
| | * | Fix route nameBart Visscher2012-10-051-1/+1
| | * | Make the settings ajax calls use the routerBart Visscher2012-10-0219-45/+65
| | * | Convert menu entries of settings pages to use routerBart Visscher2012-09-286-8/+7
* | | | Merge branch 'master' into filesystemRobin Appelman2012-10-271-0/+15
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-271-0/+15
* | | | move some stuff to the new apiRobin Appelman2012-10-261-2/+2
* | | | Merge branch 'master' into filesystemRobin Appelman2012-10-261-0/+34
|\| | |
| * | | show/hide navigation entries after enabling/disabling appRobin Appelman2012-10-261-0/+34
* | | | Merge branch 'master' into filesystemRobin Appelman2012-10-262-10/+13
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-262-10/+13
* | | | merge master into filesystemRobin Appelman2012-10-242-3/+3
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-241-2/+2
| * | | box-shadow can safely be used without vendor prefixesLukas Reschke2012-10-231-1/+1
* | | | merge master into filesystemRobin Appelman2012-10-235-38/+119
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-235-38/+119
* | | | Merge branch 'master' into filesystemRobin Appelman2012-10-212-2/+9
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-212-2/+9
* | | | Merge branch 'master' into filesystemRobin Appelman2012-10-203-2/+28
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-203-2/+28
* | | | merge master into filesystemRobin Appelman2012-10-183-5/+7
|\| | |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2012-10-183-5/+7
| | |/ | |/|
* | | merge master into filesystemRobin Appelman2012-10-1717-54/+169
|\| |
| * | From now on we support two german translation: formal and personalThomas Mueller2012-10-161-1/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-165-11/+94
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-163-3/+19
| * | Move isUserVerified to OC_UtilLukas Reschke2012-10-161-1/+1
| * | Password check for adminsLukas Reschke2012-10-161-2/+6
| * | Correct check for adminLukas Reschke2012-10-161-4/+2
| * | Verify passwords for adminsLukas Reschke2012-10-161-3/+11
| * | Remove verify user from personal.phpLukas Reschke2012-10-151-1/+0
| * | Revert "Verify user login before changing the password reset mail"Lukas Reschke2012-10-151-1/+0
| * | Revert "Remove old password check from changepassword and use verifyUser inst...Lukas Reschke2012-10-152-3/+5
| * | Verify user login before changing the password reset mailLukas Reschke2012-10-151-0/+1
| * | Remove old password check from changepassword and use verifyUser insteadLukas Reschke2012-10-152-5/+3
| * | Change auth checksLukas Reschke2012-10-155-19/+9
| * | Unneeded double checkLukas Reschke2012-10-151-1/+0
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-144-12/+34
| * | the Shared folder is no longer in the cacheRobin Appelman2012-10-131-6/+1
* | | merge master into filesystemRobin Appelman2012-10-135-1/+5
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-133-1/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-122-0/+2
* | | merge master into filesystemRobin Appelman2012-10-115-1/+12
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-10-114-0/+6