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
..
3rdparty/Crypt_Blowfish	move 3rdparty dependencies to app	2013-05-21 10:30:24 +02:00
ajax	fixed typo	2013-06-03 19:10:55 +02:00
appinfo	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
css	Added facility to manually encrypt all files from personal settings	2013-05-07 16:17:38 +02:00
files	tell the user what he can do to regain access to his files	2013-06-05 14:19:26 +02:00
hooks	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
js	allow to press enter to update the password	2013-06-05 14:51:51 +02:00
l10n	[tx-robot] updated from transifex	2013-06-11 02:02:44 +02:00
lib	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
templates	add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set	2013-06-05 18:53:02 +02:00
tests	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
settings-admin.php	reformat code	2013-05-29 23:13:45 +02:00
settings-personal.php	only show personal settings if the recovery feature is enabled or if no private key is set	2013-06-05 13:51:28 +02:00