Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix shouldEncrypt() method and improved decryptAll() unit tests | Bjoern Schiessle | 2014-04-28 | 1 | -9/+50 |
| | |||||
* | merge master into webdav-injection | Robin Appelman | 2014-04-25 | 3 | -46/+33 |
|\ | |||||
| * | fix encryption tests after the removal of the shared folder | Bjoern Schiessle | 2014-04-23 | 3 | -46/+33 |
| | | |||||
* | | Prevent error if previously cached data doesn't have an etag | Robin Appelman | 2014-04-22 | 1 | -0/+1 |
| | | |||||
* | | merge master into webdav-injection | Robin Appelman | 2014-04-15 | 1 | -3/+3 |
|\| | |||||
| * | Remember before change works better | Bart Visscher | 2014-04-01 | 1 | -3/+3 |
| | | |||||
* | | merge master into webdav-injection | Robin Appelman | 2014-03-26 | 1 | -0/+20 |
|\| | |||||
| * | Return unencrypted_size of folder when queried | Vincent Petry | 2014-03-07 | 1 | -0/+20 |
| | | | | | | | | | | | | 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 | ||||
* | | merge master into webdav-injection | Robin Appelman | 2014-03-06 | 1 | -2/+2 |
|\| | |||||
| * | use assertSame and assertNotSame for etag checks | Jörn Friedrich Dreyer | 2014-02-27 | 1 | -2/+2 |
| | | |||||
* | | Fix encryption webdav tests | Robin Appelman | 2014-03-05 | 2 | -6/+19 |
|/ | |||||
* | add test case if a file gets moved out from the shared folder | Bjoern Schiessle | 2014-02-24 | 2 | -0/+125 |
| | |||||
* | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 2 | -8/+85 |
|\ | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * | Merge pull request #7190 from owncloud/appconfig-legacy-apps | Thomas Müller | 2014-02-18 | 1 | -6/+6 |
| |\ | | | | | | | Remove usage of legacy OC_Appconfig | ||||
| | * | Remove usage of legacy OC_Appconfig | Robin Appelman | 2014-02-13 | 1 | -6/+6 |
| | | | |||||
| * | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 1 | -2/+79 |
| | | | |||||
* | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 3 | -14/+14 |
|\| | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | | fileinfo is no longer a array | Bjoern Schiessle | 2014-02-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 2 | -11/+11 |
| |\ \ | | |/ | |/| | Add a FileInfo class which holds all info of a file ... | ||||
| | * | merge master into fileinfo | Robin Appelman | 2014-01-29 | 7 | -35/+35 |
| | |\ | |||||
| | * | | remove more is_array from encryption | Robin Appelman | 2014-01-17 | 2 | -11/+11 |
| | | | | |||||
| * | | | name users after test | Bjoern Schiessle | 2014-02-07 | 1 | -2/+2 |
| | | | | |||||
* | | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 3 | -2/+6 |
|/ / / | |||||
* | | | add function to extract filename from sharekey name + tests | Bjoern Schiessle | 2014-02-03 | 1 | -0/+20 |
| | | | |||||
* | | | added tests for the delete hooks if the trash bin is disabled | Bjoern Schiessle | 2014-02-01 | 3 | -65/+300 |
| |/ |/| | |||||
* | | Replaced time() with uniqid() to make sure the file name is unique | Vincent Petry | 2014-01-21 | 7 | -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. | ||||
* | Merge pull request #6507 from owncloud/enc_fix_getUser | Björn Schießle | 2013-12-19 | 2 | -0/+43 |
|\ | | | | | [encryption] fix getUser Helper | ||||
| * | tests added | Bjoern Schiessle | 2013-12-19 | 2 | -0/+43 |
| | | |||||
* | | add test for the stream wrapper to read encrypted files from the system ↵ | Bjoern Schiessle | 2013-12-18 | 1 | -0/+39 |
| | | | | | | | | folder /tmp | ||||
* | | test for isEncryptedPath() | Bjoern Schiessle | 2013-12-18 | 1 | -0/+35 |
|/ | |||||
* | only remove encryption keys if a real file gets deleted, skip this method if ↵ | Bjoern Schiessle | 2013-12-16 | 1 | -7/+62 |
| | | | | a file outside of /data/user/files was deleted | ||||
* | call set password hook because it doesn't get triggered during test ↵ | Bjoern Schiessle | 2013-12-16 | 1 | -3/+12 |
| | | | | execution and fix paths | ||||
* | enable more tests | Bjoern Schiessle | 2013-12-04 | 1 | -8/+4 |
| | |||||
* | Merge branch 'master' into encryption_enable_public_upload | Bjoern Schiessle | 2013-11-27 | 2 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | 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 | ||||
| * | some small changes according to the review comments | Bjoern Schiessle | 2013-11-27 | 2 | -3/+3 |
| | | |||||
* | | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 1 | -1/+3 |
|/ | |||||
* | adapt tests to the new code | Bjoern Schiessle | 2013-11-20 | 1 | -9/+13 |
| | |||||
* | Merge pull request #5833 from owncloud/encryption_fixes | Björn Schießle | 2013-11-15 | 1 | -0/+58 |
|\ | | | | | [encryption] preserve timestamps and etags during encryption/decryption | ||||
| * | remove debug output | Bjoern Schiessle | 2013-11-14 | 1 | -6/+0 |
| | | |||||
| * | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ↵ | Bjoern Schiessle | 2013-11-14 | 1 | -0/+64 |
| | | | | | | | | same | ||||
* | | tests added | Bjoern Schiessle | 2013-11-15 | 1 | -1/+14 |
|/ | |||||
* | Merge pull request #5447 from owncloud/fixing-5117-master | Vincent Petry | 2013-11-13 | 2 | -17/+54 |
|\ | | | | | No data corruption duriing parallel upload | ||||
| * | rename fixPartialFilePath() to stripPartialFileExtension(), this name ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -6/+6 |
| | | | | | | | | describes better what the method actually does | ||||
| * | missed some replacements... now tests should work | Bjoern Schiessle | 2013-11-12 | 1 | -13/+6 |
| | | |||||
| * | fixing tests for the new part file handling | Bjoern Schiessle | 2013-11-12 | 2 | -17/+61 |
| | | |||||
* | | files_encryption: Fix getFileSize() | Markus Goetz | 2013-10-23 | 1 | -1/+29 |
|/ | | | | | | | | | For certain file sizes, we rounded to the wrong chunk number and the returned bogus results. This should fix https://github.com/owncloud/mirall/issues/1009 Conflicts: apps/files_encryption/tests/util.php | ||||
* | fix comment | Bjoern Schiessle | 2013-10-15 | 1 | -1/+1 |
| | |||||
* | added simple test for getFileSize proxy | Bjoern Schiessle | 2013-10-15 | 1 | -216/+106 |
| | |||||
* | Merge pull request #4537 from owncloud/no-realpath | Thomas Müller | 2013-08-22 | 7 | -75/+75 |
|\ | | | | | Do not use realpath() on includes. | ||||
| * | Use __DIR__ instead of dirname(__FILE__). | Andreas Fischer | 2013-08-21 | 7 | -75/+75 |
| | | | | | | | | This is possible because we require PHP 5.3 or higher. |