Bjoern Schiessle
|
b6fa0e4eef
|
working decrypt files method
|
2013-07-29 17:06:05 +02:00 |
Björn Schießle
|
830f5d24c7
|
add decryptall.php
|
2013-07-29 13:39:56 +02:00 |
kondou
|
05084e03a0
|
Use !== and === in settings.
|
2013-07-21 13:55:25 +02:00 |
Björn Schießle
|
7cfb0dc406
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
|
2013-06-13 13:17:35 +02:00 |
Morris Jobke
|
a39ecd5ea9
|
Merge pull request #3681 from owncloud/fix_ajax_removeuser.php
Init language object before using it
|
2013-06-12 04:23:52 -07:00 |
Georg Ehrke
|
a2fa91fdd5
|
init language object before using it
|
2013-06-12 09:40:13 +02:00 |
Björn Schießle
|
13017ce9e1
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
settings/ajax/changepassword.php
|
2013-06-10 12:12:07 +02:00 |
Björn Schießle
|
b25ab94a08
|
only check for recovery key if someone else than the user wants to change the password
|
2013-06-07 20:17:48 +02:00 |
Björn Schießle
|
d7a9852f7b
|
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
|
2013-06-06 13:32:02 +02:00 |
Florin Peter
|
563f343291
|
fix password change when files_encryption app is disabled
|
2013-06-03 19:06:20 +02:00 |
Björn Schießle
|
f70240f430
|
display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password
|
2013-05-18 10:33:33 +02:00 |
Björn Schießle
|
f1a5b8b524
|
show nicer warning if the admin recovery password was wrong
|
2013-05-16 16:01:40 +02:00 |
Björn Schießle
|
8ae30891b3
|
some error handling in case the recovery password is wrong
|
2013-05-16 15:19:53 +02:00 |
Björn Schießle
|
9d1e60325c
|
allow admin to recover users files in case of password lost
|
2013-05-16 14:53:04 +02:00 |
Björn Schießle
|
135991474b
|
fix inconsistent post parameters in change password operation
|
2013-05-08 12:38:09 +02:00 |
Björn Schießle
|
9b258929c6
|
allow to set quota to zero, issue #2696
|
2013-05-07 10:40:25 +02:00 |
Arthur Schiwon
|
9c3b83e28c
|
Fix retrieval of users with multiple backends
|
2013-05-03 13:50:14 +02:00 |
Morris Jobke
|
e6f84397aa
|
Merge pull request #3098 from jerrac/displaynamesaveontimeout
On the Personal Settings page, made the display name save like the email address saves
|
2013-04-25 14:10:16 -07:00 |
David Reagan
|
4bee02f75c
|
Fixed comment in personal.js. Changed message text in changedisplayname.php.
|
2013-04-23 14:31:35 -07:00 |
David Reagan
|
7312cbec91
|
Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
|
2013-04-23 12:45:12 -07:00 |
Morris Jobke
|
8fab7d5afb
|
fix syntax layout
|
2013-04-23 18:15:34 +02:00 |
Morris Jobke
|
b9b2e0269a
|
fix logical issue while retrieving log via ajax
|
2013-04-23 14:40:21 +02:00 |
Thomas Mueller
|
ce54d00b5c
|
fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName
|
2013-04-08 23:11:33 +02:00 |
Lukas Reschke
|
962b7a7c80
|
Add log as text and not as HTML
|
2013-03-03 23:46:08 +01:00 |
Bart Visscher
|
376f350af2
|
Fix encoding settings ajax getlog
|
2013-03-03 23:14:36 +01:00 |
Bart Visscher
|
bb75dfc021
|
Whitespace fixes
|
2013-02-22 19:05:36 +01:00 |
Bernhard Posselt
|
78fce83405
|
Merge pull request #1855 from owncloud/userlist_load_displaynames
Fetch displayname in userlist ajax requests. Refs #1681
|
2013-02-22 07:44:24 -08:00 |
Jörn Friedrich Dreyer
|
e8da90d0f4
|
Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
|
2013-02-22 07:02:51 -08:00 |
Thomas Tanghus
|
2268596e1a
|
Fetch displayname in userlist ajax requests. Refs #1681
|
2013-02-22 14:51:21 +01:00 |
Bart Visscher
|
83e613b45a
|
Fix error path in changedisplayname call
|
2013-02-22 00:49:44 +01:00 |
Bart Visscher
|
83f161d3f9
|
Style cleanup settings
|
2013-02-21 23:47:56 +01:00 |
Victor Dubiniuk
|
06dbcec5a1
|
Do not set password if it has't provided
|
2013-02-18 21:20:48 +03:00 |
Thomas Mueller
|
037fcde133
|
Merge branch 'master' into fixing-1424-master
|
2013-02-11 21:42:27 +01:00 |
Thomas Müller
|
b9089fe8d9
|
Merge branch 'master' into fixing-1424-master
|
2013-02-09 19:15:23 +01:00 |
Thomas Müller
|
0222c589ac
|
Merge pull request #1546 from owncloud/fix-loading-hooks
Fix loading hooks when going though the routing system
|
2013-02-09 09:59:41 -08:00 |
Bart Visscher
|
9dddcae9ca
|
Remove invalid characters from app id to prevent loading of invalid resources
|
2013-02-09 15:10:40 +01:00 |
Frank Karlitschek
|
4a130d106c
|
I'm an evil bastard and I commit this 3 letter text fix without a pull request.
|
2013-02-09 10:09:37 +01:00 |
Björn Schießle
|
d8fee28b3b
|
add switch to enable/disable the possibility to change the display name by the user
|
2013-02-10 14:43:31 +01:00 |
Lukas Reschke
|
01fabd6c65
|
Merge pull request #1577 from owncloud/typo_catagory
Typo
|
2013-02-10 02:31:34 -08:00 |
Lukas Reschke
|
2dde418e99
|
Remove uneeded lines
|
2013-02-09 23:43:48 +01:00 |
Lukas Reschke
|
bd2f8980cd
|
Typo
|
2013-02-09 23:37:42 +01:00 |
Bart Visscher
|
340d6fce11
|
Better way of getting the navigation entries for an app
|
2013-02-08 18:53:43 +01:00 |
Thomas Müller
|
05b46f7828
|
on creation only test for existing users if the backend supports user creation
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
|
2013-02-08 17:16:18 +01:00 |
Lukas Reschke
|
93b1597395
|
Merge pull request #1506 from owncloud/files_encryption
Files encryption
|
2013-02-06 11:47:55 -08:00 |
Lukas Reschke
|
ad644b4e08
|
Merge pull request #1363 from owncloud/FixPasswordChange
Fix password change
|
2013-02-06 11:14:59 -08:00 |
Sam Tuke
|
2c22619a18
|
Reverted fix temporarily; another fix by LukasReschke is awaiting merge
|
2013-02-06 19:06:55 +00:00 |
Sam Tuke
|
954a627483
|
Added comment
|
2013-02-06 18:24:35 +00:00 |
Sam Tuke
|
81de09711b
|
Fixed bug causing password change related hooks to not be called due to ajax
|
2013-02-06 17:42:29 +00:00 |
Sam Tuke
|
a8c0e3612c
|
Removed call to depreciated isUserVerified()
|
2013-02-06 16:01:43 +00:00 |
Björn Schießle
|
e68d0c7398
|
make strings translatable
|
2013-02-06 11:55:19 +01:00 |