summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into routingBart Visscher2012-10-1734-66/+299
|\ | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
| * 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
| | | | | | | | This reverts commit 9aa9110fd906bc9191adbb129bf421ede77ccad7.
| * Revert "Remove old password check from changepassword and use verifyUser ↵Lukas Reschke2012-10-152-3/+5
| | | | | | | | | | | | instead" This reverts commit e6b8153865a521a4750ec44016c5f22f453edfe1.
| * 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
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-133-1/+3
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-122-0/+2
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-114-0/+6
| |
| * Disallow users to delete their own accountsLukas Reschke2012-10-101-1/+6
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-108-8/+16
| |
| * fix a lot of small layout bugs and make the apps page overall prettier plus ↵Frank Karlitschek2012-10-083-1/+7
| | | | | | | | add ratings finally
| * no garbage on the screen pleaseFrank Karlitschek2012-10-081-0/+1
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-071-1/+1
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-061-2/+2
| |
| * don´t show negative numbers. this is only a quickfix. I still dont get why ↵Frank Karlitschek2012-10-041-0/+1
| | | | | | | | the Shared folder can be bigger than the root folder. Perhaps a inconsitency in the filecache?
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-041-0/+18
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-021-0/+6
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-021-0/+3
| |
| * Merge pull request #21 from raghunayyar/masterLukas Reschke2012-09-291-1/+1
| |\ | | | | | | CSS typo fixed.
| | * Update settings/css/settings.cssRaghu Nayyar2012-09-291-1/+1
| | | | | | | | | CSS typo fixed.
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-09-281-0/+61
| | |
* | | 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
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2012-09-282-30/+32
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2012-09-261-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2012-09-262-0/+19
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2012-09-253-7/+84
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2012-09-244-1/+31
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2012-09-231-0/+3
|/
* [tx-robot] updated from transifexJenkins for ownCloud2012-09-224-0/+31
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-09-213-0/+12
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-09-207-6/+21
|
* [tx-robot] updated from transifexJenkins for ownCloud2012-09-1949-186/+13
|
* Fix grammer and dont split translatable stringTom Needham2012-09-181-2/+2
|
* Added failsafes for retrieving remote apps on settings->apps page, in case ↵Sam Tuke2012-09-181-19/+25
| | | | categories or app data are not found
* Merge branch 'master' of https://github.com/owncloud/coreSam Tuke2012-09-1837-120/+215
|\