Clark Tomlinson 4209757d61 Merge pull request #15919 from owncloud/enc_handle_empty_files ... Encryption improve handling of empty and unencrypted files		2015-04-29 19:32:02 -04:00
..
appinfo	skip update of encryption keys if file is not encrypted	2015-04-28 20:21:53 +02:00
command	add migration script from old encryption to new one	2015-04-16 14:15:04 +02:00
controller	Merge pull request #15677 from owncloud/enc_reset_private_key_password	2015-04-20 20:48:12 +02:00
css	cleanup and removing cachefactory	2015-04-07 13:30:27 +02:00
hooks	make sure that we create a header for the encrypted private key	2015-04-28 13:00:09 +02:00
img	Adding app icon and fixing admin setting	2015-04-07 13:30:29 +02:00
js	Only get encryption status when logged in	2015-04-23 13:06:00 +02:00
l10n	[tx-robot] updated from transifex	2015-04-23 01:54:51 -04:00
lib	Merge pull request #15919 from owncloud/enc_handle_empty_files	2015-04-29 19:32:02 -04:00
settings	add $encryptionModuleId to methods of Keys/IStorage	2015-04-22 11:53:05 +02:00
templates	cleanup	2015-04-07 13:30:30 +02:00
tests	Merge pull request #15919 from owncloud/enc_handle_empty_files	2015-04-29 19:32:02 -04:00