Sam Tuke
|
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 |
|
Sam Tuke
|
9ecfd07f23
|
Added ajax scripts for setting pwd recovery preferences
|
2013-03-28 18:29:18 +01:00 |
Thomas Müller
|
7f58e27495
|
cleanup - more to come after
|
2013-02-09 18:01:38 +01:00 |
|
Sam Tuke
|
265f3654af
|
all unit files_encryption crypt unit tests now passing after merge
|
2012-10-17 16:35:19 +01:00 |
Bjoern Schiessle
|
3ec6dc56c9
|
ToDo item removed
|
2012-08-10 12:37:04 +02:00 |
|
Bjoern Schiessle
|
800942ece7
|
change key password when user switches from client to server side encryption.
make use of the keymanager class in changekeypasscode()
|
2012-08-09 13:47:27 +02:00 |
|
Bjoern Schiessle
|
5a261b5b8f
|
ask user for passwords when switching from client to server side encryption
|
2012-08-09 12:19:51 +02:00 |
|
Bjoern Schiessle
|
a0b2474019
|
code cleanup and TODOs added
|
2012-08-03 12:21:49 +02:00 |
|
Bjoern Schiessle
|
19b3109655
|
code cleanup
|
2012-08-02 13:55:23 +02:00 |
|
Bjoern Schiessle
|
6b058cd359
|
allow user to choose encryption mode
|
2012-08-02 10:40:32 +02:00 |