upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-19 02:38:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
52455 commits 690 branches 1186 tags 6.6 GiB
Commit graph

355 commits

Author SHA1 Message Date
John Molakvoæ
97e7fdb6c6
Merge pull request #19897 from nextcloud/backport/19777/stable18 
[stable18] Properly emit Viewer event on files and files_sharing
 2020-03-13 11:55:52 +01:00
John Molakvoæ (skjnldsv)
c4f1389289 Use dispatchTyped 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-03-12 07:48:20 +00:00
John Molakvoæ (skjnldsv)
f74876eb3c Properly emit Viewer event on files and files_sharing 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-03-12 07:48:19 +00:00
Joas Schilling
26568fa08b Unify the code a bit 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-10 19:32:05 +00:00
Joas Schilling
33b048dd1c Use contacts name on federated activities 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-10 19:32:05 +00:00
Gary Kim
00dd295c09
Do not allow transfer ownership when the user isn't the owner 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2020-03-04 14:05:58 +08:00
Julius Härtl
a606888f50 Make sure that the transfer entry is present in the database 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-02-24 19:39:55 +00:00
Joas Schilling
81352411be Fix event type 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-06 19:32:02 +00:00
Roeland Jago Douma
38735c2bd0 Allow specifying this is the first login 
On firstlogin we allow non empty target folders. So that for guest
transfers the user sees the same UI.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-02-03 15:00:03 +00:00
Tobia De Koninck
c3092fda9a Catch \Error in Transfer::restoreShares 
This makes the command more fault tolerant. An \Error can happen when
e.g. the owner of a share is null.
If we don't catch this, the restore process will stop in an unknown
state.

Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
 2020-02-03 15:00:03 +00:00
Tobia De Koninck
6cc23b170a Prevent transferring data to user which never loggedin 
Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
 2020-02-03 15:00:03 +00:00
Tobia De Koninck
0b33aefc86 Add option to transfer-ownership to move data 
This will move the home folder of own user to another user. Only allowed
if that other user's home folder is empty.
Can be used as workaround to rename users.

Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
 2020-02-03 15:00:03 +00:00
John Molakvoæ (skjnldsv)
986ac005e0 Fix Sidebar legacy FileInfoModel requirement 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-01-16 16:12:55 +00:00
John Molakvoæ (skjnldsv)
e71bc1d212 Fix webdav url 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-01-10 18:12:24 +00:00
Roeland Jago Douma
04031f606a
Merge pull request #18478 from nextcloud/fix/direct-editing-invalid-editor-id 
Do not generate tokens for editor IDs that do not exist
 2019-12-22 14:27:28 +01:00
Julius Härtl
0ddb9c0136
Expose exception message in the response 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-20 11:10:33 +01:00
Christoph Wurst
1b46621cd3
Update license headers for 18 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-20 09:23:25 +01:00
Sascha Wiswedel
a1df5d1e98
added line breaks to incoming transfer notification 
wrapped notifications into double quotes to make line breaks possible

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:15 +01:00
Sascha Wiswedel
6a6b6dd1a4
added patience note for sharee 
note about incoming transfer taken out by background job

resolves #18272

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
a64b5de491
transfer ownership dialog word choice 
Use Reject instead of Decline


Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
f567566803
notification polishing 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
f1319e1bc5
Transfer ownership function polishing 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:12 +01:00
blizzz
c96aa7e1a8
Merge pull request #18359 from nextcloud/fix/18271/dismiss_transfer_ownership_notification 
Dismiss transferownership notification cancels transfer
 2019-12-13 15:28:25 +01:00
Christoph Wurst
b81b824da1
Add typed events for the filesystem/scanner 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-13 09:41:05 +01:00
Roeland Jago Douma
3f21b7b70a
Dismiss transferownership notification cancels transfer 
Fixes #18271

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-11 12:58:44 +01:00
Roeland Jago Douma
9a40ccfbf0
Merge pull request #18224 from nextcloud/bugfix/noid/direct-editing-path 
Use file path for direct editing
 2019-12-11 11:17:26 +01:00
Joas Schilling
059968e1c7
Pick a shorter name for the transfer ownership table 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-10 11:01:26 +01:00
Roeland Jago Douma
0360ab408e
Merge pull request #18256 from nextcloud/files-aditional-scripts-new-events 
Use non-depricated events for loading additional scripts in files app
 2019-12-09 21:24:55 +01:00
Daniel Kesselberg
0016480370
Decouple resource provider registration 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-07 22:04:07 +01:00
Roeland Jago Douma
4bf5a23ec0
Merge pull request #18242 from nextcloud/directEditingEditorWithId 
add id to editor of direct editing
 2019-12-05 19:48:50 +01:00
Robin Appelman
7d1206f6f2
use OCP\EventDispatcher\GenericEvent for loading additional scripts in the files app 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-12-05 16:05:18 +01:00
Christoph Wurst
5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Julius Härtl
e29a76bc79
Use file path for direct editing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-05 09:54:58 +01:00
tobiasKaminsky
fdaf9aed1f
add id to editor of direct editing 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2019-12-05 09:45:07 +01:00
Roeland Jago Douma
50985e5461
Merge pull request #17913 from nextcloud/fix/transfer-ownership-move-files-error-handling 
Catch file transfer error and stop transfer ownership command
 2019-12-04 13:53:43 +01:00
John Molakvoæ
bfb9ccec1f
Fix files app LoadSidebar event (#18213) 
Fix files app LoadSidebar event
 2019-12-04 12:47:40 +01:00
John Molakvoæ (skjnldsv)
241aac9f94 Fix files app LoadSidebar event 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-04 08:07:42 +00:00
Joas Schilling
b721095507
Fix mixed up message and subject on notifications for file transfer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-12-03 17:52:33 +01:00
Christoph Wurst
08a1b928aa
Also allow transfer ownership of files 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-02 15:28:49 +01:00
Roeland Jago Douma
5274c54268
Add a transfer ownership background job 
This job can be initiated by a user to transfer a file/folder to a
target user.

The target user will have to accept the job.
Once that is done the transfers is initiated in the background.

Both parties get notified when the job is done.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-02 15:28:47 +01:00
Julius Härtl
bde624b074
Only expose link to info endpoint in capabilties 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:45 +01:00
Julius Härtl
fb1b88ac63
Expose editor id for creators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:44 +01:00
Julius Härtl
329e8c2604
Add mimetype to creators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:44 +01:00
Julius Härtl
9a2694fcb0
Code style fixes and cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 19:56:40 +01:00
Julius Härtl
bc36cc808f
Move editor list to capabilities 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 14:36:21 +01:00
Julius Härtl
103c6fb39e
Add background job for token cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 14:36:20 +01:00
Julius Härtl
e52793c69e
Direct editing API to allow file editing using a one-time token for 
mobile apps

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-27 14:36:20 +01:00
Christoph Wurst
70f4e7e10a
Catch file transfer error and stop transfer ownership command 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-27 09:21:17 +01:00
Christoph Wurst
07c5f3775c
Extract transfer ownership logic into a reusable service 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-11-26 08:50:19 +01:00
Roeland Jago Douma
a9fb567621
Merge pull request #18107 from nextcloud/undefined-index-owner 
dont throw undefined index errors for storages that have no owner set
 2019-11-25 20:53:02 +01:00