aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-061-18/+21
|\
| * Don't try to encrypt a file when the temp file isn't createdBart Visscher2013-12-061-18/+21
* | set unencrypted_size to 0 after decryption... so that the unencrypted_size ge...Bjoern Schiessle2013-12-061-1/+1
|/
* fix typoBjoern Schiessle2013-12-061-1/+1
* add method to check if users private/public key existsBjoern Schiessle2013-12-061-4/+13
* Revert "Adjust files_encryption requirements to the new core requirement (PHP...Morris Jobke2013-12-041-1/+8
* Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).Andreas Fischer2013-11-291-8/+1
* Merge branch 'master' into encryption_initial_enc_indicatorBjoern Schiessle2013-11-275-94/+117
|\
| * Merge branch 'master' into encryption_enable_public_uploadBjoern Schiessle2013-11-275-22/+18
| |\
| | * typo fixedBjoern Schiessle2013-11-271-1/+1
| | * some small changes according to the review commentsBjoern Schiessle2013-11-275-15/+16
| | * fix typo in commentBjoern Schiessle2013-11-251-1/+1
| * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-4/+10
| |\ \
| | * | check HTTP Referer to check if we come from public.php or from a internal page.Bjoern Schiessle2013-11-211-4/+10
| | |/
| * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-1/+1
| |\|
| | * fix getFileKey() callBjoern Schiessle2013-11-211-1/+1
| * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-214-13/+15
| |\|
| | * Merge branch 'master' into encryption_work_with_public_galleryBjoern Schiessle2013-11-214-13/+15
| | |\
| * | | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-212-29/+34
| |\| |
| | * | better distinction between userID and keyIdBjoern Schiessle2013-11-212-28/+32
| * | | public upload now also works with encryption enabledBjoern Schiessle2013-11-214-22/+17
| |/ /
| * | make sure that we always use the correct user idBjoern Schiessle2013-11-203-11/+21
| * | fix some getShareKey() and getFileKey() callsBjoern Schiessle2013-11-201-3/+3
| * | [wip] make encryption work with public gallery sharingBjoern Schiessle2013-11-205-56/+65
* | | with the latest changes in master $this-userID is always the correct ID, so w...Bjoern Schiessle2013-11-271-24/+20
* | | fix typo in var nameBjoern Schiessle2013-11-261-1/+1
* | | show a message at the log-in screen if inital encryption take placeBjoern Schiessle2013-11-251-5/+11
| |/ |/|
* | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizeresetVincent Petry2013-11-202-1/+5
|\ \
| * | Fix for extstorage + encryption where unencrypted size is not keptVincent Petry2013-11-202-1/+5
| |/
* | check if it is a cached file or a version to resolve the correct path to the ...Bjoern Schiessle2013-11-201-1/+5
* | only check if the key file exists to decide if it is an encrypted file or not.Bjoern Schiessle2013-11-203-18/+10
|/
* 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
|\
| * call error page with session as parameterBjoern Schiessle2013-11-171-1/+1
* | Merge pull request #5833 from owncloud/encryption_fixesBjörn Schießle2013-11-152-22/+25
|\ \
| * | Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-134-55/+53
| |\|
| * | fixPartialFilePath() is now stripPartialFileExtension()Bjoern Schiessle2013-11-121-1/+1
| * | only update file cache if the file is already indexed to avoid that we create...Bjoern Schiessle2013-11-121-11/+14
| * | make sure that we keep the correct timestamp and etag after encryoption/decry...Bjoern Schiessle2013-11-121-11/+11
* | | instead of writing etmp files we write the dummy file to data/user/cache to a...Bjoern Schiessle2013-11-143-15/+50
| |/ |/|
* | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-134-55/+53
|\ \ | |/ |/|
| * rename fixPartialFilePath() to stripPartialFileExtension(), this name describ...Bjoern Schiessle2013-11-123-6/+6
| * fixing tests for the new part file handlingBjoern Schiessle2013-11-123-25/+25
| * let encryption app detect transfer id in path and handle it correctlyBjoern Schiessle2013-11-113-36/+34
* | Fixed encryption migration when entry is missing in DBVincent Petry2013-10-251-1/+12
* | files_encryption: Fix getFileSize()Markus Goetz2013-10-231-2/+9
* | set the init status to "NOT_INITIALIZED" if the encryption app gets enabledBjoern Schiessle2013-10-222-1/+2
|/
* Merge pull request #5329 from owncloud/enc_fix_unencrypted_sizeBjörn Schießle2013-10-161-2/+19
|\
| * revert last changesBjoern Schiessle2013-10-161-3/+1
| * added another test, if unencrypted size and encrypted size are equal we can a...Bjoern Schiessle2013-10-151-1/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-03 02:43:57 +0000