d7aa1c00ed
Merge pull request #21983 from nextcloud/backport/21628/stable19
...
[stable19] fix moving files from external storage to object store trashbin
2020-08-19 21:29:01 +02:00
193b3ead51
fix object store trashbin handling
...
object stores are "special" given how they interact with the cache on their own
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-31 17:21:28 +02:00
b6a600e653
rollback cache rename if trashbin move fails
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-23 21:01:23 +00:00
c567b1d6b2
fix moving files from external storage to object store trashbin
...
having the "cache rename" after the "storage move" caused the target
to get the fileid from the source file, without taking care that the object
is stored under the original file id.
By doing the "cache rename" first, we trigger the "update existing file"
logic while moving the file to the object store and the object gets stored for the
correct file id
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-23 21:01:22 +00:00
38db847164
allow admin to configure the max trashbin size
...
this allows an admin to configure the max trashbin size instead of always relying on the users quota.
The trashbin size can be configured using the `occ trash:size` command and can be set both globally and per-user
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-23 14:30:07 +00:00
614acc9419
add locking to resolve concurent move to trashbin conflicts
...
uses a lock to prevent two requests from moving a file to the trashbin concurrently
(causing sql duplicate key errors)
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-05-06 20:36:55 +02:00
cb057829f7
Update license headers for 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-29 11:57:22 +02:00
734c62bee0
Format code according to PSR2
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:56:50 +02:00
28f8eb5dba
Add visibility to all constants
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:54:27 +02:00
1584c9ae9c
Add visibility to all methods and position of static keyword
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 16:51:06 +02:00
caff1023ea
Format control structures, classes, methods and function
...
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.
This also removes and empty lines from method/function bodies at the
beginning and end.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
14c996d982
Use elseif instead of else if
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +02:00
afbd9c4e6e
Unify function spacing to PSR2 recommendation
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +02:00
41b5e5923a
Use exactly one empty line after the namespace declaration
...
For PSR2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
1a9330cd69
Update the license headers for Nextcloud 19
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +02:00
463b388589
Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports
...
Remove unused imports
2020-03-27 17:14:08 +01:00
b80ebc9674
Use the short array syntax, everywhere
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +01:00
74936c49ea
Remove unused imports
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:08:08 +01:00
6127c288e8
Fix license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-01-13 14:23:49 +01:00
b3ad27f7db
Trash bin: fix exception triggered if no correct fileId is provided.
...
This fixes #17115
Signed-off-by: Simon Spannagel <simon.spannagel@cern.ch>
2020-01-07 23:47:07 +01:00
5bf3d1bb38
Update license headers
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
c3748cfee3
respect shareapi_allow_share_dialog_user_enumeration in Principal backend for Sabre/DAV
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-12-03 09:44:07 +01:00
68748d4f85
Some php-cs fixes
...
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
136c4ef925
dont expose metadata etag for now
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:36 +01:00
1b6e647b63
expose filecache extension data in FileInfo
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:32 +01:00
13960b69da
Merge pull request #17509 from nextcloud/fix/application-singleton
...
Fix Application instances created multiple times
2019-11-04 18:18:32 +01:00
964dc0a955
set retention obligation on existing `expiration` in tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-04 16:54:22 +01:00
e8095cf737
use OCP\EventDispatcher\Event over Symfony's deprecated Event
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-10-17 13:31:48 +02:00
543190f8b3
Do not create Application instances directly
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-11 08:33:09 +02:00
ce433637da
allow trash backends to overwrite the tooltip for trash items
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-10-05 10:23:30 +02:00
8c77d3bfb6
Merge pull request #16664 from nextcloud/bugfix/emit-moveToTrash-limit
...
Emit moveToTrash event only for the deleting user
2019-09-06 17:46:03 +02:00
d744c04a86
Merge pull request #16534 from nextcloud/trash-copy-free-space
...
dont try to copy trash items to user if the user has not enough free space
2019-09-04 20:06:43 +02:00
9bf8ee701f
Update apps/files_trashbin/lib/Trashbin.php
...
Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
2019-09-04 13:06:07 +02:00
f452e23a7d
Merge pull request #16666 from nextcloud/feature/calendar/delegation
...
Feature/calendar/delegation
2019-08-15 19:30:45 +02:00
01a4644cad
Use the proxymapper to obtain valid proxy data
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-15 15:41:27 +02:00
8e7c287e2a
Use the owner from the storage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-07 16:47:43 +02:00
41f8be47eb
files_trashbin: File can be without extension
...
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
2019-08-07 16:04:09 +02:00
b1832c8bef
Emit moveToTrash event only for the deleting user
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-08-06 17:45:50 +02:00
fafce34aa0
dont try to copy trash items to user if the user has not enough free space
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-07-29 14:05:49 +02:00
3174012adf
Add event dispatcher to OCP
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-06-25 10:02:27 +02:00
50a2ab8bc6
Use higher preview resolution in trashbin
...
For #14639
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-16 14:56:26 +01:00
62a969f056
dont try to restore a trashbin item to a readonly target
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-14 16:18:43 +01:00
0d41138c6e
prevent recursion when moving a file to the trashbin
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-13 11:42:01 +01:00
f0c85a0f5f
Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav
...
Change CALDAV to allow calendars be shared with circles.
2019-03-13 00:06:46 +01:00
dd2496b275
Use proper dependency injection for app manager
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 16:00:47 +01:00
4704e719ed
Only fetch size of this storage without mount points - ref #14412
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-01 12:05:18 +01:00
f6967a974f
Revert "Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota)"
...
This reverts commit e806aa658c
2019-03-01 12:03:33 +01:00
7519a9a990
Merge pull request #14412 from nextcloud/fileinfo-raw-size
...
add option to get raw size (without submounts) from fileinfo
2019-02-28 13:49:27 +01:00
3459ffc4d1
Merge pull request #13844 from felixn/bugfix/10862-trash-bin-ignores-trashbin_retention_obligation
...
Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
2019-02-27 15:55:20 +01:00
8fc47c6f00
add option to get raw size (without submounts) from fileinfo
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-02-27 15:35:44 +01:00
Morris Jobke
Robin Appelman
Christoph Wurst
Christoph Wurst
simonspa
Georg Ehrke
Roeland Jago Douma
John Molakvoæ
Arthur Schiwon
Roeland Jago Douma
Jakub Onderka
Julius Härtl