aboutsummaryrefslogtreecommitdiffstats
path: root/settings/ajax
Commit message (Collapse)AuthorAgeFilesLines
...
| * Reverted fix temporarily; another fix by LukasReschke is awaiting mergeSam Tuke2013-02-061-1/+3
| |
| * Added commentSam Tuke2013-02-061-0/+1
| |
| * Fixed bug causing password change related hooks to not be called due to ajaxSam Tuke2013-02-061-0/+2
| |
| * Removed call to depreciated isUserVerified()Sam Tuke2013-02-061-3/+1
| |
* | Merge pull request #1363 from owncloud/FixPasswordChangeLukas Reschke2013-02-061-8/+2
|\ \ | |/ |/| Fix password change
| * Fix indentationLukas Reschke2013-01-301-1/+1
| |
| * Remove the no longer existing function "isUserVerified"Lukas Reschke2013-01-301-7/+1
| | | | | | | | Thx @eMerzh
* | make strings translatableBjörn Schießle2013-02-061-2/+2
| |
* | let the user change his display name, if supported by the back-endBjörn Schießle2013-02-061-2/+3
| |
* | Cleanup string - easier for translatorsThomas Mueller2013-01-311-1/+1
| |
* | fix typoFrank Karlitschek2013-01-301-1/+1
| |
* | merge masterFrank Karlitschek2013-01-307-15/+37
|\| | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| * check permissions before changing the display nameBjörn Schießle2013-01-291-0/+13
| |
| * added missing changedisplayname.phpBjörn Schießle2013-01-291-0/+15
| |
| * Spaces to tabsBart Visscher2013-01-161-2/+2
| |
| * Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-141-4/+0
| | | | | | | | | | | | Let's remove it, it's also not secure anymore with the introduction of our API etc... (And doesn't work with ldap etc…)
| * Add a closing )Lukas Reschke2013-01-141-1/+1
| | | | | | | | Thanks Jenkins!
| * CP failLukas Reschke2013-01-141-1/+1
| |
| * Check if user is admin - boolLukas Reschke2013-01-146-9/+7
| | | | | | | | | | | | | | | | | | | | | | There was no "isAdminUser()" function which returned bool. This is irritiating as there were a loooooooot of places in the code which checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not use a function for this? (Especially if you consider that we might change the group name in the future, which would lead to problems then) Additionally, @Raydiation needed such a method for his AppFramework :)
* | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-301-1/+6
| |
* | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-212-0/+18
|/
* Merge pull request #1157 owncloud/move-OpenIDBart Visscher2013-01-111-16/+0
|\ | | | | | | | | | | | | Move openid.php to apps repo Conflicts: settings/routes.php
| * Move to apps repoLukas Reschke2013-01-111-16/+0
| | | | | | | | This belongs to the apps repo.
* | Merge pull request #1150 from owncloud/EnableSSL-AdminMenuLukas Reschke2013-01-111-0/+13
|\ \ | | | | | | Add security section to admin settings to enable the HTTPS enforcement
| * | Add security section to admin menuLukas Reschke2013-01-111-0/+13
| |/ | | | | | | | | | | | | | | | | Currently it only allows the admin to enable or disable the HTTPS enforcement, but in the future it could be expanded to further options. The HTTPS enforcement only allows the admin to enforce it, if he is connected via HTTPS. (To prevent admins to enable it without a proper SSL setup)
* / Remove setContentTypeHeader()Lukas Reschke2013-01-112-2/+0
|/ | | | | | `OC_JSON::success` and `OC_JSON::error` are calling `OC_JSON::encodedPrint`, which already sets these headers. So this two calls are uneeded duplicates.
* Fix "There must be a single space between the closing parenthesis and the ↵Bart Visscher2012-12-151-1/+1
| | | | opening brace"
* 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
* | make some checks server-sideGeorg Ehrke2012-11-281-0/+6
|/
* Better check and handling of user creationBart Visscher2012-11-141-2/+5
|
* Fixed new checkstyle issues in ocs.php from build #1341.Diederik de Haas2012-11-101-1/+1
|
* fix the broken image path on the apps pageFrank Karlitschek2012-11-081-1/+1
|
* Style: Remove all the dangling white spacesFelix Moeller2012-11-043-9/+9
|
* Checkstyle: Fix last six NewlineBeforeOpenBraceFelix Moeller2012-11-041-2/+1
|
* Checkstyle fixes: NoSpaceAfterCommaFelix Moeller2012-11-041-1/+1
|
* Checkstyle: many fixesFelix Moeller2012-11-021-1/+1
|
* Move and fix app setting navigation detectBart Visscher2012-10-291-0/+18
|
* Merge branch 'master' into routingBart Visscher2012-10-174-21/+22
|\ | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
| * 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
| |
| * 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-151-1/+2
| | | | | | | | | | | | 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-151-2/+1
| |
| * Change auth checksLukas Reschke2012-10-153-19/+7
| |
| * Unneeded double checkLukas Reschke2012-10-151-1/+0
| |
| * Disallow users to delete their own accountsLukas Reschke2012-10-101-1/+6
| |