aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
...
* | only check if the key file exists to decide if it is an encrypted file or not.Bjoern Schiessle2013-11-204-25/+17
|/ | | | This solves problems with external storage which doesn't support fseek
* make sure that the owners home is mounted correctlyBjoern Schiessle2013-11-191-0/+4
|
* Merge pull request #5908 from owncloud/fix_errorpage_callVincent Petry2013-11-181-1/+1
|\ | | | | [encryption] fix redirectToErrorPage() call
| * call error page with session as parameterBjoern Schiessle2013-11-171-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-152-0/+2
| |
* | Merge pull request #5833 from owncloud/encryption_fixesBjörn Schießle2013-11-153-22/+83
|\ \ | | | | | | [encryption] preserve timestamps and etags during encryption/decryption
| * | remove debug outputBjoern Schiessle2013-11-141-6/+0
| | |
| * | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ↵Bjoern Schiessle2013-11-141-0/+64
| | | | | | | | | | | | same
| * | Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-136-72/+107
| |\|
| * | fixPartialFilePath() is now stripPartialFileExtension()Bjoern Schiessle2013-11-121-1/+1
| | |
| * | only update file cache if the file is already indexed to avoid that we ↵Bjoern Schiessle2013-11-121-11/+14
| | | | | | | | | | | | create a incomplete file cache entry
| * | make sure that we keep the correct timestamp and etag after ↵Bjoern Schiessle2013-11-121-11/+11
| | | | | | | | | | | | encryoption/decryption
* | | tests addedBjoern Schiessle2013-11-151-1/+14
| | |
* | | instead of writing etmp files we write the dummy file to data/user/cache to ↵Bjoern Schiessle2013-11-143-15/+50
| |/ |/| | | | | avoid that etmp files show up in the users files list
* | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-136-72/+107
|\ \ | |/ |/| No data corruption duriing parallel upload
| * rename fixPartialFilePath() to stripPartialFileExtension(), this name ↵Bjoern Schiessle2013-11-124-12/+12
| | | | | | | | describes better what the method actually does
| * missed some replacements... now tests should workBjoern Schiessle2013-11-121-13/+6
| |
| * fixing tests for the new part file handlingBjoern Schiessle2013-11-125-42/+86
| |
| * let encryption app detect transfer id in path and handle it correctlyBjoern Schiessle2013-11-113-36/+34
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-091-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0611-0/+37
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-033-0/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-11-0328-28/+6
| |
* | Merge pull request #5549 from ↵Vincent Petry2013-10-301-1/+12
|\ \ | | | | | | | | | | | | owncloud/encryption-insertmigrationentrywhenmissing Fixed encryption migration when entry is missing in DB
| * | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-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 variableBjoern Schiessle2013-10-301-2/+0
| | |
* | | if the database doesn't contain any information about the recovery mode than ↵Bjoern Schiessle2013-10-301-1/+1
| | | | | | | | | | | | we assume that it is disabled
* | | Merge pull request #5616 from owncloud/fixing-l10n-masterVincent Petry2013-10-301-1/+2
|\ \ \ | | | | | | | | Fixing l10n master
| * | | replacing ownCloud by theme-able name or avoid it's usageThomas Müller2013-10-291-1/+2
| | | |
* | | | backport of https://github.com/owncloud/core/pull/5513Bjoern Schiessle2013-10-291-14/+48
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-292-1/+21
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2013-10-277-4/+47
|/ /
* | files_encryption: Fix getFileSize()Markus Goetz2013-10-232-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 outputBjoern Schiessle2013-10-221-1/+0
| |
* | set the init status to "NOT_INITIALIZED" if the encryption app gets enabledBjoern Schiessle2013-10-223-1/+14
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-211-0/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-192-0/+9
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-172-0/+4
|
* Merge pull request #5329 from owncloud/enc_fix_unencrypted_sizeBjörn Schießle2013-10-161-2/+19
|\ | | | | try to fix unencrypted file size if it doesn't look plausible
| * revert last changesBjoern Schiessle2013-10-161-3/+1
| |
| * added another test, if unencrypted size and encrypted size are equal we can ↵Bjoern Schiessle2013-10-151-1/+3
| | | | | | | | also assume that something is wrong
| * fix array keyBjoern Schiessle2013-10-141-1/+1
| |
| * try to fix unencrypted file size if it doesn't look plausibleBjoern Schiessle2013-10-141-2/+19
| |
* | Merge pull request #5354 from owncloud/enc_testsMorris Jobke2013-10-161-216/+106
|\ \ | | | | | | added simple test for getFileSize proxy
| * | fix commentBjoern Schiessle2013-10-151-1/+1
| | |
| * | added simple test for getFileSize proxyBjoern Schiessle2013-10-151-216/+106
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-167-0/+18
|/ /
* / check if we are writing to user/files, otherwise skip encryptionBjoern Schiessle2013-10-141-1/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-133-11/+22
|
* Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlinesBjörn Schießle2013-10-112-10/+3
|\ | | | | fix setting dialog headlines for the encryption app