Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove unused variable | Bjoern Schiessle | 2014-06-06 | 1 | -1/+1 |
| | |||||
* | remove encryption keys if user unshares a file | Bjoern Schiessle | 2014-06-06 | 1 | -0/+55 |
| | |||||
* | use oc_preferences instead of oc_encryption to store encyption settings | Bjoern Schiessle | 2014-06-05 | 1 | -2/+1 |
| | |||||
* | workaround to get the unit test going | Thomas Müller | 2014-06-04 | 1 | -4/+6 |
| | |||||
* | Merge pull request #8676 from owncloud/encryption_improvements | Morris Jobke | 2014-06-02 | 1 | -18/+15 |
|\ | | | | | cleanup encryption code, improved return codes | ||||
| * | ceanup encryption code, improved return codes | Bjoern Schiessle | 2014-06-02 | 1 | -18/+15 |
| | | |||||
* | | get mount point from mount manager | Bjoern Schiessle | 2014-05-28 | 1 | -16/+6 |
|/ | |||||
* | Merge pull request #8637 from owncloud/enc_improved_error_handling | Vincent Petry | 2014-05-21 | 1 | -3/+7 |
|\ | | | | | [encryption] improved error handling during password change | ||||
| * | only start migration if the encryption was initialized; allow to overwrite ↵ | Bjoern Schiessle | 2014-05-19 | 1 | -3/+7 |
| | | | | | | | | keys if no files exists | ||||
* | | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 1 | -10/+10 |
|/ | | | | * test case added to avoid adding them later | ||||
* | Fix more missing or broken PHPDoc | Robin McCorkell | 2014-05-16 | 1 | -1/+1 |
| | |||||
* | Fix PHPDoc in /apps | Robin McCorkell | 2014-05-16 | 1 | -1/+1 |
| | |||||
* | remove legacy aka deprecated code: OC_FilesystemView | Thomas Müller | 2014-05-12 | 1 | -10/+10 |
| | |||||
* | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 1 | -112/+15 |
| | | | | tests and the encryption code | ||||
* | fix encryption tests after the removal of the shared folder | Bjoern Schiessle | 2014-04-23 | 1 | -11/+11 |
| | |||||
* | 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 |
| |