Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | check if user is logged in | Bjoern Schiessle | 2013-11-26 | 1 | -0/+3 |
| | |||||
* | change 'Display Name' to more understandable 'Full Name', fix #5612 | Jan-Christoph Borchardt | 2013-11-06 | 1 | -2/+2 |
| | |||||
* | Fixed user dir existence check when creating new user | Vincent Petry | 2013-10-25 | 1 | -4/+4 |
| | | | | | | The check was done too later. It turns out that createUser() had already created the dir, which caused the warning message to be shown every time. | ||||
* | Added warning notification when user home already exists | Vincent Petry | 2013-10-22 | 1 | -0/+7 |
| | | | | | | | When creating a user and the home already exists in the data dir, a warning notification will be displayed. Fixes #5161 | ||||
* | Move ajax/changepassword to changepassword/controller to use autoloading | kondou | 2013-09-13 | 1 | -98/+0 |
| | |||||
* | Use a controller instead of two files for changepassword.php | kondou | 2013-09-11 | 2 | -77/+84 |
| | |||||
* | Remove $recoveryPassword from changepersonalpassword & fix indent | kondou | 2013-09-06 | 2 | -9/+12 |
| | |||||
* | Split personal and user-mgmt password change logic | kondou | 2013-09-06 | 2 | -18/+42 |
| | |||||
* | Merge pull request #4563 from owncloud/use_personal-password | Jan-Christoph Borchardt | 2013-08-28 | 1 | -1/+1 |
|\ | | | | | Use personal-password for the password name in personal.php | ||||
| * | Use personal-password for the password name in personal.php | kondou | 2013-08-24 | 1 | -1/+1 |
| | | | | | | | | Fix #4491 | ||||
* | | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 5 | -4/+29 |
|\| | | | | | | | | | Conflicts: settings/js/apps.js | ||||
| * | Merge pull request #4447 from owncloud/fix_4351_master | Morris Jobke | 2013-08-20 | 1 | -1/+1 |
| |\ | | | | | | | Use JSON to send/receive group data. | ||||
| | * | Use JSON to send/receive group data. | Owen Winkler | 2013-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | Squashed commits from PR #4364 for master. | ||||
| * | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 1 | -0/+25 |
| |\ \ | | | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| | * | | improved error handling | Bjoern Schiessle | 2013-07-30 | 1 | -4/+8 |
| | | | | |||||
| | * | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 1 | -8/+15 |
| | | | | |||||
| | * | | add decryptall.php | Björn Schießle | 2013-07-29 | 1 | -0/+14 |
| | |/ | |||||
| * | | Merge pull request #4497 from owncloud/newlines_at_eof_kondou | Kondou | 2013-08-18 | 2 | -2/+2 |
| |\ \ | | | | | | | | | Add newlines at the end of files | ||||
| | * | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 2 | -2/+2 |
| | |/ | |||||
| * | | Add trailing comma for all touched array lines. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fix spacing of all touched lines. | Andreas Fischer | 2013-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Compare result are already true/false | Bart Visscher | 2013-08-17 | 1 | -1/+1 |
| |/ | |||||
* | | Log exception at the catching code | kondou | 2013-08-09 | 1 | -0/+1 |
| | | |||||
* | | Improve app-management | kondou | 2013-08-06 | 1 | -6/+5 |
|/ | | | | | | | | - Better error messages - Translate untranslated strings Basically picks non-app-dependency related stuff from #4017 | ||||
* | Use !== and === in settings. | kondou | 2013-07-21 | 7 | -12/+12 |
| | |||||
* | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php | ||||
| * | Merge pull request #3681 from owncloud/fix_ajax_removeuser.php | Morris Jobke | 2013-06-12 | 1 | -0/+1 |
| |\ | | | | | | | Init language object before using it | ||||
| | * | init language object before using it | Georg Ehrke | 2013-06-12 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-10 | 1 | -8/+22 |
|\| | | | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php | ||||
| * | | use pre_setPassword hook to update the encryption keys if the back-end ↵ | Björn Schießle | 2013-06-06 | 1 | -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ßle | 2013-06-07 | 1 | -1/+1 |
| | | | | | | | | the password | ||||
* | | fix password change when files_encryption app is disabled | Florin Peter | 2013-06-03 | 1 | -23/+29 |
|/ | |||||
* | display a warning if the user has enabled file recovery but the admin tries ↵ | Björn Schießle | 2013-05-18 | 1 | -3/+7 |
| | | | | to change the users password without a recovery password | ||||
* | show nicer warning if the admin recovery password was wrong | Björn Schießle | 2013-05-16 | 1 | -1/+1 |
| | |||||
* | some error handling in case the recovery password is wrong | Björn Schießle | 2013-05-16 | 1 | -2/+5 |
| | |||||
* | allow admin to recover users files in case of password lost | Björn Schießle | 2013-05-16 | 1 | -2/+3 |
| | |||||
* | fix inconsistent post parameters in change password operation | Björn Schießle | 2013-05-08 | 1 | -1/+1 |
| | |||||
* | allow to set quota to zero, issue #2696 | Björn Schießle | 2013-05-07 | 1 | -5/+1 |
| | |||||
* | Fix retrieval of users with multiple backends | Arthur Schiwon | 2013-05-03 | 1 | -2/+7 |
| | |||||
* | Merge pull request #3098 from jerrac/displaynamesaveontimeout | Morris Jobke | 2013-04-25 | 1 | -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 Reagan | 2013-04-23 | 1 | -1/+1 |
| | | |||||
| * | Made saving the display name work the same way as the email address. Fixed a ↵ | David Reagan | 2013-04-23 | 1 | -1/+3 |
| | | | | | | | | few comparison operators. Increased the fadeOut time for the success and error messages. | ||||
* | | fix syntax layout | Morris Jobke | 2013-04-23 | 1 | -3/+6 |
| | | |||||
* | | fix logical issue while retrieving log via ajax | Morris Jobke | 2013-04-23 | 1 | -1/+1 |
|/ | |||||
* | fixes #2743 - use public OC_User::getDisplayName instead of ↵ | Thomas Mueller | 2013-04-08 | 1 | -1/+1 |
| | | | | OC_User::determineDisplayName | ||||
* | Add log as text and not as HTML | Lukas Reschke | 2013-03-03 | 1 | -9/+2 |
| | |||||
* | Fix encoding settings ajax getlog | Bart Visscher | 2013-03-03 | 1 | -1/+10 |
| | |||||
* | Whitespace fixes | Bart Visscher | 2013-02-22 | 1 | -31/+31 |
| | |||||
* | Merge pull request #1855 from owncloud/userlist_load_displaynames | Bernhard Posselt | 2013-02-22 | 1 | -2/+4 |
|\ | | | | | Fetch displayname in userlist ajax requests. Refs #1681 | ||||
| * | Fetch displayname in userlist ajax requests. Refs #1681 | Thomas Tanghus | 2013-02-22 | 1 | -2/+4 |
| | |