summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib
Commit message (Collapse)AuthorAgeFilesLines
* Keep versions when deleting as recipientVincent Petry2015-06-021-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-referencesBjörn Schießle2015-05-262-29/+0
|\ | | | | [enc2] fix references to legacy encryption app name
| * removing encryption preview checkClark Tomlinson2015-05-181-3/+0
| |
| * removing deletion of encryption keysClark Tomlinson2015-05-181-26/+0
| | | | | | | | this will be handled in the wrapper now
| * fix references to legacy encryption app nameClark Tomlinson2015-05-182-2/+2
| |
* | cleanup move/copy logic in trashRobin Appelman2015-05-191-20/+57
| |
* | fix target path for moveRobin Appelman2015-05-181-2/+6
| |
* | update cache after move to trashRobin Appelman2015-05-181-0/+2
| |
* | dont go trough the view when moving to trashRobin Appelman2015-05-181-12/+27
|/
* Fix restoring files from trash with unique nameVincent Petry2015-05-151-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 wrapperVincent Petry2015-05-121-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 directlyVincent Petry2015-04-211-1/+4
|
* fixing unit test execution related to trashbinThomas Müller2015-04-071-1/+1
|
* add priority to trashbin storage wrapper so that he is always on topBjoern Schiessle2015-04-071-1/+1
|
* Remove old encryption left overs from trashbinThomas Müller2015-04-071-102/+0
|
* kill OC_FileProxy :boom:Thomas Müller2015-04-071-27/+0
|
* setup storage wrappers before setting up the filesystemRobin Appelman2015-04-011-1/+1
|
* Move core apps from private to public functionsRoeland Jago Douma2015-04-011-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-partfilepermissionsMorris Jobke2015-03-261-0/+16
|\ | | | | Fix share permission checks
| * Reenable trashbin after failed renameVincent Petry2015-03-181-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 headersJenkins for ownCloud2015-03-266-55/+110
| |
* | Recreate trashbin folder after full deletionVincent Petry2015-03-241-0/+2
|/
* Merge pull request #14644 from owncloud/trash-expire-commandThomas Müller2015-03-161-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üller2015-03-101-10/+8
| | | | | | | | operations
| * Expire files from the trash in the backgroundRobin Appelman2015-03-021-15/+18
| |
* | Only rescan versions once in trashbinVincent Petry2015-03-021-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 Jobke2015-02-266-107/+64
| | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* Updating license headersJenkins for ownCloud2015-02-236-64/+107
|
* Merge pull request #13797 from owncloud/fix_move_del_of_remote_sharesLukas Reschke2015-01-311-1/+0
|\ | | | | make sure that we get the correct user from the path
| * no need to initialize the same view twiceBjoern Schiessle2015-01-301-1/+0
| |
* | Dont do a cache rename if we cant delete the source fileRobin Appelman2015-01-291-1/+3
| |
* | Make sure we delete the file when doing a cross storage trashbin moveRobin Appelman2015-01-291-0/+2
| |
* | Detect failed deletes in the trashbinRobin Appelman2015-01-291-0/+5
|/
* Fix trash error when deleting files with the same name at the same time ↵Robin Appelman2015-01-281-0/+3
| | | | (happens in unit tests)
* Fix bogus deletion on copy + unlink through renameVincent Petry2015-01-262-0/+34
| | | | | Cross-storage rename would cause copy + unlink. That unlink operation must not trigger the trashbin.
* Preserve mtime when doing cross storage moveRobin Appelman2015-01-231-41/+2
|
* Only move files from the current user to the trashbinRobin Appelman2015-01-231-4/+5
|
* Call final unlink in trash wrapper's storageVincent Petry2015-01-232-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 wrapperBjoern Schiessle2015-01-193-24/+80
|
* Merge pull request #10292 from owncloud/external-share-deleteMorris Jobke2014-12-231-1/+5
|\ | | | | Fix trashbin when deleting a file over an external share
| * Fix trashbin when deleting a file over an external shareRobin Appelman2014-08-081-1/+5
| |
* | Merge pull request #12879 from owncloud/mountconfigMorris Jobke2014-12-181-2/+4
|\ \ | | | | | | Add mount specific options
| * | Add getMountPoint to FileInfoRobin Appelman2014-12-171-2/+4
| | |
* | | first step to drop \OCP\Config:: in favour of IConfigMorris Jobke2014-12-171-1/+1
|/ /
* | Fix namespace of Files_Encryption outside of the appJoas Schilling2014-12-091-2/+2
| |
* | reduce OC_Preferences, OC_Config and \OCP\Config usageMorris Jobke2014-12-081-2/+4
| | | | | | | | | | | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container
* | Merge pull request #12382 from owncloud/enc_reorganize_folders2Morris Jobke2014-12-031-152/+29
|\ \ | | | | | | [encryption] reorganize folder structure (second try to make Jenkins happy)
| * | new folder structure for keysBjoern Schiessle2014-11-261-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_trashbinJoas Schilling2014-12-021-0/+0
|/ /
* | Replace deprecated constant with new class constantJoas Schilling2014-11-251-1/+1
| |