aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-183-10/+17
| |\ | | | | | | Remove usage of legacy OC_Appconfig
| | * Remove usage of legacy OC_AppconfigRobin Appelman2014-02-133-10/+17
| | |
| * | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \ | | | | | | | | Some style fixes
| | * | Style fixesBart Visscher2014-02-121-1/+1
| | |/
| * | catch errors during decryptionBjoern Schiessle2014-02-171-14/+26
| | |
| * | catch errors during initial encryptionBjoern Schiessle2014-02-171-18/+33
| | |
* | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-142-4/+4
|\| | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php
| * | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-142-4/+4
| |\ \ | | |/ | |/| Add a FileInfo class which holds all info of a file ...
| | * merge master into fileinfoRobin Appelman2014-01-292-46/+37
| | |\
| | * \ Merge branch 'master' into fileinfoRobin Appelman2014-01-171-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php
| | * | | remove more is_array from encryptionRobin Appelman2014-01-171-2/+2
| | | | |
| | * | | Don't use is_array on FileInfoRobin Appelman2014-01-172-3/+3
| | | | |
* | | | | Fix more documentation failesJoas Schilling2014-02-081-2/+1
| | | | | | | | | | | | | | | | | | | | Issue #7111
* | | | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-065-17/+22
|/ / / /
* | | | add function to extract filename from sharekey name + testsBjoern Schiessle2014-02-031-1/+17
| | | |
* | | | don't expect OC_FilesystemView, this is depreciatedBjoern Schiessle2014-01-311-1/+1
| | | |
* | | | better error detection and don't use glob()Bjoern Schiessle2014-01-311-12/+27
| | | |
* | | | move unlink proxy to a hook which handles pre and post conditionsBjoern Schiessle2014-01-312-41/+2
| |_|/ |/| |
* | | only update file cache with the unenecrypted size when the file was writtenBjoern Schiessle2014-01-241-7/+24
| | |
* | | fix infinite loop if folder and subfolder has the same nameBjoern Schiessle2014-01-221-39/+13
| |/ |/|
* | don't try to encrypt/decrypt cache chunks or files in the trash binBjoern Schiessle2014-01-151-2/+2
|/
* Merge pull request #6507 from owncloud/enc_fix_getUserBjörn Schießle2013-12-191-1/+1
|\ | | | | [encryption] fix getUser Helper
| * 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
|\ \ | | | | | | [encryption] fix rename of shared files
| * | 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 app
| * | Removed numRows usage from encryption appVincent Petry2013-12-191-29/+17
| |/ | | | | | | | | | | | | | | | | numRows on Oracle always seem to return 0. This fix removes numRows usage from the encryption and sharing app. This fixes unit tests and potentially the encryption app itself (migration status) when running on Oracle
* | Merge pull request #6495 from owncloud/enc_fseek_fallbackBjörn Schießle2013-12-193-10/+85
|\ \ | |/ |/| Added fseek fallback to the encryption app
| * extend the encryption stream wrapper to handle local files and add a fall ↵Bjoern Schiessle2013-12-183-8/+60
| | | | | | | | back for file size calculation if the storage doesn't support fseek
| * 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 duplicated code
| * 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
|\ | | | | enable more encryption tests
| * 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
| | | | | | | | a file outside of /data/user/files was deleted
* | Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-061-18/+21
|\ \ | | | | | | cherry-picks from #5884, just for debugging purpose
| * | 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 ↵Bjoern Schiessle2013-12-061-1/+1
|/ / | | | | | | gets re-calculated if encryption was enabled again
* | 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 ↵Morris Jobke2013-12-041-1/+8
| | | | | | (PHP 5.3.8)." This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd.
* 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
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php
| | * typo fixedBjoern Schiessle2013-11-271-1/+1
| | |
| | * some small changes according to the review commentsBjoern Schiessle2013-11-275-15/+16
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-25 05:05:56 +0000