summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-191-1/+1
* Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1814-72/+203
|\
| * Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-187-19/+26
| |\
| | * Remove usage of legacy OC_AppconfigRobin Appelman2014-02-137-19/+26
| * | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \
| | * | Style fixesBart Visscher2014-02-121-1/+1
| | |/
| * | don't block login forever if we are stuck in the middle of the initial encryp...Bjoern Schiessle2014-02-175-10/+24
| * | catch errors during decryptionBjoern Schiessle2014-02-172-16/+105
| * | catch errors during initial encryptionBjoern Schiessle2014-02-172-26/+47
* | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-146-19/+26
|\| |
| * | fileinfo is no longer a arrayBjoern Schiessle2014-02-141-1/+1
| * | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-144-15/+15
| |\ \ | | |/ | |/|
| | * merge master into fileinfoRobin Appelman2014-01-2910-81/+76
| | |\
| | * \ Merge branch 'master' into fileinfoRobin Appelman2014-01-172-3/+3
| | |\ \
| | * | | remove more is_array from encryptionRobin Appelman2014-01-173-13/+13
| | * | | Don't use is_array on FileInfoRobin Appelman2014-01-172-3/+3
| * | | | refuse login as long as the initial encryption is runningBjoern Schiessle2014-02-101-1/+8
| * | | | name users after testBjoern Schiessle2014-02-071-2/+2
* | | | | Fix more documentation failesJoas Schilling2014-02-081-2/+1
* | | | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-069-21/+30
|/ / / /
* | | | add function to extract filename from sharekey name + testsBjoern Schiessle2014-02-032-1/+37
* | | | added tests for the delete hooks if the trash bin is disabledBjoern Schiessle2014-02-013-65/+300
* | | | 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-313-41/+66
| |_|/ |/| |
* | | 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
* | | Replaced time() with uniqid() to make sure the file name is uniqueVincent Petry2014-01-217-35/+35
* | | add link to documentationBjoern Schiessle2014-01-171-0/+4
| |/ |/|
* | updated description of the files encryption appBjoern Schiessle2014-01-171-1/+1
* | don't try to encrypt/decrypt cache chunks or files in the trash binBjoern Schiessle2014-01-151-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-01-081-1/+36
* [tx-robot] updated from transifexJenkins for ownCloud2014-01-021-0/+44
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-291-1/+19
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-281-0/+10
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-271-19/+24
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-241-12/+12
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-221-0/+8
* Merge pull request #6507 from owncloud/enc_fix_getUserBjörn Schießle2013-12-193-1/+44
|\
| * tests addedBjoern Schiessle2013-12-193-1/+44
| * 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-192-19/+45
|\ \
| * | check if the old owner and the old path is availableBjoern Schiessle2013-12-191-3/+10
| * | fix rename of shared filesBjoern Schiessle2013-12-192-19/+38
| |/
* | 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-195-10/+159
|\ \ | |/ |/|
| * add test for the stream wrapper to read encrypted files from the system folde...Bjoern Schiessle2013-12-181-0/+39
| * test for isEncryptedPath()Bjoern Schiessle2013-12-181-0/+35
| * extend the encryption stream wrapper to handle local files and add a fall bac...Bjoern Schiessle2013-12-183-8/+60