summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/lib
Commit message (Expand)AuthorAgeFilesLines
* fix encryption tests after the removal of the shared folderBjoern Schiessle2014-04-231-3/+2
* Merge pull request #7807 from sarciszewski/patch-1Lukas Reschke2014-04-111-2/+2
|\
| * Update crypt.phpScott Arciszewski2014-03-241-2/+2
| * Update crypt.phpScott Arciszewski2014-03-191-2/+2
* | Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\ \
| * | there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
* | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-022-10/+8
|\ \ \
| * | | always encrypt files to ownerBjoern Schiessle2014-03-312-10/+8
| |/ /
* | | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \ \ | |/ / |/| |
| * | don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| * | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
* | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
|/ /
* | Merge pull request #7655 from owncloud/shared-unencryptedsizeVincent Petry2014-03-211-1/+1
|\ \
| * | Fixed warning when browsing Shared folderVincent Petry2014-03-101-1/+1
| |/
* / in case of phpunit executions calling header() and exit() is too badThomas Müller2014-03-141-3/+8
|/
* Return unencrypted_size of folder when queriedVincent Petry2014-03-071-0/+7
* don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
* Merge pull request #7454 from owncloud/enc_remember_fopen_modeBjörn Schießle2014-02-282-6/+29
|\
| * remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
* | Fixed wrong field nameVincent Petry2014-02-271-1/+1
|/
* close encryption session after decryption was finishedBjoern Schiessle2014-02-262-0/+16
* Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-191-1/+1
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-184-43/+77
|\
| * Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-183-10/+17
| |\
| | * Remove usage of legacy OC_AppconfigRobin Appelman2014-02-133-10/+17
| * | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \
| | * | 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
|\| |
| * | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-142-4/+4
| |\ \ | | |/ | |/|
| | * merge master into fileinfoRobin Appelman2014-01-292-46/+37
| | |\
| | * \ Merge branch 'master' into fileinfoRobin Appelman2014-01-171-2/+2
| | |\ \
| | * | | 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
* | | | | 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
|\
| * 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
|\ \