nextcloud/apps/files_encryption
Florin Peter 690bf9b8c4 Merge branch 'master' into remove_unused_vars
Conflicts:
	apps/files_encryption/lib/util.php
2013-05-27 17:26:35 +02:00
..
3rdparty/Crypt_Blowfish move 3rdparty dependencies to app 2013-05-21 10:30:24 +02:00
ajax added l10n support in apps/files_encryption/ajax/adminrecovery.php 2013-05-23 22:09:28 +02:00
appinfo increase version and add warning 2013-05-25 12:08:18 +02:00
css Added facility to manually encrypt all files from personal settings 2013-05-07 16:17:38 +02:00
hooks fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
js fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
l10n [tx-robot] updated from transifex 2013-05-27 02:07:24 +02:00
lib Merge branch 'master' into remove_unused_vars 2013-05-27 17:26:35 +02:00
templates fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
tests fix tests, after unused variables are removed 2013-05-27 15:34:57 +02:00
settings-admin.php fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00
settings-personal.php fixes after review from @DeepDiver1975 2013-05-23 23:56:31 +02:00