aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/hooks
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Don't cache the pkey, skip generation if the keyfile existsringmaster2013-09-021-8/+9
|
* 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
| | | | |
* | | | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-101-0/+14
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: settings/ajax/changepassword.php
| * | | | use pre_setPassword hook to update the encryption keys if the back-end ↵Björn Schießle2013-06-061-0/+9
| | |_|/ | |/| | | | | | | | | | doesn't support password change; improved output to let the admin know what happened
| * | | Merge branch 'master' into files_encryption_fs_loaded_fixFlorin Peter2013-05-311-10/+13
| |\ \ \ | | | |/ | | |/|
| * | | fix login errors while filesystem is not loadedFlorin Peter2013-05-311-0/+5
| | |/ | |/|
* | | reformat codeFlorin Peter2013-06-031-5/+6
| | |
* | | $session->setPrivateKey expects only one parameterBjörn Schießle2013-06-031-1/+1
| | |
* | | introduce decryptPrivateKey() method which also checks if the result is a ↵Björn Schießle2013-06-031-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 Peter2013-05-311-3/+3
| | | | | | | | | | | | the web
* | | check if the decrypted private key is valid on login and on read/write filesFlorin Peter2013-05-311-1/+16
| |/ |/|
* | fix share and un-share for single fileFlorin Peter2013-05-301-23/+13
| |
* | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-301-189/+197
|\| | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php
| * Merge branch 'master' into remove_unused_varsFlorin Peter2013-05-291-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 Peter2013-05-271-5/+5
| | |
| * | Merge branch 'master' into remove_unused_varsBjörn Schießle2013-05-271-7/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/proxy.php
| * | | reformat codeFlorin Peter2013-05-271-191/+199
| | | |
* | | | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-291-4/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | fixed encryption session namespace to avoid problemsFlorin Peter2013-05-281-4/+4
| | |/ | |/|
* / | fix for share folder on external storageFlorin Peter2013-05-291-1/+14
|/ /
* | make legacyDecrypt() private als always call legacyBlockDecrypt() from other ↵Björn Schießle2013-05-271-1/+1
| | | | | | | | classes
* | fix migration from old to new encryptionBjörn Schießle2013-05-271-2/+0
|/
* fixes after review from @DeepDiver1975Florin Peter2013-05-231-1/+1
|