summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-128-1/+9
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1155-74/+138
|
* Return unencrypted_size of folder when queriedVincent Petry2014-03-072-0/+27
| | | | | | This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled
* 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
|\ | | | | [enc] remember original fopen access type in pre-proxy
| * remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
| | | | | | | | during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
* | Fixed wrong field nameVincent Petry2014-02-271-1/+1
| | | | | | | | | | | | | | This re-fixes an issue where the unencrypted size isn't updated correctly when saving a text file in the UI multiple times. Fixes #7467
* | Merge pull request #7446 from owncloud/etag_assert_fixesThomas Müller2014-02-271-2/+2
|\ \ | |/ |/| use assertSame and assertNotSame for etag checks
| * use assertSame and assertNotSame for etag checksJörn Friedrich Dreyer2014-02-271-2/+2
| |
* | close encryption session after decryption was finishedBjoern Schiessle2014-02-262-0/+16
|/
* Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-22/+0
|\ | | | | Add option to change email settings in admin section
| * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-22/+0
| | | | | | | | Fix issue #7166
* | add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-242-0/+125
| |
* | don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-4/+13
| |
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend
* | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1814-72/+203
|\ \ | | | | | | | | | | | | Conflicts: lib/private/migration/content.php
| * \ Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-187-19/+26
| |\ \ | | | | | | | | Remove usage of legacy OC_Appconfig
| | * | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-137-19/+26
| | |/
| * | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \ | | | | | | | | Some style fixes
| | * | Style fixesBart Visscher2014-02-121-1/+1
| | |/
| * | don't block login forever if we are stuck in the middle of the initial ↵Bjoern Schiessle2014-02-175-10/+24
| | | | | | | | | | | | encryption
| * | 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
|\| | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php
| * | fileinfo is no longer a arrayBjoern Schiessle2014-02-141-1/+1
| | |
| * | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-144-15/+15
| |\ \ | | |/ | |/| Add a FileInfo class which holds all info of a file ...
| | * merge master into fileinfoRobin Appelman2014-01-2910-81/+76
| | |\
| | * \ Merge branch 'master' into fileinfoRobin Appelman2014-01-172-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Issue #7111
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | The cache isn't cleared properly because unlink() doesn't remove the cache entry which caused side-effects when reusing the same file name (which randomly happens when time() returns the same value) This fix first makes sure the unit tests don't fail any more. The unlink() case with the cache will be investigated separately.
* | | 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
|