Björn Schießle 335f2ca321 Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption		2013-05-15 11:42:41 +02:00
..
ajax	don't create a recovery user, only generate recovery key similar to the public link share key	2013-05-13 17:26:21 +02:00
appinfo	workaround for blank page need an other solution	2013-05-15 10:52:23 +02:00
css	Added facility to manually encrypt all files from personal settings	2013-05-07 16:17:38 +02:00
hooks	fix for move file to an empty folder	2013-05-14 23:19:16 +02:00
js	only let the user change the recovery admin settings if a key passwords was entered.	2013-05-15 11:42:22 +02:00
l10n	Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption	2013-05-15 10:18:25 +02:00
lib	disabled FileProxy in Keymanager::getPrivateKey	2013-05-15 02:36:23 +02:00
templates	only let the user change the recovery admin settings if a key passwords was entered.	2013-05-15 11:42:22 +02:00
tests	improved files_encryption tests	2013-05-15 10:21:56 +02:00
settings-admin.php	only let the user change the recovery admin settings if a key passwords was entered.	2013-05-15 11:42:22 +02:00
settings-personal.php	Added facility to manually encrypt all files from personal settings	2013-05-07 16:17:38 +02:00