Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Keep versions when deleting as recipient | Vincent Petry | 2015-06-02 | 1 | -9/+9 |
| | | | | | | | | | The original owner could not be resolved because the original file was already deleted, so no versions were retained. This fix passes the owner and path to retainVersions() since it was already resolved before the file deletion. This reactivates the versions logic and creates a copy of the versions in each trashbin. | ||||
* | Merge pull request #15985 from owncloud/hotfix/fix-encryption-references | Björn Schießle | 2015-05-26 | 2 | -29/+0 |
|\ | | | | | [enc2] fix references to legacy encryption app name | ||||
| * | removing encryption preview check | Clark Tomlinson | 2015-05-18 | 1 | -3/+0 |
| | | |||||
| * | removing deletion of encryption keys | Clark Tomlinson | 2015-05-18 | 1 | -26/+0 |
| | | | | | | | | this will be handled in the wrapper now | ||||
| * | fix references to legacy encryption app name | Clark Tomlinson | 2015-05-18 | 2 | -2/+2 |
| | | |||||
* | | cleanup move/copy logic in trash | Robin Appelman | 2015-05-19 | 1 | -20/+57 |
| | | |||||
* | | fix target path for move | Robin Appelman | 2015-05-18 | 1 | -2/+6 |
| | | |||||
* | | update cache after move to trash | Robin Appelman | 2015-05-18 | 1 | -0/+2 |
| | | |||||
* | | dont go trough the view when moving to trash | Robin Appelman | 2015-05-18 | 1 | -12/+27 |
|/ | |||||
* | Fix restoring files from trash with unique name | Vincent Petry | 2015-05-15 | 1 | -6/+11 |
| | | | | | | | | | | When restoring a file, a unique name needs to be generated if a file with the same name already exists. Also fixed the restore() method to return false if the file to restore does not exist. Added unit tests to cover restore cases. | ||||
* | Added rmdir to trashbin storage wrapper | Vincent Petry | 2015-05-12 | 1 | -5/+30 |
| | | | | | | | | This makes sure that folders are moved to trash when deleted with rmdir() instead of unlink(). This happens for example when deleting a folder over WebDAV. The web UI uses unlink() so it wasn't affected. | ||||
* | Do not trash part files, delete directly | Vincent Petry | 2015-04-21 | 1 | -1/+4 |
| | |||||
* | fixing unit test execution related to trashbin | Thomas Müller | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | add priority to trashbin storage wrapper so that he is always on top | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | Remove old encryption left overs from trashbin | Thomas Müller | 2015-04-07 | 1 | -102/+0 |
| | |||||
* | kill OC_FileProxy :boom: | Thomas Müller | 2015-04-07 | 1 | -27/+0 |
| | |||||
* | setup storage wrappers before setting up the filesystem | Robin Appelman | 2015-04-01 | 1 | -1/+1 |
| | |||||
* | Move core apps from private to public functions | Roeland Jago Douma | 2015-04-01 | 1 | -1/+1 |
| | | | | | | Apps still use OC_Helper and OC_Util functions even when public ones are already available. Sometimes the public one is even used in the same file. | ||||
* | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 1 | -0/+16 |
|\ | | | | | Fix share permission checks | ||||
| * | Reenable trashbin after failed rename | Vincent Petry | 2015-03-18 | 1 | -0/+16 |
| | | | | | | | | | | | | After a failed rename, the post_rename hook is not called. This quickfix makes sure the trashbin storage logic is reenabled also after a failed rename. | ||||
* | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 6 | -55/+110 |
| | | |||||
* | | Recreate trashbin folder after full deletion | Vincent Petry | 2015-03-24 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #14644 from owncloud/trash-expire-command | Thomas Müller | 2015-03-16 | 1 | -25/+26 |
|\ | | | | | Expire files from the trash in the background | ||||
| * | don't rely on \OCP\User::getUser() - it is not set properly in case of async ↵ | Thomas Müller | 2015-03-10 | 1 | -10/+8 |
| | | | | | | | | operations | ||||
| * | Expire files from the trash in the background | Robin Appelman | 2015-03-02 | 1 | -15/+18 |
| | | |||||
* | | Only rescan versions once in trashbin | Vincent Petry | 2015-03-02 | 1 | -3/+13 |
|/ | | | | | Whenever versions need to be rescanned, only do it once per PHP request. Happens whenever multiple files need to be expired. | ||||
* | Revert "Updating license headers" | Morris Jobke | 2015-02-26 | 6 | -107/+64 |
| | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36. | ||||
* | Updating license headers | Jenkins for ownCloud | 2015-02-23 | 6 | -64/+107 |
| | |||||
* | Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares | Lukas Reschke | 2015-01-31 | 1 | -1/+0 |
|\ | | | | | make sure that we get the correct user from the path | ||||
| * | no need to initialize the same view twice | Bjoern Schiessle | 2015-01-30 | 1 | -1/+0 |
| | | |||||
* | | Dont do a cache rename if we cant delete the source file | Robin Appelman | 2015-01-29 | 1 | -1/+3 |
| | | |||||
* | | Make sure we delete the file when doing a cross storage trashbin move | Robin Appelman | 2015-01-29 | 1 | -0/+2 |
| | | |||||
* | | Detect failed deletes in the trashbin | Robin Appelman | 2015-01-29 | 1 | -0/+5 |
|/ | |||||
* | Fix trash error when deleting files with the same name at the same time ↵ | Robin Appelman | 2015-01-28 | 1 | -0/+3 |
| | | | | (happens in unit tests) | ||||
* | Fix bogus deletion on copy + unlink through rename | Vincent Petry | 2015-01-26 | 2 | -0/+34 |
| | | | | | Cross-storage rename would cause copy + unlink. That unlink operation must not trigger the trashbin. | ||||
* | Preserve mtime when doing cross storage move | Robin Appelman | 2015-01-23 | 1 | -41/+2 |
| | |||||
* | Only move files from the current user to the trashbin | Robin Appelman | 2015-01-23 | 1 | -4/+5 |
| | |||||
* | Call final unlink in trash wrapper's storage | Vincent Petry | 2015-01-23 | 2 | -2/+44 |
| | | | | | | | | | | | | | | | In the case of cross-storage delete, the files are copied to the trash, then deleted. The final delete on the source storage would still reach the trash wrapper. This fix makes forwards that second call to the wrapped storage to make the final delete work. It fixes the issue with remote shares, local shares and external storage. Also, it uses a new function "renameRecursive" that renames the files and preserves the mtimes (like "copy_recursive" did in the past)) | ||||
* | replace hook with storage wrapper | Bjoern Schiessle | 2015-01-19 | 3 | -24/+80 |
| | |||||
* | Merge pull request #10292 from owncloud/external-share-delete | Morris Jobke | 2014-12-23 | 1 | -1/+5 |
|\ | | | | | Fix trashbin when deleting a file over an external share | ||||
| * | Fix trashbin when deleting a file over an external share | Robin Appelman | 2014-08-08 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #12879 from owncloud/mountconfig | Morris Jobke | 2014-12-18 | 1 | -2/+4 |
|\ \ | | | | | | | Add mount specific options | ||||
| * | | Add getMountPoint to FileInfo | Robin Appelman | 2014-12-17 | 1 | -2/+4 |
| | | | |||||
* | | | first step to drop \OCP\Config:: in favour of IConfig | Morris Jobke | 2014-12-17 | 1 | -1/+1 |
|/ / | |||||
* | | Fix namespace of Files_Encryption outside of the app | Joas Schilling | 2014-12-09 | 1 | -2/+2 |
| | | |||||
* | | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container | ||||
* | | Merge pull request #12382 from owncloud/enc_reorganize_folders2 | Morris Jobke | 2014-12-03 | 1 | -152/+29 |
|\ \ | | | | | | | [encryption] reorganize folder structure (second try to make Jenkins happy) | ||||
| * | | new folder structure for keys | Bjoern Schiessle | 2014-11-26 | 1 | -152/+29 |
| | | | | | | | | | | | | | | | | | | all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey | ||||
* | | | Autoload exception from files_trashbin | Joas Schilling | 2014-12-02 | 1 | -0/+0 |
|/ / | |||||
* | | Replace deprecated constant with new class constant | Joas Schilling | 2014-11-25 | 1 | -1/+1 |
| | |