averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,452 Commits 712 Branches 1,186 Tags
5cd1880daa048a685da689c7f41a2e50486494de
Commit Graph

120 Commits

Author SHA1 Message Date
Morris Jobke
24d436cb60 Remove unneeded casts that were found by Psalm 
In preparation of the update of Psalm from 4.2.1 to 4.3.1+ (see https://github.com/nextcloud/server/pull/24521)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-11 13:14:41 +01:00
Christoph Wurst
d89a75be0b Update all license headers for Nextcloud 21 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-16 18:48:22 +01:00
Julius Härtl
102402bfcb Show unique displayname context in the user share list entries 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-14 11:14:59 +01:00
Julius Härtl
c4ea37b8a1 Address minor comments 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-09 15:51:41 +01:00
Julius Härtl
f3150f29a7 Introduce deck share type to ShareAPIController 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-12-09 13:20:24 +01:00
Maxence Lange
28252594a2 circleId too short in some request 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2020-11-13 08:59:22 -01:00
Richard Steinmetz
89f7e2ab64 Indicate preview availability in share api responses 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2020-10-13 14:12:42 +02:00
Roeland Jago Douma
7e6f04490e Merge pull request #22393 from nextcloud/fix/license-headers-20 
Update the license headers for Nextcloud 20
 2020-08-24 22:03:00 +02:00
John Molakvoæ (skjnldsv)
6d576a9100 Fix missing FN from federated contact 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-08-24 15:15:32 +02:00
Christoph Wurst
2a054e6c04 Update the license headers for Nextcloud 20 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-24 14:54:25 +02:00
John Molakvoæ
565ccb08cd Merge pull request #22109 from nextcloud/feature/20931/followup-1 2020-08-17 22:13:45 +02:00
Georg Ehrke
5b26487f14 Expose status via Collaborators API 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-08-14 17:04:52 +02:00
Daniel Kesselberg
6f8147b18f Fix some MissingDocblockType or InvalidDocblock warnings. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-14 15:10:48 +02:00
Gary Kim
a2cedcefee Add user input for link share labels 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2020-07-14 10:02:17 +08:00
Daniel Calviño Sánchez
37f231333f Fix reference to wrong class name 
\OCP\IShare does not exist; the right name is \OCP\Share\IShare,
although it is already imported as IShare.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-05-29 01:41:06 +02:00
Roeland Jago Douma
ef34f72167 Have share permissions on link shares if it is enabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-05-15 08:18:03 +02:00
John Molakvoæ (skjnldsv)
a26ca1e638 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>
 2020-05-05 21:36:46 +02:00
John Molakvoæ (skjnldsv)
ff20da637e Fix federated link sharing permissions 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-05-04 11:48:11 +00:00
Roeland Jago Douma
d466a7b808 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-29 17:53:35 +00:00
Christoph Wurst
cb057829f7 Update license headers for 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-29 11:57:22 +02:00
Julius Härtl
5646f7c761 Link shares have reshare permission if outgoing federated shares are enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-04-21 14:35:29 +02:00
Christoph Wurst
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
Christoph Wurst
14c996d982 Use elseif instead of else if 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 10:35:09 +02:00
Christoph Wurst
afbd9c4e6e Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Roeland Jago Douma
7613681627 Don't try to format deleted shares 
Fixes #15455

The issue is that we have a fallback for shares to use the target. So
when the target exists again we happily format it (not that the shares
are still invalid).

This just tries to get the node. If we can't then boom.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-02 09:18:04 +01:00
Roeland Jago Douma
fc77f530d7 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 09:21:53 +01:00
Christoph Wurst
6127c288e8 Fix license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-13 14:23:49 +01: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
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
5bf3d1bb38 Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +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
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
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