ba29147e34
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
...
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
ff6f52d5ec
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
31c434b795
the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely
2013-02-22 16:08:08 +01:00
7f58e27495
cleanup - more to come after
2013-02-09 18:01:38 +01:00
b84e83261e
Added notice to personal settings indicating what filetypes are not encrypted
2013-02-05 17:06:15 +00:00
19b3109655
code cleanup
2012-08-02 13:55:23 +02:00
6b058cd359
allow user to choose encryption mode
2012-08-02 10:40:32 +02:00
Sam Tuke
Björn Schießle
Thomas Müller