Florin Peter c398fc59ad Merge branch 'master' into remove_unused_vars ...

Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/lib/session.php
	apps/files_encryption/lib/stream.php

2013-05-29 09:21:00 +02:00

..

3rdparty/Crypt_Blowfish

move 3rdparty dependencies to app

2013-05-21 10:30:24 +02:00

ajax

$_POST["adminEnableRecovery"] is a string

2013-05-28 10:51:12 +02:00

appinfo

reformat code

2013-05-27 17:26:58 +02:00

css

Added facility to manually encrypt all files from personal settings

2013-05-07 16:17:38 +02:00

hooks

Merge branch 'master' into remove_unused_vars

2013-05-29 09:21:00 +02:00

js

fixes after review from @DeepDiver1975

2013-05-23 23:56:31 +02:00

l10n

[tx-robot] updated from transifex

2013-05-29 02:10:54 +02:00

lib

Merge branch 'master' into remove_unused_vars

2013-05-29 09:21:00 +02:00

templates

fixes after review from @DeepDiver1975

2013-05-23 23:56:31 +02:00

tests

Merge branch 'master' into remove_unused_vars

2013-05-29 09:21:00 +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