upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-20 17:43:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54
52915 commits 748 branches 1188 tags 6.5 GiB
Commit graph

243 commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv)
c966656cb8 Do not filter id matching userId on non-user-share shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-14 15:03:44 +00:00
Roeland Jago Douma
04b02572c3
Have share permissions on link shares if it is enabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-26 11:28:42 +02:00
Julius Härtl
4a2ded0199
Link shares have reshare permission if outgoing federated shares are enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-05-26 11:28:42 +02:00
Roeland Jago Douma
5d8c24009c Allow to navigate to others with access from the sidebar 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-04-30 08:28:37 +00:00
John Molakvoæ (skjnldsv)
b990b010fa Fix Sharing recommendation user display 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-04-22 13:08:47 +00:00
Joas Schilling
184155555b Allow the video player on the hide download 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-20 08:06:51 +00:00
Joas Schilling
eb105e7eb4 Fix willReturnOnConsecutiveCalls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-13 14:53:09 +00:00
Joas Schilling
8bae6937f8 Don't allow anchors and queries in remote urls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-13 14:53:09 +00:00
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)
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
John Molakvoæ (skjnldsv)
1125f1767c Fix import order and formatting 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-03-12 07:48:19 +00:00
Joas Schilling
e96bb6c8bc Don't break when one remote share is down 
getFileInfo can also return false

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-11 08:38:14 +00:00
Joas Schilling
75cb63beea Allow single file downloads so the video player works again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-02 07:06:24 +00:00
Joas Schilling
6db47f7a6e Prevent archieved download on secure view 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-02-08 09:19:43 +00:00
Roeland Jago Douma
bf6a7a8e3a Disable link shares of disabled users 
Fixes #10869

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-02-07 08:14:48 +00:00
Roeland Jago Douma
9321364587 Don't show link shares hash in inherited share list 
This adds no value at all. Just showing the text "(Shared link)" now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-15 10:07:26 +00:00
Maxence Lange
554c4a7cf8 moving ->getParent earlier 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-01-08 08:56:14 -01:00
Julius Härtl
445274cf93
Add pending share list to frontend 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-07 19:35:45 +01:00
Roeland Jago Douma
fbed6a3416
A pending shares overview 
Now that we accept shares we should show an overview of shares that are
pending. This first part is the small API to get a list of the currently
pending shares.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-07 08:53:33 +01:00
Roeland Jago Douma
fb6b84b5c9
Accept shares when you open mail 
Fixes #18380

When you open a direct share to yourself. We should autoaccept the
share.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-06 16:48:21 +01:00
Roeland Jago Douma
1672ff3bef
Do not use $_GET 
The appframework is more than capable of handling this properly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-01-05 20:13:11 +01:00
Maxence Lange
441b81a3af confirm resharing rights if viewer is current owner 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-01-02 11:34:20 -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
Roeland Jago Douma
e7dc91002f
Allow users to specify to accept (internal) shares by default 
Fixes #18255

A new user setting allows a user to always accept (internal) shares. For
example if they don't like accepting shares manually ;)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-17 10:49:29 +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
Roeland Jago Douma
7a45413559
Always do sharee lookup on lookup server in GS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-05 08:38:33 +01:00
Maxence Lange
f2c7ca4584
fixing tests + avoid duplicate in getFormattedShares() 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-12-03 08:13:22 +01:00
Maxence Lange
ccf7d87c11
integration tests 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
add tests on non-owner pov

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
duplicate

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
small fixes

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
removed tags

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-12-03 08:10:27 +01:00
Maxence Lange
5794f14df9
Inherited Shares 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
working on users with resharing rights

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-getLogger()

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
cleaning

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
fix type

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Update SharingRightsException.php
 2019-12-03 08:10:27 +01:00
Roeland Jago Douma
77d136cbdf
Apply share permission mask to all files obtained via shareinfo 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-26 11:07:01 +01:00
Roeland Jago Douma
c7d5b8fc49
Merge pull request #18079 from nextcloud/fixes/phpcs 
Some php-cs fixes
 2019-11-25 14:07:00 +01:00
Roeland Jago Douma
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
waleczny
6e3ea09b1c
Get first element of nodes array 
Geting first element of nodes array instead of element with key 0. In some cases key 0 not exists in this array ie. when file is shared from group folder with member of this group who have no permission to read this file.
 2019-11-18 23:33:26 +01:00
Joas Schilling
e79ab7d0c5
The share manager knows which provider can accept shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-11-12 17:37:47 +01:00
Joas Schilling
520042bbd0
Allow to accept group shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-11-12 17:36:58 +01:00
Joas Schilling
e96c9e0e4a
Add the notifier and the API endpoint for user shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-11-12 17:33:50 +01:00
John Molakvoæ (skjnldsv)
2fd057513a Fix current user edit/delete permissions 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-29 13:20:08 +01:00
John Molakvoæ (skjnldsv)
cc4362df4f Unify code to get shares of a file or also including subfiles 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-25 21:41:12 +02:00
John Molakvoæ (skjnldsv)
dbb6b4cbb9 Filter out duplicated shares before processing them 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-25 21:41:12 +02:00
Daniel Calviño Sánchez
8098abee60 Do not return shares with the current user 
Getting the shares of a file no longer returns shares with the current
user for consistency with the results when getting the shares including
subfiles.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-25 21:40:50 +02:00
Daniel Calviño Sánchez
1afefc2d9a Extract method to get all shares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-25 21:39:49 +02:00
Daniel Calviño Sánchez
222e5a9a9f Add missing share types when getting shares of a file 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-25 21:39:49 +02:00
Daniel Calviño Sánchez
24febe1e41 Unify share type sorting when getting shares of a file or with subfiles 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-25 21:39:49 +02:00
Daniel Calviño Sánchez
0599536c82 Remove unneeded calls to "ShareManager::shareProviderExists()" 
"ShareManager::getSharesBy()" already checks if the share provider
exists before returning the shares and, if the provider does not exist,
it returns an empty array. Therefore it is not needed to explicitly
check if the provider exists or not.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-25 21:39:49 +02:00
Daniel Calviño Sánchez
5c7c308220 Include the share in the Files_Sharing::loadAdditionalScripts event 
This provides a better context for apps using the event, for example to
load one script or another depending on whether the share is a file or a
folder.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-17 18:22:54 +02:00
John Molakvoæ (skjnldsv)
ff895abac0
Fix shares read permissions 
A user with reshare permissions on a file is now able to get any share
of that file (just like the owner).

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 21:40:30 +02:00
John Molakvoæ (skjnldsv)
b1069b29fa
Add checks for whether a user with access to a share can delete it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
John Molakvoæ (skjnldsv)
f02cff1304
Extract check for whether a user with access to a share can edit it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
John Molakvoæ (skjnldsv)
c49469c4d8
Prevent non owners to update others link shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 08:19:07 +02:00
John Molakvoæ (skjnldsv)
c8d50538b8
Use same settings for mail share as link shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 08:19:07 +02:00