aboutsummaryrefslogtreecommitdiffstats
path: root/settings/ajax
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' into improve_app-managementkondou2013-08-215-4/+29
|\|
| * Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-201-1/+1
| |\
| | * Use JSON to send/receive group data.Owen Winkler2013-08-151-1/+1
| * | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-181-0/+25
| |\ \
| | * | improved error handlingBjoern Schiessle2013-07-301-4/+8
| | * | working decrypt files methodBjoern Schiessle2013-07-291-8/+15
| | * | add decryptall.phpBjörn Schießle2013-07-291-0/+14
| | |/
| * | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-182-2/+2
| |\ \
| | * | Add _many_ newlines at the end of fileskondou2013-08-182-2/+2
| | |/
| * | Add trailing comma for all touched array lines.Andreas Fischer2013-08-171-1/+1
| * | Fix spacing of all touched lines.Andreas Fischer2013-08-171-1/+1
| * | Compare result are already true/falseBart Visscher2013-08-171-1/+1
| |/
* | Log exception at the catching codekondou2013-08-091-0/+1
* | Improve app-managementkondou2013-08-061-6/+5
|/
* 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
|\
| * Merge pull request #3681 from owncloud/fix_ajax_removeuser.phpMorris Jobke2013-06-121-0/+1
| |\
| | * 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
|\| |
| * | use pre_setPassword hook to update the encryption keys if the back-end doesn'...Björn Schießle2013-06-061-9/+21
| |/
* | only check for recovery key if someone else than the user wants to change the...Björn Schießle2013-06-071-1/+1
* | 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 t...Björn Schießle2013-05-181-3/+7
* 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
|\
| * 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
* | 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 OC_User::determin...Thomas Mueller2013-04-081-1/+1
* 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 #1681Thomas Tanghus2013-02-221-2/+4
* | Merge pull request #1711 from owncloud/style-cleanupJörn Friedrich Dreyer2013-02-222-2/+6
|\ \ | |/ |/|
| * 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 th...Björn Schießle2013-02-101-0/+4
| * Merge pull request #1577 from owncloud/typo_catagoryLukas Reschke2013-02-101-3/+3
| |\
| | * TypoLukas Reschke2013-02-091-3/+3
| * | Remove uneeded linesLukas Reschke2013-02-091-4/+1