a155f80485
Merge pull request #10230 from nextcloud/feature/shareoverview
...
Feature/shares overview
2018-07-17 12:53:45 +02:00
cdb42432c3
Jsuinit fixes
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-17 12:26:57 +02:00
f78db18201
[tx-robot] updated from transifex
2018-07-17 00:12:08 +00:00
92e30698bb
Reorder position of "Shared by me" and "Shared with me"
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-16 16:29:17 +02:00
c0fcc0e45c
Make section "deleted shares" a subsection of "shares"
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-16 16:28:57 +02:00
98cf2bab48
Rename "Shares overview" to "Shares"
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-16 16:28:26 +02:00
23785d108d
[tx-robot] updated from transifex
2018-07-16 00:12:11 +00:00
18790858ca
Fix share by/with check
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-14 12:14:21 +02:00
82021b2b1b
Merge pull request #5280 from nextcloud/shared-with-display-name
...
sharedWithDisplayName & sharedWithAvatar
2018-07-13 17:29:57 +02:00
f2b92c44a3
Merge pull request #10224 from nextcloud/fix-formatting-of-email-and-circle-shares
...
Fix formatting of email and circle shares
2018-07-13 14:57:47 +02:00
34368cc031
Fixed sharing coding style and display - Added all shares overview
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Fixed if condition
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-13 12:24:12 +02:00
6f45607f57
Upgraded navigation submenu management and api + created sharing submenu
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-13 09:33:57 +02:00
1f9e50086c
Tiny start of the share overview
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-13 07:31:02 +02:00
ca65b82f04
[tx-robot] updated from transifex
2018-07-13 00:12:02 +00:00
243df99fcf
Fix formatting of email and circle shares
...
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>
2018-07-12 21:24:55 +02:00
3036b1d03d
Merge pull request #9895 from nextcloud/fed-group-shares
...
implement federated group sharing
2018-07-11 21:44:48 +02:00
412f6a6ecc
fix unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:21:00 +02:00
3942d731d2
update unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:48 +02:00
2abc705632
start to get fed group shares into the share dialog
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:47 +02:00
7d2add622e
unshare from self
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:46 +02:00
f5a816262c
accept/decline group shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:46 +02:00
b23032e4c5
implement federated group shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-11 10:11:44 +02:00
0e0dd2a90b
[tx-robot] updated from transifex
2018-07-11 00:12:15 +00:00
a22bc0e787
[tx-robot] updated from transifex
2018-07-10 08:21:14 +00:00
f39dfc7ab8
Fixed jsunit
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
b49bc11fb3
Fix exception
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-05 12:43:57 +02:00
33f85f64c7
Always show menu
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
d86c1e9503
Disable sidebar on deleted share
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
3b835d8076
Js magic for deleted shares
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
6a0552224d
getDeletedSharedWith method
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-05 12:43:57 +02:00
d805959e81
Add API to undelete delete group shares
...
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>
2018-07-05 12:43:56 +02:00
cdf8abb060
look for correct OCM permissions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
9365fd2534
fix external manager tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
41a1528888
implement decline share
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
bbce8c3ea1
adjust to latest api version
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
db428ea547
send accept share notification (WIP)
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
a788f49114
Merge pull request #10046 from nextcloud/fix-getting-the-information-of-a-group-share-as-a-sharee
...
Fix getting the information of a group share as a sharee
2018-06-29 13:14:41 +02:00
326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code
...
Get rid of shareItem
2018-06-29 10:40:32 +02:00
6cb2cb33ac
Fix getting the information of group share as a sharee
...
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>
2018-06-29 08:20:19 +02:00
e4e3387417
Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-http_response_code-calls
...
Replace hard coded HTTP status codes with proper calls to http_response_code
2018-06-27 12:14:52 +02:00
a6666071be
[tx-robot] updated from transifex
2018-06-27 00:11:52 +00:00
79d9841bce
Replace hardcoded status headers with calls to http_response_code()
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-26 16:14:15 +02:00
18cf85d264
[tx-robot] updated from transifex
2018-06-26 00:12:07 +00:00
a431cc3b58
[tx-robot] updated from transifex
2018-06-25 00:11:48 +00:00
5428cd2f50
[tx-robot] updated from transifex
2018-06-23 00:12:41 +00:00
e4551106f5
[tx-robot] updated from transifex
2018-06-22 00:12:11 +00:00
8ebc3d90a0
Merge pull request #9518 from nextcloud/feature/5986/public_share_controller_middleware
...
Public share middleware & controller
2018-06-21 10:09:20 +02:00
f9c98d8621
[tx-robot] updated from transifex
2018-06-21 00:12:47 +00:00
26918e4103
Various apps scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:20:51 +02:00
a596b062f5
Fix index.php links
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 17:54:11 +02:00
Morris Jobke
John Molakvoæ (skjnldsv)
Nextcloud bot
Roeland Jago Douma
Daniel Calviño Sánchez
Bjoern Schiessle
Roeland Jago Douma