| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | * | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub... | Bjoern Schiessle | 2013-11-21 | 1 | -12/+9 |
| | |\| |
|
| | | * | Merge branch 'master' into encryption_work_with_public_gallery | Bjoern Schiessle | 2013-11-21 | 1 | -12/+9 |
| | | |\ |
|
| | * | | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub... | Bjoern Schiessle | 2013-11-21 | 1 | -13/+19 |
| | |\| | |
|
| | | * | | better distinction between userID and keyId | Bjoern Schiessle | 2013-11-21 | 1 | -13/+19 |
| | * | | | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 1 | -2/+2 |
| | |/ / |
|
| | * | | make sure that we always use the correct user id | Bjoern Schiessle | 2013-11-20 | 1 | -1/+1 |
| | * | | fix some getShareKey() and getFileKey() calls | Bjoern Schiessle | 2013-11-20 | 1 | -3/+3 |
| | * | | [wip] make encryption work with public gallery sharing | Bjoern Schiessle | 2013-11-20 | 1 | -39/+23 |
| * | | | with the latest changes in master $this-userID is always the correct ID, so w... | Bjoern Schiessle | 2013-11-27 | 1 | -24/+20 |
| * | | | fix typo in var name | Bjoern Schiessle | 2013-11-26 | 1 | -1/+1 |
| * | | | show a message at the log-in screen if inital encryption take place | Bjoern Schiessle | 2013-11-25 | 1 | -5/+11 |
| | |/
|/| |
|
| * | | check if it is a cached file or a version to resolve the correct path to the ... | Bjoern Schiessle | 2013-11-20 | 1 | -1/+5 |
| * | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 1 | -15/+8 |
| |/ |
|
| * | make sure that the owners home is mounted correctly | Bjoern Schiessle | 2013-11-19 | 1 | -0/+4 |
| * | Merge branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 1 | -4/+1 |
| |\ |
|
| | * | Merge pull request #5447 from owncloud/fixing-5117-master | Vincent Petry | 2013-11-13 | 1 | -4/+1 |
| | |\ |
|
| | | * | rename fixPartialFilePath() to stripPartialFileExtension(), this name describ... | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 |
| | | * | let encryption app detect transfer id in path and handle it correctly | Bjoern Schiessle | 2013-11-11 | 1 | -4/+1 |
| * | | | make sure that we keep the correct timestamp and etag after encryoption/decry... | Bjoern Schiessle | 2013-11-12 | 1 | -11/+11 |
| |/ / |
|
| * | | Fixed encryption migration when entry is missing in DB | Vincent Petry | 2013-10-25 | 1 | -1/+12 |
| * | | files_encryption: Fix getFileSize() | Markus Goetz | 2013-10-23 | 1 | -2/+9 |
| * | | set the init status to "NOT_INITIALIZED" if the encryption app gets enabled | Bjoern Schiessle | 2013-10-22 | 1 | -1/+1 |
| |/ |
|
| * | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-23 | 1 | -1/+2 |
| |\ |
|
| | * | Merge pull request #4708 from owncloud/encryption_fixes | Björn Schießle | 2013-09-18 | 1 | -1/+2 |
| | |\ |
|
| | | * | make sure that initial encryption also starts for a fresh installation | Bjoern Schiessle | 2013-09-03 | 1 | -1/+2 |
| * | | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 1 | -68/+97 |
| |\| | |
|
| | * | | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 1 | -60/+61 |
| | |\ \ |
|
| | | * | | more is_resource checks before readdir | Arthur Schiwon | 2013-09-05 | 1 | -60/+61 |
| | | |/ |
|
| | * | | coding style fixes | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 |
| | * | | fix part file handling and real size calculation, this should also solve #4581 | Bjoern Schiessle | 2013-09-06 | 1 | -2/+3 |
| | * | | check shares for the real file and not for the .part file | Bjoern Schiessle | 2013-09-06 | 1 | -0/+5 |
| | * | | first check if a extension exists before comparing it | Bjoern Schiessle | 2013-09-06 | 1 | -1/+1 |
| | * | | handle part files correctly | Bjoern Schiessle | 2013-09-06 | 1 | -6/+27 |
| | |/ |
|
| * | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 |
| * | | encryption error messages, distinguish between a re-enabled encryption app an... | Bjoern Schiessle | 2013-09-02 | 1 | -55/+5 |
| * | | improved error messaging, initial commit | Bjoern Schiessle | 2013-08-30 | 1 | -0/+52 |
| |/ |
|
| * | don't change the etags if a file gets encrypted/decrypted to avoid that the s... | Bjoern Schiessle | 2013-08-18 | 1 | -24/+32 |
| * | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1 | -93/+6 |
| |\ |
|
| | * | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal | Bjoern Schiessle | 2013-08-12 | 1 | -30/+6 |
| | * | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 1 | -63/+0 |
| * | | preserve mtime if file gets encrypted/decrypted | Bjoern Schiessle | 2013-08-12 | 1 | -1/+13 |
| * | | fix array declaration | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
| * | | use OC\Files\View to read encrypted file, so that it also works with external... | Bjoern Schiessle | 2013-07-31 | 1 | -4/+7 |
| * | | we need to use the path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 |
| * | | encrypt/decrypt file versions | Bjoern Schiessle | 2013-07-30 | 1 | -3/+124 |
| * | | improved error handling | Bjoern Schiessle | 2013-07-30 | 1 | -10/+26 |
| * | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 1 | -6/+96 |
| |/ |
|
| * | only check for external mount points if the external storage app is enabled | Björn Schießle | 2013-07-05 | 1 | -9/+12 |
| * | always return normalized path | Björn Schießle | 2013-07-05 | 1 | -1/+1 |
| * | move isSystemWideMountPoint() to util.php | Björn Schießle | 2013-07-05 | 1 | -0/+15 |
