upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79
nextcloud/apps/files_encryption
History
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
..
ajax Merge branch 'master' into files_encryption 2013-03-28 18:39:12 +01:00
appinfo Merge branch 'master' into files_encryption 2013-03-28 18:39:12 +01:00
hooks Merge branch 'master' into files_encryption 2013-03-28 18:39:12 +01:00
js cleanup - more to come after 2013-02-09 18:01:38 +01:00
l10n [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
lib Merge branch 'master' into files_encryption 2013-03-28 18:39:12 +01:00
templates [files_encryption] Use p() instead of echo() 2013-02-27 21:20:37 +01:00
test Added method for setting user keyfile recovery preference 2013-03-20 19:26:59 +01:00
settings-personal.php Merge branch 'master' into files_encryption 2013-03-28 18:39:12 +01:00
settings.php 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