Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 4 | -25/+17 | |
|/ | | | | This solves problems with external storage which doesn't support fseek | |||||
* | make sure that the owners home is mounted correctly | Bjoern Schiessle | 2013-11-19 | 1 | -0/+4 | |
| | ||||||
* | Merge pull request #5908 from owncloud/fix_errorpage_call | Vincent Petry | 2013-11-18 | 1 | -1/+1 | |
|\ | | | | | [encryption] fix redirectToErrorPage() call | |||||
| * | call error page with session as parameter | Bjoern Schiessle | 2013-11-17 | 1 | -1/+1 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-15 | 2 | -0/+2 | |
| | | ||||||
* | | Merge pull request #5833 from owncloud/encryption_fixes | Björn Schießle | 2013-11-15 | 3 | -22/+83 | |
|\ \ | | | | | | | [encryption] preserve timestamps and etags during encryption/decryption | |||||
| * | | remove debug output | Bjoern Schiessle | 2013-11-14 | 1 | -6/+0 | |
| | | | ||||||
| * | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ↵ | Bjoern Schiessle | 2013-11-14 | 1 | -0/+64 | |
| | | | | | | | | | | | | same | |||||
| * | | Merge branch 'master' into encryption_fixes | Bjoern Schiessle | 2013-11-13 | 6 | -72/+107 | |
| |\| | ||||||
| * | | fixPartialFilePath() is now stripPartialFileExtension() | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | only update file cache if the file is already indexed to avoid that we ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -11/+14 | |
| | | | | | | | | | | | | create a incomplete file cache entry | |||||
| * | | make sure that we keep the correct timestamp and etag after ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -11/+11 | |
| | | | | | | | | | | | | encryoption/decryption | |||||
* | | | tests added | Bjoern Schiessle | 2013-11-15 | 1 | -1/+14 | |
| | | | ||||||
* | | | instead of writing etmp files we write the dummy file to data/user/cache to ↵ | Bjoern Schiessle | 2013-11-14 | 3 | -15/+50 | |
| |/ |/| | | | | | avoid that etmp files show up in the users files list | |||||
* | | Merge pull request #5447 from owncloud/fixing-5117-master | Vincent Petry | 2013-11-13 | 6 | -72/+107 | |
|\ \ | |/ |/| | No data corruption duriing parallel upload | |||||
| * | rename fixPartialFilePath() to stripPartialFileExtension(), this name ↵ | Bjoern Schiessle | 2013-11-12 | 4 | -12/+12 | |
| | | | | | | | | describes better what the method actually does | |||||
| * | missed some replacements... now tests should work | Bjoern Schiessle | 2013-11-12 | 1 | -13/+6 | |
| | | ||||||
| * | fixing tests for the new part file handling | Bjoern Schiessle | 2013-11-12 | 5 | -42/+86 | |
| | | ||||||
| * | let encryption app detect transfer id in path and handle it correctly | Bjoern Schiessle | 2013-11-11 | 3 | -36/+34 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-09 | 1 | -0/+1 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-06 | 11 | -0/+37 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 3 | -0/+4 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 28 | -28/+6 | |
| | | ||||||
* | | Merge pull request #5549 from ↵ | Vincent Petry | 2013-10-30 | 1 | -1/+12 | |
|\ \ | | | | | | | | | | | | | owncloud/encryption-insertmigrationentrywhenmissing Fixed encryption migration when entry is missing in DB | |||||
| * | | Fixed encryption migration when entry is missing in DB | Vincent Petry | 2013-10-25 | 1 | -1/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resetting the DB and some users still have encrypted files, the migration state isn't read properly becaue the migration entries are missing. This causes the wrong file size to be returned. This fix inserts the missing migration entry when this condition is met. Fixes #5541 | |||||
* | | | remove unused variable | Bjoern Schiessle | 2013-10-30 | 1 | -2/+0 | |
| | | | ||||||
* | | | if the database doesn't contain any information about the recovery mode than ↵ | Bjoern Schiessle | 2013-10-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | we assume that it is disabled | |||||
* | | | Merge pull request #5616 from owncloud/fixing-l10n-master | Vincent Petry | 2013-10-30 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | Fixing l10n master | |||||
| * | | | replacing ownCloud by theme-able name or avoid it's usage | Thomas Müller | 2013-10-29 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | backport of https://github.com/owncloud/core/pull/5513 | Bjoern Schiessle | 2013-10-29 | 1 | -14/+48 | |
| | | | | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-29 | 2 | -1/+21 | |
|/ / / | ||||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 7 | -4/+47 | |
|/ / | ||||||
* | | files_encryption: Fix getFileSize() | Markus Goetz | 2013-10-23 | 2 | -3/+38 | |
| | | | | | | | | | | | | | | | | | | For certain file sizes, we rounded to the wrong chunk number and the returned bogus results. This should fix https://github.com/owncloud/mirall/issues/1009 Conflicts: apps/files_encryption/tests/util.php | |||||
* | | 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 | 3 | -1/+14 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-21 | 1 | -0/+2 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-19 | 2 | -0/+9 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-17 | 2 | -0/+4 | |
| | ||||||
* | Merge pull request #5329 from owncloud/enc_fix_unencrypted_size | Björn Schießle | 2013-10-16 | 1 | -2/+19 | |
|\ | | | | | try to fix unencrypted file size if it doesn't look plausible | |||||
| * | revert last changes | Bjoern Schiessle | 2013-10-16 | 1 | -3/+1 | |
| | | ||||||
| * | added another test, if unencrypted size and encrypted size are equal we can ↵ | Bjoern Schiessle | 2013-10-15 | 1 | -1/+3 | |
| | | | | | | | | also assume that something is wrong | |||||
| * | fix array key | Bjoern Schiessle | 2013-10-14 | 1 | -1/+1 | |
| | | ||||||
| * | try to fix unencrypted file size if it doesn't look plausible | Bjoern Schiessle | 2013-10-14 | 1 | -2/+19 | |
| | | ||||||
* | | Merge pull request #5354 from owncloud/enc_tests | Morris Jobke | 2013-10-16 | 1 | -216/+106 | |
|\ \ | | | | | | | added simple test for getFileSize proxy | |||||
| * | | fix comment | Bjoern Schiessle | 2013-10-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | added simple test for getFileSize proxy | Bjoern Schiessle | 2013-10-15 | 1 | -216/+106 | |
| | | | ||||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-16 | 7 | -0/+18 | |
|/ / | ||||||
* / | check if we are writing to user/files, otherwise skip encryption | Bjoern Schiessle | 2013-10-14 | 1 | -1/+2 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-13 | 3 | -11/+22 | |
| | ||||||
* | Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines | Björn Schießle | 2013-10-11 | 2 | -10/+3 | |
|\ | | | | | fix setting dialog headlines for the encryption app |