summaryrefslogtreecommitdiffstats
path: root/settings/ajax
Commit message (Collapse)AuthorAgeFilesLines
* Use !== and === in settings.kondou2013-07-217-12/+12
|
* Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-131-0/+1
|\ | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
| * Merge pull request #3681 from owncloud/fix_ajax_removeuser.phpMorris Jobke2013-06-121-0/+1
| |\ | | | | | | Init language object before using it
| | * init language object before using itGeorg Ehrke2013-06-121-0/+1
| | |
* | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-101-8/+22
|\| | | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php
| * | use pre_setPassword hook to update the encryption keys if the back-end ↵Björn Schießle2013-06-061-9/+21
| |/ | | | | | | doesn't support password change; improved output to let the admin know what happened
* | only check for recovery key if someone else than the user wants to change ↵Björn Schießle2013-06-071-1/+1
| | | | | | | | the password
* | fix password change when files_encryption app is disabledFlorin Peter2013-06-031-23/+29
|/
* display a warning if the user has enabled file recovery but the admin tries ↵Björn Schießle2013-05-181-3/+7
| | | | to change the users password without a recovery password
* show nicer warning if the admin recovery password was wrongBjörn Schießle2013-05-161-1/+1
|
* some error handling in case the recovery password is wrongBjörn Schießle2013-05-161-2/+5
|
* allow admin to recover users files in case of password lostBjörn Schießle2013-05-161-2/+3
|
* fix inconsistent post parameters in change password operationBjörn Schießle2013-05-081-1/+1
|
* allow to set quota to zero, issue #2696Björn Schießle2013-05-071-5/+1
|
* Fix retrieval of users with multiple backendsArthur Schiwon2013-05-031-2/+7
|
* Merge pull request #3098 from jerrac/displaynamesaveontimeoutMorris Jobke2013-04-251-1/+3
|\ | | | | On the Personal Settings page, made the display name save like the email address saves
| * Fixed comment in personal.js. Changed message text in changedisplayname.php.David Reagan2013-04-231-1/+1
| |
| * Made saving the display name work the same way as the email address. Fixed a ↵David Reagan2013-04-231-1/+3
| | | | | | | | few comparison operators. Increased the fadeOut time for the success and error messages.
* | fix syntax layoutMorris Jobke2013-04-231-3/+6
| |
* | fix logical issue while retrieving log via ajaxMorris Jobke2013-04-231-1/+1
|/
* fixes #2743 - use public OC_User::getDisplayName instead of ↵Thomas Mueller2013-04-081-1/+1
| | | | OC_User::determineDisplayName
* Add log as text and not as HTMLLukas Reschke2013-03-031-9/+2
|
* Fix encoding settings ajax getlogBart Visscher2013-03-031-1/+10
|
* Whitespace fixesBart Visscher2013-02-221-31/+31
|
* Merge pull request #1855 from owncloud/userlist_load_displaynamesBernhard Posselt2013-02-221-2/+4
|\ | | | | Fetch displayname in userlist ajax requests. Refs #1681
| * Fetch displayname in userlist ajax requests. Refs #1681Thomas Tanghus2013-02-221-2/+4
| |
* | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-222-2/+6
|\ \ | |/ |/| Codestyle cleanup
| * Style cleanup settingsBart Visscher2013-02-212-2/+6
| |
* | Fix error path in changedisplayname callBart Visscher2013-02-221-2/+2
|/
* Do not set password if it has't providedVictor Dubiniuk2013-02-181-2/+2
|
* Merge branch 'master' into fixing-1424-masterThomas Mueller2013-02-113-8/+9
|\
| * I'm an evil bastard and I commit this 3 letter text fix without a pull request.Frank Karlitschek2013-02-091-1/+1
| |
| * add switch to enable/disable the possibility to change the display name by ↵Björn Schießle2013-02-101-0/+4
| | | | | | | | the user
| * Merge pull request #1577 from owncloud/typo_catagoryLukas Reschke2013-02-101-3/+3
| |\ | | | | | | Typo
| | * TypoLukas Reschke2013-02-091-3/+3
| | |
| * | Remove uneeded linesLukas Reschke2013-02-091-4/+1
| | |
* | | Merge branch 'master' into fixing-1424-masterThomas Müller2013-02-094-6/+5
|\| |
| * | Merge pull request #1546 from owncloud/fix-loading-hooksThomas Müller2013-02-091-4/+1
| |\ \ | | | | | | | | Fix loading hooks when going though the routing system
| | * | Better way of getting the navigation entries for an appBart Visscher2013-02-081-4/+1
| | |/
| * / Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-094-2/+4
| |/
* / on creation only test for existing users if the backend supports user creationThomas Müller2013-02-081-6/+0
|/ | | | this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
* Merge pull request #1506 from owncloud/files_encryptionLukas Reschke2013-02-061-0/+3
|\ | | | | Files encryption
| * 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
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 12:34:55 +0000