wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
44821 commits 157 branches 562 tags 714 MiB
Commit graph

3830 commits

Author SHA1 Message Date
Bjoern Schiessle
977c462698
move the note up, so that it is also visible in the file drop view 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:21 +02:00
John Molakvoæ (skjnldsv)
3a11c26cb4
Public fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv)
c71d3dc9bf
Public share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
Bjoern Schiessle
e951ad5034
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv)
0a7e34f6c8
Popovermenu migration 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
Bjoern Schiessle
fa44300016
unit tests updated 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv)
4e08d8342e
UI set share note! 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
Bjoern Schiessle
72d2455577
return the as well note if we fetch a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
660b5d1af6
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
eab4d96c4c
some small template fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
4f59c8e8ae
show note on public link page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a93f2a648b
allow to add a personal note to a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
John Molakvoæ (skjnldsv)
842583038b
Cleanup structure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:35:21 +02:00
Roeland Jago Douma
596655fa1a
Merge pull request #10295 from nextcloud/fix/noid/fix-failing-test 
Disable failing test in legacy sharing tests
 2018-07-19 12:02:59 +02:00
Morris Jobke
6a06745e57
Disable failing test in legacy sharing tests 
* seems to be a race condition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-19 11:06:23 +02:00
Nextcloud bot
b7e32df660
[tx-robot] updated from transifex 2018-07-19 00:12:05 +00:00
Nextcloud bot
ad9b458c74
[tx-robot] updated from transifex 2018-07-18 00:12:04 +00:00
Morris Jobke
a155f80485
Merge pull request #10230 from nextcloud/feature/shareoverview 
Feature/shares overview
 2018-07-17 12:53:45 +02:00
John Molakvoæ (skjnldsv)
cdb42432c3
Jsuinit fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-17 12:26:57 +02:00
Nextcloud bot
f78db18201
[tx-robot] updated from transifex 2018-07-17 00:12:08 +00:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
98cf2bab48
Rename "Shares overview" to "Shares" 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-16 16:28:26 +02:00
Nextcloud bot
23785d108d
[tx-robot] updated from transifex 2018-07-16 00:12:11 +00:00
John Molakvoæ (skjnldsv)
18790858ca
Fix share by/with check 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-14 12:14:21 +02:00
Morris Jobke
82021b2b1b
Merge pull request #5280 from nextcloud/shared-with-display-name 
sharedWithDisplayName & sharedWithAvatar
 2018-07-13 17:29:57 +02:00
Morris Jobke
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
John Molakvoæ (skjnldsv)
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
John Molakvoæ (skjnldsv)
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
Roeland Jago Douma
1f9e50086c
Tiny start of the share overview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-13 07:31:02 +02:00
Nextcloud bot
ca65b82f04
[tx-robot] updated from transifex 2018-07-13 00:12:02 +00:00
Daniel Calviño Sánchez
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
Morris Jobke
3036b1d03d
Merge pull request #9895 from nextcloud/fed-group-shares 
implement federated group sharing
 2018-07-11 21:44:48 +02:00
Bjoern Schiessle
412f6a6ecc
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:21:00 +02:00
Bjoern Schiessle
3942d731d2
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:48 +02:00
Bjoern Schiessle
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
Bjoern Schiessle
7d2add622e
unshare from self 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:46 +02:00
Bjoern Schiessle
f5a816262c
accept/decline group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:46 +02:00
Bjoern Schiessle
b23032e4c5
implement federated group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Nextcloud bot
0e0dd2a90b
[tx-robot] updated from transifex 2018-07-11 00:12:15 +00:00
Nextcloud bot
a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
John Molakvoæ (skjnldsv)
f39dfc7ab8
Fixed jsunit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-05 12:43:57 +02:00
Roeland Jago Douma
b49bc11fb3
Fix exception 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
33f85f64c7
Always show menu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
d86c1e9503
Disable sidebar on deleted share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
3b835d8076
Js magic for deleted shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-05 12:43:57 +02:00
John Molakvoæ (skjnldsv)
6a0552224d
getDeletedSharedWith method 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-05 12:43:57 +02:00
Roeland Jago Douma
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
Bjoern Schiessle
cdf8abb060
look for correct OCM permissions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:31 +02:00
Bjoern Schiessle
9365fd2534
fix external manager tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:30 +02:00