Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17077 from owncloud/files-scan-absolute-path | Morris Jobke | 2015-07-02 | 1 | -0/+43 |
|\ | | | | | fix getting mount points when passing a path to the files:scan command | ||||
| * | add unit test | Robin Appelman | 2015-06-29 | 1 | -0/+43 |
| | | |||||
* | | Unlock first path on rename if second path is locked | Vincent Petry | 2015-06-29 | 1 | -0/+33 |
| | | |||||
* | | Merge pull request #17030 from owncloud/lock-posthooks | Joas Schilling | 2015-06-29 | 1 | -1/+623 |
|\ \ | |/ |/| | Keep shared lock for post-hooks | ||||
| * | Remove test-specific method to make Bjoern and Joas happy | Vincent Petry | 2015-06-26 | 1 | -1/+1 |
| | | |||||
| * | Keep shared locks in post hooks | Vincent Petry | 2015-06-25 | 1 | -1/+623 |
| | | | | | | | | | | | | | | | | Instead of unlocking after the file operation, change exclusive locks back to shared locks during post hooks, and unlock after that. Also added unit tests to test locking in pre-hooks, during operation and post-hooks. | ||||
* | | Correctly check if the real file exists, otherwise try the part file | Joas Schilling | 2015-06-26 | 1 | -8/+18 |
|/ | |||||
* | Merge pull request #17070 from owncloud/lock-movemountbug | Vincent Petry | 2015-06-24 | 1 | -0/+91 |
|\ | | | | | Lock correct paths when moving mount | ||||
| * | Fix locked paths in the moveMount case | Vincent Petry | 2015-06-24 | 1 | -0/+91 |
| | | | | | | | | | | | | | | When moving a mount point directly, the lock must be applied on the local mount point path instead of the attached storage root. Other operations will still lock the attached storage root. | ||||
* | | Merge pull request #17045 from owncloud/enc_improvements | Björn Schießle | 2015-06-23 | 1 | -3/+60 |
|\ \ | |/ |/| | encryption improvements | ||||
| * | make sure that we always read the header from the original file | Bjoern Schiessle | 2015-06-23 | 1 | -3/+60 |
| | | |||||
* | | Merge pull request #16657 from owncloud/view-emit-path | Thomas Müller | 2015-06-22 | 1 | -0/+29 |
|\ \ | | | | | | | emit hooks from a view as long as the path is inside the default root | ||||
| * | | emit hooks from a view as long as the path is inside the default root | Robin Appelman | 2015-06-02 | 1 | -0/+29 |
| | | | |||||
* | | | Workaround for empty dir deletion for SFTP | Vincent Petry | 2015-06-18 | 1 | -0/+7 |
| |/ |/| | | | | | | | | | | | | | Explicitly clear the stat cache after deleting an empty folder to make sure it is properly detected as deleted in subsequent requests. This works around a problem with phpseclib where the folder is properly deleted remotely but the stat cache was not updated. | ||||
* | | Normalize path in View's lock methods | Vincent Petry | 2015-06-16 | 1 | -0/+22 |
| | | |||||
* | | Rethrow LockedException with full path | Vincent Petry | 2015-06-16 | 1 | -0/+39 |
| | | | | | | | | | | Because the path is converted to md5 from the original exception, rethrow the exception with the correct full path | ||||
* | | Add return value to lock methods and check it in tests | Joas Schilling | 2015-06-12 | 1 | -8/+70 |
| | | |||||
* | | Merge pull request #16158 from owncloud/mountprovider-after-setup | Thomas Müller | 2015-06-08 | 1 | -0/+42 |
|\ \ | | | | | | | Call newly registered mount providers after the filesystem is setup | ||||
| * | | phpdoc, strict and type hints | Robin Appelman | 2015-06-02 | 1 | -0/+7 |
| | | | |||||
| * | | call mount providers that are registered after the filesystem is setup | Robin Appelman | 2015-06-02 | 1 | -0/+35 |
| |/ | |||||
* | | Merge pull request #15895 from owncloud/dav-getremoteetag | Joas Schilling | 2015-06-03 | 1 | -0/+18 |
|\ \ | | | | | | | Get etag from remote OC server | ||||
| * | | Disable update check test when testing wrappers | Vincent Petry | 2015-06-02 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | The checkUpdate test is intended for testing real storages, not wrappers. | ||||
| * | | Added storage backend test for checkUpdate | Vincent Petry | 2015-06-02 | 1 | -0/+15 |
| |/ | | | | | | | | | This helps testing whether checkUpdate properly returns false when no change exists | ||||
* / | Move the helpful method to the TestCase class | Joas Schilling | 2015-06-03 | 2 | -6/+6 |
|/ | |||||
* | fix test | Robin Appelman | 2015-06-01 | 1 | -2/+2 |
| | |||||
* | high level locking wip | Robin Appelman | 2015-06-01 | 1 | -0/+27 |
| | |||||
* | Merge pull request #16517 from owncloud/remove-logo-wide | Thomas Müller | 2015-05-29 | 1 | -6/+6 |
|\ | | | | | replace logo-wide on share page as well with better icon + text | ||||
| * | remove logo-wide from tests | Jan-Christoph Borchardt | 2015-05-21 | 1 | -6/+6 |
| | | |||||
* | | Only use quota stream wrapper on "files" | Vincent Petry | 2015-05-28 | 1 | -11/+23 |
| | | | | | | | | | | Prevent using the quota stream wrapper on trashbin folders and other metadata folders | ||||
* | | Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages | Vincent Petry | 2015-05-28 | 1 | -4/+45 |
|\ \ | | | | | | | [encryption] fix move versions between storages | ||||
| * | | copy keys before we move a file between storages to make sure that the new ↵ | Bjoern Schiessle | 2015-05-22 | 1 | -4/+45 |
| |/ | | | | | | | target file reuses the old file key, otherwise versions will break | ||||
* | | Merge pull request #16452 from owncloud/enc_ftp_upload | Björn Schießle | 2015-05-26 | 2 | -3/+84 |
|\ \ | | | | | | | always write file, if fseek doesn't work we write the whole file | ||||
| * | | test to simulate a non-seekable stream wrapper | Bjoern Schiessle | 2015-05-21 | 2 | -3/+84 |
| | | | |||||
* | | | Get correct mimetype when moving and changing extension | Vincent Petry | 2015-05-21 | 1 | -7/+19 |
| |/ |/| | | | | | | | | | | | | | Fixes issue when restoring folders from trash cross-storage, as such folders have an extension ".d12345678". Fixes issue when moving folders between storages and at the same time changing their extension. | ||||
* | | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 1 | -12/+25 |
|\ \ | | | | | | | dont go trough the view when moving to trash | ||||
| * | | add tests for copyFromStorage with same storage | Robin Appelman | 2015-05-19 | 1 | -12/+25 |
| | | | |||||
* | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 2 | -2/+0 |
| |/ |/| | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | Merge pull request #16412 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -2/+10 |
|\ \ | |/ |/| | fix #16356 | ||||
| * | add a unit test to make sure that we don't try to read a file during a write ↵ | Bjoern Schiessle | 2015-05-18 | 1 | -2/+10 |
| | | | | | | | | operation | ||||
* | | Merge pull request #16399 from owncloud/enc_rmdir_fix | Clark Tomlinson | 2015-05-18 | 1 | -7/+74 |
|\ \ | |/ |/| | [encryption] only try to delete file keys if it is a valid path | ||||
| * | only try to delete file keys if it is a valid path | Bjoern Schiessle | 2015-05-18 | 1 | -7/+74 |
| | | |||||
* | | Merge pull request #15980 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -10/+11 |
|\ \ | | | | | | | fix bug #15973 | ||||
| * | | correct testSeek | jknockaert | 2015-05-18 | 1 | -4/+4 |
| | | | |||||
| * | | work on tests | jknockaert | 2015-05-18 | 1 | -10/+11 |
| | | | | | | | | | Tests reorganised and extended | ||||
* | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 2 | -3/+9 |
| |/ |/| | |||||
* | | use hooks to update encryption keys instead of the storage wrapper if a file ↵ | Bjoern Schiessle | 2015-05-11 | 1 | -10/+1 |
| | | | | | | | | | | | | gets renamed/restored, as long as we are in the storage wrapper the file cache isn't up-to-date | ||||
* | | Fix missing types on doc block and deduplicate the method name | Joas Schilling | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | move/copy from storage | Bjoern Schiessle | 2015-05-06 | 1 | -9/+10 |
| | | |||||
* | | unit tests | Bjoern Schiessle | 2015-05-06 | 1 | -41/+68 |
| | | |||||
* | | make sure that we keep the correct encrypted-flag and the (unencrypted)size ↵ | Bjoern Schiessle | 2015-05-05 | 1 | -11/+41 |
|/ | | | | if a file gets copied |