summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/hooks
Commit message (Collapse)AuthorAgeFilesLines
* don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-4/+13
|
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-181-12/+17
|\ | | | | | | | | Conflicts: lib/private/migration/content.php
| * don't block login forever if we are stuck in the middle of the initial ↵Bjoern Schiessle2014-02-171-4/+3
| | | | | | | | encryption
| * catch errors during initial encryptionBjoern Schiessle2014-02-171-8/+14
| |
* | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-141-1/+8
|\| | | | | | | | | Conflicts: lib/private/appconfig.php
| * refuse login as long as the initial encryption is runningBjoern Schiessle2014-02-101-1/+8
| |
* | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-061-2/+2
|/
* move unlink proxy to a hook which handles pre and post conditionsBjoern Schiessle2014-01-311-0/+64
|
* check if the old owner and the old path is availableBjoern Schiessle2013-12-191-3/+10
|
* fix rename of shared filesBjoern Schiessle2013-12-191-19/+37
|
* only create new key on password change if a recovery key exists or if the ↵Bjoern Schiessle2013-12-061-23/+28
| | | | user don't have any private/public keys
* fix path reconstruction for resharesBjoern Schiessle2013-11-271-2/+2
|
* backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-291-14/+48
|
* remove debug outputBjoern Schiessle2013-10-221-1/+0
|
* set the init status to "NOT_INITIALIZED" if the encryption app gets enabledBjoern Schiessle2013-10-221-0/+12
|
* only encrypt file to users with encryption keysBjoern Schiessle2013-10-091-2/+0
|
* Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-231-9/+14
|\ | | | | | | | | Conflicts: settings/ajax/changepassword.php
| * performance improvement, check configuration only if no private key existsBjoern Schiessle2013-09-171-7/+12
| |
| * make sure that initial encryption also starts for a fresh installationBjoern Schiessle2013-09-031-10/+10
| |
* | Merge branch 'master' into encryption_improved_error_messages_4617Bjoern Schiessle2013-09-161-8/+9
|\| | | | | | | | | Conflicts: apps/files/index.php
| * Don't cache the pkey, skip generation if the keyfile existsringmaster2013-09-021-8/+9
| |
* | no longer enforce log out, but provide useful errors/warnings insteadBjoern Schiessle2013-09-061-1/+1
| |
* | encryption error messages, distinguish between a re-enabled encryption app ↵Bjoern Schiessle2013-09-021-6/+2
| | | | | | | | and a password change from outside
* | improved error messaging, initial commitBjoern Schiessle2013-08-301-11/+18
|/
* Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-171-14/+9
|\ | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| * Merge pull request #4352 from owncloud/encryption_clean_upBjörn Schießle2013-08-171-3/+0
| |\ | | | | | | crypt.php clean up
| | * remove old comments, TODos, etc.Bjoern Schiessle2013-08-091-3/+0
| | |
| * | improved error message to refect openSSL PHP extension and stock openSSL ↵Bjoern Schiessle2013-08-081-1/+1
| | | | | | | | | | | | configuration issues
| * | catch broken server config and disable encryption app.Bjoern Schiessle2013-08-081-1/+1
| |/
| * fix test and make warning translatableBjoern Schiessle2013-08-011-1/+2
| |
| * cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-011-9/+6
| |
* | working decrypt files methodBjoern Schiessle2013-07-291-12/+1
|/
* added helper function to escape glob patternBjörn Schießle2013-07-051-1/+1
| | | | | | Conflicts: apps/files_encryption/lib/helper.php
* only escape glob patternBjörn Schießle2013-07-051-1/+2
|
* handle rename correctly for system wide mountsBjörn Schießle2013-07-051-9/+16
|
* Merge pull request #3899 from owncloud/encryption_check_php_versionVicDeo2013-07-041-4/+4
|\ | | | | check php version, the encryption app needs php >= 5.3.3
| * more verbose error messageBjörn Schießle2013-07-041-1/+1
| |
| * improved error messageBjörn Schießle2013-07-021-1/+1
| |
| * fix error stringBjörn Schießle2013-07-011-1/+1
| |
| * check php version, the encryption app needs php >= 5.3.3Björn Schießle2013-07-011-4/+4
| |
* | introduce pre-disable-app hook and use it for the encryption app to reset ↵Björn Schießle2013-06-271-0/+13
|/ | | | migration status if the app was disabled
* Squashed commit of the following:Björn Schießle2013-06-211-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_keyBjörn Schießle2013-06-131-4/+7
|\ | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
| * Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-131-3/+6
| |\
| | * use number of manipulated rows as idicator if it was possible to enter the ↵Björn Schießle2013-06-121-1/+4
| | | | | | | | | | | | migration mode
| | * make sure that only one process can enter the migration modeBjörn Schießle2013-06-111-3/+3
| | |
| * | Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-121-0/+9
| |\| | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php
| * | Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-311-0/+5
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php
| * \ \ Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-311-10/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php
| * | | | use legacyDecrypt to decrypt key file like the previous files_encryptionFlorin Peter2013-05-311-1/+1
| | | | |