Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 1 | -4/+13 |
| | |||||
* | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 1 | -12/+17 |
|\ | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * | don't block login forever if we are stuck in the middle of the initial ↵ | Bjoern Schiessle | 2014-02-17 | 1 | -4/+3 |
| | | | | | | | | encryption | ||||
| * | catch errors during initial encryption | Bjoern Schiessle | 2014-02-17 | 1 | -8/+14 |
| | | |||||
* | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 1 | -1/+8 |
|\| | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | refuse login as long as the initial encryption is running | Bjoern Schiessle | 2014-02-10 | 1 | -1/+8 |
| | | |||||
* | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 1 | -2/+2 |
|/ | |||||
* | move unlink proxy to a hook which handles pre and post conditions | Bjoern Schiessle | 2014-01-31 | 1 | -0/+64 |
| | |||||
* | check if the old owner and the old path is available | Bjoern Schiessle | 2013-12-19 | 1 | -3/+10 |
| | |||||
* | fix rename of shared files | Bjoern Schiessle | 2013-12-19 | 1 | -19/+37 |
| | |||||
* | only create new key on password change if a recovery key exists or if the ↵ | Bjoern Schiessle | 2013-12-06 | 1 | -23/+28 |
| | | | | user don't have any private/public keys | ||||
* | fix path reconstruction for reshares | Bjoern Schiessle | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 1 | -14/+48 |
| | |||||
* | remove debug output | Bjoern Schiessle | 2013-10-22 | 1 | -1/+0 |
| | |||||
* | set the init status to "NOT_INITIALIZED" if the encryption app gets enabled | Bjoern Schiessle | 2013-10-22 | 1 | -0/+12 |
| | |||||
* | only encrypt file to users with encryption keys | Bjoern Schiessle | 2013-10-09 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 1 | -9/+14 |
|\ | | | | | | | | | Conflicts: settings/ajax/changepassword.php | ||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 1 | -8/+9 |
|\| | | | | | | | | | Conflicts: apps/files/index.php | ||||
| * | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 1 | -8/+9 |
| | | |||||
* | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -1/+1 |
| | | |||||
* | | encryption error messages, distinguish between a re-enabled encryption app ↵ | Bjoern Schiessle | 2013-09-02 | 1 | -6/+2 |
| | | | | | | | | and a password change from outside | ||||
* | | improved error messaging, initial commit | Bjoern Schiessle | 2013-08-30 | 1 | -11/+18 |
|/ | |||||
* | 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 |
| | | | | |