Björn Schießle 2c8e5ec84f user interface to allow user to decrypt all his files once the encryption app was disabled ... Conflicts: settings/templates/personal.php		2013-07-29 13:36:06 +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	Removed the preview warning. This is only a simple text change	2013-07-13 13:31:55 +02:00
css	Added facility to manually encrypt all files from personal settings	2013-05-07 16:17:38 +02:00
files	Merge branch 'master' into encryption_check_php_version	2013-07-02 13:54:31 +02:00
hooks	added helper function to escape glob pattern	2013-07-05 16:03:20 +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-07-28 01:58:28 -04:00
lib	user interface to allow user to decrypt all his files once the encryption app was disabled	2013-07-29 13:36:06 +02:00
templates	fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key'	2013-06-21 14:49:01 +02:00
tests	Merge branch 'master' into parallel-autotest.sh-master	2013-07-22 11:39:27 +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