summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6507 from owncloud/enc_fix_getUserBjörn Schießle2013-12-191-1/+1
|\
| * tests addedBjoern Schiessle2013-12-191-1/+1
| * we can also have a path user/cache/...Bjoern Schiessle2013-12-191-1/+1
* | Merge pull request #6517 from owncloud/fix_6510Björn Schießle2013-12-191-0/+1
|\ \
| * | fix rename of shared filesBjoern Schiessle2013-12-191-0/+1
| |/
* | Merge pull request #6512 from owncloud/master-failingoracletestsVincent Petry2013-12-191-29/+17
|\ \
| * | Removed numRows usage from encryption appVincent Petry2013-12-191-29/+17
| |/
* | Merge pull request #6495 from owncloud/enc_fseek_fallbackBjörn Schießle2013-12-193-10/+85
|\ \ | |/ |/|
| * extend the encryption stream wrapper to handle local files and add a fall bac...Bjoern Schiessle2013-12-183-8/+60
| * implement ftell stream wrapper and fix return value from fseek stream wrapperBjoern Schiessle2013-12-181-1/+12
| * fall back to getLocalFile if storage doesn't support fseekBjoern Schiessle2013-12-171-2/+14
* | Merge pull request #6469 from owncloud/enc_cleanupThomas Müller2013-12-182-47/+1
|\ \ | |/ |/|
| * remove unused method tail()Bjoern Schiessle2013-12-171-43/+0
| * remove duplicated codeBjoern Schiessle2013-12-171-4/+1
* | reliable detect encrypted filesBjoern Schiessle2013-12-171-10/+12
|/
* Merge pull request #6183 from owncloud/enc_testsBjörn Schießle2013-12-161-2/+14
|\
| * update file cache for target fileBjoern Schiessle2013-12-161-0/+9
| * only remove encryption keys if a real file gets deleted, skip this method if ...Bjoern Schiessle2013-12-161-2/+5
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 00:05:04 +0000