Commit Graph

1140 Commits

Author SHA1 Message Date
Robin Appelman 136113a22b
remove user parameter from `ITrashItem::getOriginalLocation`
since the target user is known at the time of creating the trashitem
the original location can already be adjusted on a per user level

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:58:02 +02:00
Robin Appelman a369adb4cd
fix trash storage wrapper tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:43 +02:00
Robin Appelman b94fbcebeb
fix preview controller tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:40 +02:00
Robin Appelman f5a41e2e15
fix error message for folder preview request
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:57:37 +02:00
Robin Appelman d38163e895
fix trashbin previews for modular api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:48 +02:00
Robin Appelman 4adac445dc
fix select statement
fix select statement
Make trashbin api modules

Apps can register trashbin backends for specific storages,
allowing them to modify trashbin behavior for storages

The old trashbin implementation has been wrapped in a "legacy" backend,
for future work this can be replaced with a new backend that better handles
shares while still keeping the legacy backend around to keep existing trash
from being accessible

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-17 14:56:45 +02:00
Joas Schilling 78cc4171ee
Fix mock of ITimeFactory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-10 12:42:20 +02:00
Christoph Wurst 9af69ca2a5
Fix usage of deprecated OC.webroot
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-10-09 13:53:59 +02:00
Nextcloud bot 4c47ec005f
[tx-robot] updated from transifex 2018-10-07 00:12:21 +00:00
Nextcloud bot d9fe68ed12
[tx-robot] updated from transifex 2018-10-05 00:12:56 +00:00
Nextcloud bot d9504a4e06
[tx-robot] updated from transifex 2018-10-04 00:12:07 +00:00
Nextcloud bot 67d04f2d57
[tx-robot] updated from transifex 2018-10-03 16:58:45 +00:00
Nextcloud bot 77c6e41063
[tx-robot] updated from transifex 2018-10-02 00:12:55 +00:00
Nextcloud bot b6e86121bc
[tx-robot] updated from transifex 2018-10-01 00:12:39 +00:00
Nextcloud bot dafd708075
[tx-robot] updated from transifex 2018-09-30 00:12:06 +00:00
Nextcloud bot 73aabbd3c0
[tx-robot] updated from transifex 2018-09-29 00:12:16 +00:00
Morris Jobke d867f9f091
Merge pull request #11037 from nextcloud/trash-webui-dav
Use trashbin dav endpoint to list trash in webui
2018-09-28 16:03:24 +02:00
Robin Appelman c5f77de3e2
fix trashbin js tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-26 19:20:53 +02:00
Nextcloud bot 2f45045c96
[tx-robot] updated from transifex 2018-09-26 00:12:23 +00:00
Nextcloud bot bdb01064e2
[tx-robot] updated from transifex 2018-09-25 00:12:07 +00:00
Nextcloud bot 0211e17e3f
[tx-robot] updated from transifex 2018-09-21 00:12:08 +00:00
Robin Appelman a7a06b2349
use dav trashbin api for restore
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:44 +02:00
Robin Appelman 0c6e154b50
use dav trash api for removing from trashbin
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:41 +02:00
Robin Appelman dea1e55b62
remove old trashbin api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:38 +02:00
Robin Appelman a623e09868
remove old trashbin endpoint
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:36 +02:00
Robin Appelman b4e452ad60
Use trashbin dav endpoint to list trash in webui
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:33 +02:00
Robin Appelman 6372ae3a98
expose additional props from trashbin sabre endpoint
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:26 +02:00
Nextcloud bot 2a51572cc4
[tx-robot] updated from transifex 2018-09-17 00:12:30 +00:00
Nextcloud bot 6112adfe06
[tx-robot] updated from transifex 2018-09-14 00:12:27 +00:00
Nextcloud bot 039145c4d1
[tx-robot] updated from transifex 2018-09-12 00:12:12 +00:00
Nextcloud bot 13166feed3
[tx-robot] updated from transifex 2018-09-09 00:13:09 +00:00
Nextcloud bot 3a08f71981
[tx-robot] updated from transifex 2018-09-06 00:12:53 +00:00
Joas Schilling 47cc5e5895
Update version requirements and versions of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-05 14:27:06 +02:00
Nextcloud bot 021dad53be
[tx-robot] updated from transifex 2018-09-01 00:12:17 +00:00
Nextcloud bot 2a22615879
[tx-robot] updated from transifex 2018-08-31 00:12:09 +00:00
Nextcloud bot 4da9a15b32
[tx-robot] updated from transifex 2018-08-30 00:12:07 +00:00
Nextcloud bot 8b47f45afa
[tx-robot] updated from transifex 2018-08-27 00:12:14 +00:00
Nextcloud bot 503fbc953e
[tx-robot] updated from transifex 2018-08-24 00:12:20 +00:00
Nextcloud bot c0f48a7b40
[tx-robot] updated from transifex 2018-08-23 00:12:59 +00:00
Nextcloud bot 65410ab1cb
[tx-robot] updated from transifex 2018-08-22 00:12:11 +00:00
Nextcloud bot b0af604d0e
[tx-robot] updated from transifex 2018-08-16 00:12:17 +00:00
Nextcloud bot ccb040ee01
[tx-robot] updated from transifex 2018-08-13 00:12:09 +00:00
Roeland Jago Douma e22d15c3a1
Merge pull request #10642 from nextcloud/bump/autoloaders
Bump autoloaders
2018-08-10 16:18:00 +02:00
Roeland Jago Douma 90a656305b
Bump autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-10 15:03:22 +02:00
Robin Appelman 16909f04c2
Fix trashbin file actions
Fixes #10491

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-09 14:31:02 +02:00
Nextcloud bot a625a4d704
[tx-robot] updated from transifex 2018-08-05 00:12:29 +00:00
Nextcloud bot 5e43f3c6a6
[tx-robot] updated from transifex 2018-07-31 00:12:12 +00:00
Nextcloud bot 6ccc34f5af
[tx-robot] updated from transifex 2018-07-27 00:12:20 +00:00
John Molakvoæ (skjnldsv) 440b5c944f
Fixed scrolling container
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 11:01:11 +02:00
Nextcloud bot b7e32df660
[tx-robot] updated from transifex 2018-07-19 00:12:05 +00:00
Nextcloud bot f78db18201
[tx-robot] updated from transifex 2018-07-17 00:12:08 +00:00
Nextcloud bot 0e0dd2a90b
[tx-robot] updated from transifex 2018-07-11 00:12:15 +00:00
Nextcloud bot a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Roeland Jago Douma 9b6c0ac13c
Merge pull request #10041 from liamdennehy/10001/trashbin-defaults
Safe default behaviour when no users are specified on trashbin:cleanup
2018-06-29 21:39:16 +02:00
Roeland Jago Douma 68f403cea2
Fix and extend tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-29 20:48:09 +02:00
Nextcloud bot ab1b848268
[tx-robot] updated from transifex 2018-06-29 00:12:08 +00:00
Liam Dennehy 68e41a3aae trashbin:cleanup exceptions for invalid options
* throw on no parameters provided
* throw on --all-users and userid provided

Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 22:31:27 +02:00
Liam Dennehy 6bc3d3781d Default behaviour when no users are specified on trashbin:cleanup
* Add option --all-users to explicitly clean all trashbins
* Reject no users on commandline and no --all-users
* Warn when --all-users and userids are specified

Signed-off-by: Liam Dennehy <liam@wiemax.net>
2018-06-28 17:14:45 +02:00
Morris Jobke e4e3387417
Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls
Replace hard coded HTTP status codes with proper calls to http_response_code
2018-06-27 12:14:52 +02:00
Nextcloud bot a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Morris Jobke 79d9841bce
Replace hardcoded status headers with calls to http_response_code()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 16:14:15 +02:00
Morris Jobke ab266a7798
Merge pull request #9626 from lars-sh/patch-1
Workaround for interrupting expired files deletion
2018-06-25 16:44:55 +02:00
Nextcloud bot a431cc3b58
[tx-robot] updated from transifex 2018-06-25 00:11:48 +00:00
Lars Knickrehm 436c4f8954
Improved logging statement 2018-06-24 13:41:16 +02:00
Nextcloud bot e4551106f5
[tx-robot] updated from transifex 2018-06-22 00:12:11 +00:00
Nextcloud bot cad8824a8e
[tx-robot] updated from transifex 2018-06-20 00:12:26 +00:00
Abijeet 419d72e0ee
Adds a test case for the loading symbol in deleted files.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-06-18 07:39:44 +02:00
Abijeet 55216e6b95
Fixes the restore loading icon appearing continuously.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-06-18 07:39:44 +02:00
Abijeet 0c77b93b86
Fixes issues found during running of test cases.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-06-18 07:39:44 +02:00
Abijeet e89f6590e2
Fixed failing test cases for the new actions menu.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-06-18 07:39:44 +02:00
Abijeet 45db89f3e6
Added a new action menu in files and trash list.
Uses the new file-multi-select-menu component.

Towards #7647

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-06-18 07:39:43 +02:00
Nextcloud bot d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Roeland Jago Douma 608456d2a9
Previews on for all trashbin files
* Previews possible for all files in the trashbin
* Set caching
* Use the fileid to find the file

* Fix test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-05 10:17:22 +02:00
Morris Jobke c3fc789b2c
Merge pull request #9550 from nextcloud/bugfix/noid/override_freebusy_sharing_rules
allow admins to disable FreeBusy without modifying ShareAPI capabilities
2018-06-01 12:00:56 +02:00
Nextcloud bot d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Nextcloud bot 9ac36dc30b
[tx-robot] updated from transifex 2018-05-31 00:12:36 +00:00
Nextcloud bot 645eaaa434
[tx-robot] updated from transifex 2018-05-29 00:12:21 +00:00
Nextcloud bot 2b2bbe359e
[tx-robot] updated from transifex 2018-05-28 00:12:45 +00:00
Lars Knickrehm e360885eb0
Workaround for interrupting expired files deletion
Workaround avoiding "Error while running background job (class: OCA\Files_Trashbin\BackgroundJob\ExpireTrash, arguments: ): {"Exception":"OCP\\Files\\NotPermittedException","Message":"","Code":0,"Trace":"#0 \/var\/www\/cloud\/apps\/files_trashbin\/lib\/Trashbin.php(590): OC\\Files\\Node\\File->delete() [...]"
2018-05-28 00:59:20 +02:00
Nextcloud bot f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot 60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Georg Ehrke 367ca563b4
allow admins to override FreeBusy capabilities without modifying ShareAPI capabilities
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-05-22 19:16:26 +02:00
Nextcloud bot 514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Nextcloud bot ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Roeland Jago Douma 5eb72a8a57
Support fileid propfind on trash endpoint
Fixes #9416

In order to support previews on mobile clients they will need the fileid
of files in the trashbin.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-11 20:45:03 +02:00
Roeland Jago Douma 58219638d7
Trashbin propfind respond to oc:size
In order to display the total size of folders also in the clients (and
web) we should return the oc:size.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-10 16:12:33 +02:00
Roeland Jago Douma 48034bdc4a
Merge pull request #9427 from nextcloud/bugfix/noid/no_listing_if_not_in_debug_trash_version
If not in debug disable principal listing
2018-05-10 09:31:19 +02:00
Roeland Jago Douma 17f1653ceb
If not in debug disable principal listing
Trashbin and Version should have the same behaviour as the other
collections.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-08 20:52:14 +02:00
Roeland Jago Douma 21d4ce926e
Propfind for deletion time of trash files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-08 09:08:43 +02:00
Roeland Jago Douma 7f194be3ab
Merge pull request #9202 from nextcloud/feature/1332/trashbin_dav
Trashbin endpoint in DAV
2018-05-01 14:24:38 +02:00
Nextcloud bot 9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
Arthur Schiwon 38a90130ce
move log constants to ILogger
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 10:45:52 +02:00
Roeland Jago Douma c625fc5931
Add folder for trashbin
The trashbin home now contains 2 entries restore and trash.

Made all files strict. Added more types.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma dadc740db5
Use getType to determine type of entry
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma d5937e0fd6
Add propfind properties to trashbin
* get original filename (without the weird timestamp)
* get original location

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma cb617c4949
Add special restore folder
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma f7ca6149d6
Emptry trashbin
A delete on a users trashbin will empty it (the trashbin won't be
deleted of course)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Roeland Jago Douma 09940bcde6
List trashbin in DAV
First steps for #1332

* Add a new DAV collection
* List all files in the trashbin for this user
* Deleting files from trashbin
* Get files from trashbin (just read)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-25 20:25:10 +02:00
Morris Jobke dd34cb7540
Less deprecated calls to OCP\Util::writeLog
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-22 20:41:49 +02:00
Roeland Jago Douma 3dac15a891
Move calls to \OCP\JSON to private \OC_JSON
They should be properly fixed at some point.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-22 13:19:29 +01:00