summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-07-232-0/+6
|
* [tx-robot] updated from transifexNextcloud bot2018-07-226-0/+20
|
* Cleanup structureJohn Molakvoæ (skjnldsv)2018-07-201-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #10295 from nextcloud/fix/noid/fix-failing-testRoeland Jago Douma2018-07-191-0/+2
|\ | | | | Disable failing test in legacy sharing tests
| * Disable failing test in legacy sharing testsMorris Jobke2018-07-191-0/+2
| | | | | | | | | | | | * seems to be a race condition Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-07-1914-0/+52
|/
* [tx-robot] updated from transifexNextcloud bot2018-07-18102-118/+122
|
* Merge pull request #10230 from nextcloud/feature/shareoverviewMorris Jobke2018-07-173-93/+164
|\ | | | | Feature/shares overview
| * Jsuinit fixesJohn Molakvoæ (skjnldsv)2018-07-171-3/+10
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Reorder position of "Shared by me" and "Shared with me"Morris Jobke2018-07-161-8/+10
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Make section "deleted shares" a subsection of "shares"Morris Jobke2018-07-161-12/+8
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Rename "Shares overview" to "Shares"Morris Jobke2018-07-162-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fix share by/with checkJohn Molakvoæ (skjnldsv)2018-07-141-4/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed sharing coding style and display - Added all shares overviewJohn Molakvoæ (skjnldsv)2018-07-131-112/+71
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Fixed if condition Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Upgraded navigation submenu management and api + created sharing submenuJohn Molakvoæ (skjnldsv)2018-07-131-40/+38
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Tiny start of the share overviewRoeland Jago Douma2018-07-133-30/+139
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-07-172-0/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2018-07-162-0/+8
| |
* | Merge pull request #5280 from nextcloud/shared-with-display-nameMorris Jobke2018-07-132-2/+132
|\ \ | | | | | | sharedWithDisplayName & sharedWithAvatar
| * | SharedWithDisplayName + SharedWithAvatarMaxence Lange2018-05-212-2/+132
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #10224 from ↵Morris Jobke2018-07-132-8/+62
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/fix-formatting-of-email-and-circle-shares Fix formatting of email and circle shares
| * | Fix formatting of email and circle sharesDaniel Calviño Sánchez2018-07-122-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | Due to a misplaced "||" instead of "===" the condition was always met, so every share type in the conditional chain after the remote and remote group shares was formatted as a remote/remote group share. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-07-132-0/+48
|/ /
* | Merge pull request #9895 from nextcloud/fed-group-sharesMorris Jobke2018-07-1110-103/+278
|\ \ | | | | | | implement federated group sharing
| * | fix unit testsBjoern Schiessle2018-07-112-1/+4
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | update unit testsBjoern Schiessle2018-07-115-37/+74
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | start to get fed group shares into the share dialogBjoern Schiessle2018-07-111-0/+10
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | unshare from selfBjoern Schiessle2018-07-111-10/+15
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | accept/decline group sharesBjoern Schiessle2018-07-113-15/+96
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | implement federated group sharesBjoern Schiessle2018-07-114-49/+88
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | [tx-robot] updated from transifexNextcloud bot2018-07-114-2/+12
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-07-1016-4/+64
| |
* | Fixed jsunitJohn Molakvoæ (skjnldsv)2018-07-051-2/+2
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Fix exceptionRoeland Jago Douma2018-07-051-0/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Always show menuJohn Molakvoæ (skjnldsv)2018-07-051-13/+11
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Disable sidebar on deleted shareJohn Molakvoæ (skjnldsv)2018-07-054-9/+23
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Js magic for deleted sharesJohn Molakvoæ (skjnldsv)2018-07-055-19/+171
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | getDeletedSharedWith methodJohn Molakvoæ (skjnldsv)2018-07-051-11/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Add API to undelete delete group sharesRoeland Jago Douma2018-07-054-0/+134
| | | | | | | | | | | | | | | | | | | | | | When a group share is deleted we keep track of this in the DB. Right now it is only possible for a recipient to get back the share by asking the sharer to delete it and to share it again. This doesn't scale. This endpoint makes it possible to get back the share. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | look for correct OCM permissionsBjoern Schiessle2018-07-021-6/+56
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | fix external manager testsBjoern Schiessle2018-07-021-10/+29
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | implement decline shareBjoern Schiessle2018-07-021-1/+16
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | adjust to latest api versionBjoern Schiessle2018-07-021-4/+8
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | send accept share notification (WIP)Bjoern Schiessle2018-07-023-0/+49
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #10046 from ↵Morris Jobke2018-06-292-7/+7
|\ \ | | | | | | | | | | | | nextcloud/fix-getting-the-information-of-a-group-share-as-a-sharee Fix getting the information of a group share as a sharee
| * | Fix getting the information of group share as a shareeDaniel Calviño Sánchez2018-06-292-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the receiver of a group share modifies it (for example, by moving it to a different folder) the original share is not modified, but a "ghost" share that keeps track of the changes made by that specific user is used instead. By default, the method "getShareById" in the share provider returns the share from the point of view of the sharer, but it can be used too to get the share from the point of view of a sharee by providing the "recipient" parameter (and if the sharee is not found then the share is returned from the point of view of the sharer). The "ShareAPIController" always formats the share from the point of view of the current user, but when getting the information of a specific share the "recipient" parameter was not given, so it was always returned from the point of view of the sharer, even if the current user was a sharee. Now the "recipient" parameter is set to the current user, and thus the information of the share is returned from the point of view of the current user, be it the sharer or a sharee. Note that this special behaviour of "getShareById" happens only with group shares; with other types of shares the share is the same for the sharer and the sharee, and thus the parameter is ignored; it was added for them too just for consistency. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #8854 from nextcloud/drop-old-sharing-codeMorris Jobke2018-06-292-135/+0
|\ \ \ | |/ / |/| | Get rid of shareItem
| * | Backends are legacy code as well and need to goRoeland Jago Douma2018-05-231-114/+0
| | | | | | | | | | | | | | | | | | so no need to fix the tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Get rid of shareItemMorris Jobke2018-05-232-22/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #10009 from ↵Morris Jobke2018-06-271-4/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls Replace hard coded HTTP status codes with proper calls to http_response_code