Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | performance improvement, check configuration only if no private key exists | Bjoern Schiessle | 2013-09-17 | 1 | -7/+12 |
| | |||||
* | make sure that initial encryption also starts for a fresh installation | Bjoern Schiessle | 2013-09-03 | 1 | -10/+10 |
| | |||||
* | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 1 | -8/+9 |
| | |||||
* | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1 | -14/+9 |
|\ | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| * | Merge pull request #4352 from owncloud/encryption_clean_up | Björn Schießle | 2013-08-17 | 1 | -3/+0 |
| |\ | | | | | | | crypt.php clean up | ||||
| | * | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 1 | -3/+0 |
| | | | |||||
| * | | improved error message to refect openSSL PHP extension and stock openSSL ↵ | Bjoern Schiessle | 2013-08-08 | 1 | -1/+1 |
| | | | | | | | | | | | | configuration issues | ||||
| * | | catch broken server config and disable encryption app. | Bjoern Schiessle | 2013-08-08 | 1 | -1/+1 |
| |/ | |||||
| * | fix test and make warning translatable | Bjoern Schiessle | 2013-08-01 | 1 | -1/+2 |
| | | |||||
| * | cancel sharing if some users doesn't have a working encryption set-up. | Bjoern Schiessle | 2013-08-01 | 1 | -9/+6 |
| | | |||||
* | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 1 | -12/+1 |
|/ | |||||
* | added helper function to escape glob pattern | Björn Schießle | 2013-07-05 | 1 | -1/+1 |
| | | | | | | Conflicts: apps/files_encryption/lib/helper.php | ||||
* | only escape glob pattern | Björn Schießle | 2013-07-05 | 1 | -1/+2 |
| | |||||
* | handle rename correctly for system wide mounts | Björn Schießle | 2013-07-05 | 1 | -9/+16 |
| | |||||
* | Merge pull request #3899 from owncloud/encryption_check_php_version | VicDeo | 2013-07-04 | 1 | -4/+4 |
|\ | | | | | check php version, the encryption app needs php >= 5.3.3 | ||||
| * | more verbose error message | Björn Schießle | 2013-07-04 | 1 | -1/+1 |
| | | |||||
| * | improved error message | Björn Schießle | 2013-07-02 | 1 | -1/+1 |
| | | |||||
| * | fix error string | Björn Schießle | 2013-07-01 | 1 | -1/+1 |
| | | |||||
| * | check php version, the encryption app needs php >= 5.3.3 | Björn Schießle | 2013-07-01 | 1 | -4/+4 |
| | | |||||
* | | introduce pre-disable-app hook and use it for the encryption app to reset ↵ | Björn Schießle | 2013-06-27 | 1 | -0/+13 |
|/ | | | | migration status if the app was disabled | ||||
* | Squashed commit of the following: | Björn Schießle | 2013-06-21 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1345201c9da99a82f198e41fba24da6b0d7ae59a Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:27:46 2013 +0200 add l10n support commit bf2c79c8de8710e839a4a55642a91874c374fa1c Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:19:10 2013 +0200 only init session if openssl extension is loaded commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:25:40 2013 +0200 first disable app and than show error page commit 55baf593179c433642de59552592e6b0f1932880 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:17:34 2013 +0200 typo fixed commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:15:40 2013 +0200 move dependency check to the encryption app commit c186e95da526f0470e20f014f1bd9513db5518ff Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 11:13:11 2013 +0200 make sure that openssl is installed and loaded | ||||
* | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 1 | -4/+7 |
|\ | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php | ||||
| * | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-13 | 1 | -3/+6 |
| |\ | |||||
| | * | use number of manipulated rows as idicator if it was possible to enter the ↵ | Björn Schießle | 2013-06-12 | 1 | -1/+4 |
| | | | | | | | | | | | | migration mode | ||||
| | * | make sure that only one process can enter the migration mode | Björn Schießle | 2013-06-11 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-12 | 1 | -0/+9 |
| |\| | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php | ||||
| * | | Merge branch 'master' into files_encryption_upgrade_fix | Florin Peter | 2013-05-31 | 1 | -0/+5 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php | ||||
| * \ \ | Merge branch 'master' into files_encryption_upgrade_fix | Florin Peter | 2013-05-31 | 1 | -10/+13 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php | ||||
| * | | | | use legacyDecrypt to decrypt key file like the previous files_encryption | Florin Peter | 2013-05-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-10 | 1 | -0/+14 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php | ||||
| * | | | | use pre_setPassword hook to update the encryption keys if the back-end ↵ | Björn Schießle | 2013-06-06 | 1 | -0/+9 |
| | |_|/ | |/| | | | | | | | | | | doesn't support password change; improved output to let the admin know what happened | ||||
| * | | | Merge branch 'master' into files_encryption_fs_loaded_fix | Florin Peter | 2013-05-31 | 1 | -10/+13 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | fix login errors while filesystem is not loaded | Florin Peter | 2013-05-31 | 1 | -0/+5 |
| | |/ | |/| | |||||
* | | | reformat code | Florin Peter | 2013-06-03 | 1 | -5/+6 |
| | | | |||||
* | | | $session->setPrivateKey expects only one parameter | Björn Schießle | 2013-06-03 | 1 | -1/+1 |
| | | | |||||
* | | | introduce decryptPrivateKey() method which also checks if the result is a ↵ | Björn Schießle | 2013-06-03 | 1 | -12/+1 |
| | | | | | | | | | | | | valid private key to avoid additional checks on various places | ||||
* | | | allow the user to login but do not allow upload and show error message on ↵ | Florin Peter | 2013-05-31 | 1 | -3/+3 |
| | | | | | | | | | | | | the web | ||||
* | | | check if the decrypted private key is valid on login and on read/write files | Florin Peter | 2013-05-31 | 1 | -1/+16 |
| |/ |/| | |||||
* | | fix share and un-share for single file | Florin Peter | 2013-05-30 | 1 | -23/+13 |
| | | |||||
* | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-30 | 1 | -189/+197 |
|\| | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php | ||||
| * | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 1 | -8/+8 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | replace == with === and replace != with !== | Florin Peter | 2013-05-27 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' into remove_unused_vars | Björn Schießle | 2013-05-27 | 1 | -7/+5 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/proxy.php | ||||
| * | | | reformat code | Florin Peter | 2013-05-27 | 1 | -191/+199 |
| | | | | |||||
* | | | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-29 | 1 | -4/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | fixed encryption session namespace to avoid problems | Florin Peter | 2013-05-28 | 1 | -4/+4 |
| | |/ | |/| | |||||
* / | | fix for share folder on external storage | Florin Peter | 2013-05-29 | 1 | -1/+14 |
|/ / | |||||
* | | make legacyDecrypt() private als always call legacyBlockDecrypt() from other ↵ | Björn Schießle | 2013-05-27 | 1 | -1/+1 |
| | | | | | | | | classes | ||||
* | | fix migration from old to new encryption | Björn Schießle | 2013-05-27 | 1 | -2/+0 |
|/ | |||||
* | fixes after review from @DeepDiver1975 | Florin Peter | 2013-05-23 | 1 | -1/+1 |
| |