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

4039 commits

Author SHA1 Message Date
Nextcloud bot
503fbc953e
[tx-robot] updated from transifex 2018-08-24 00:12:20 +00:00
Morris Jobke
2219d35207
Merge pull request #10815 from nextcloud/fix/noid/missingreturnval 
returning of $tr is expected, otherwise ending up in a JS error
 2018-08-23 14:53:00 +02:00
Nextcloud bot
c0f48a7b40
[tx-robot] updated from transifex 2018-08-23 00:12:59 +00:00
Arthur Schiwon
78f61b2ade
returning of $tr is expected, otherwise ending up in a JS error 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-23 00:28:03 +02:00
Nextcloud bot
be3438ca97
[tx-robot] updated from transifex 2018-08-21 00:12:16 +00:00
Morris Jobke
6d749bf021
Merge pull request #10700 from nextcloud/fix/10516/sharepermissions 
Fix share dialog sidebar in share views
 2018-08-20 17:14:12 +02:00
Nextcloud bot
1958a710d8
[tx-robot] updated from transifex 2018-08-20 00:12:26 +00:00
Julius Härtl
de119eefd6
Merge pull request #10707 from nextcloud/dark-theme-fixes 
Fix public pages background
 2018-08-18 11:41:39 +02:00
Nextcloud bot
82854b5042
[tx-robot] updated from transifex 2018-08-18 00:12:35 +00:00
Robin Appelman
67f3d6f0a6
cache parent exists status during share setup 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-16 21:28:01 +02:00
Robin Appelman
720b27d60b
only determine is sharing is disabled for a user once 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-16 21:27:54 +02:00
Robin Appelman
b5217b6f63
don't check if target dir exists when using the default share target directory 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-16 21:27:51 +02:00
Robin Appelman
b79f338e71
re-use view instances for shared storages 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-16 21:27:48 +02:00
Robin Appelman
bc4f10ad83
more efficient way to detect added and removed mounts 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-16 21:27:45 +02:00
Robin Appelman
3155c1bd9a
more efficient unique share target generation 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-16 19:54:42 +02:00
Julius Härtl
a4e042c706
Merge pull request #10695 from nextcloud/sharing-public-settings-fixes 
Fix password enforce on public links
 2018-08-16 09:38:58 +02:00
Roeland Jago Douma
2b5ec3755e
Merge pull request #10692 from nextcloud/deleted-share-remove-actions 
Do not show action menu if no actions are available
 2018-08-16 08:32:19 +02:00
John Molakvoæ (skjnldsv)
c435bfe703
Disabled checkboxes and design fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-16 07:31:17 +02:00
John Molakvoæ (skjnldsv)
7299eb3e20
Fix public pages background 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-16 07:17:28 +02:00
Nextcloud bot
b0af604d0e
[tx-robot] updated from transifex 2018-08-16 00:12:17 +00:00
Arthur Schiwon
7f58f36b18
remove unexecutable code 
OCA.Sharing.SharedFileInfo was never defined and that stopped execution.
Interestingly, FF never showed me an error.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-08-15 15:20:41 +02:00
John Molakvoæ (skjnldsv)
b082278f04
Do not show action menu if no actions are available 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-15 09:39:12 +02:00
John Molakvoæ (skjnldsv)
0e23193b32
Added feedback on autocomplete ui 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-15 08:59:06 +02:00
John Molakvoæ (skjnldsv)
a95dc4d3a7
Ellipsis long username/mails in share view 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-15 08:45:07 +02:00
Nextcloud bot
62a9ec12bc
[tx-robot] updated from transifex 2018-08-15 00:13:40 +00:00
Nextcloud bot
ccb040ee01
[tx-robot] updated from transifex 2018-08-13 00:12:09 +00:00
Nextcloud bot
4cdad9b69f
[tx-robot] updated from transifex 2018-08-11 00:12:30 +00:00
Roeland Jago Douma
90a656305b
Bump autoloaders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-10 15:03:22 +02:00
Nextcloud bot
103a2c30fb
[tx-robot] updated from transifex 2018-08-10 00:12:26 +00:00
Björn Schießle
6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares 
Add support for room shares
 2018-08-09 10:44:11 +02:00
Roeland Jago Douma
ca0f2f63eb
Merge pull request #10537 from MartB/mselect_fix 
Fix multiSelectMenu for public shares #10536
 2018-08-09 10:41:38 +02:00
Daniel Calviño Sánchez
e2e6f23b67 Suppress Phan warnings about calling undeclared class methods 
The DeletedShareAPIController and ShareAPIController helpers for room
shares are defined in Talk, so the classes do not exist when Talk is not
installed. Due to this when the object returned by "getRoomShareHelper"
is used Phan complains that the class is not declared.

This is not a problem, though, because when the class is not available
"getRoomShareHelper" throws an exception, which is then caught where
that method was called. Therefore now those warnings from Phan are
suppressed (it would be better to use "@phan-suppress-next-line"
instead, but it is not yet available in our Phan version).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:44 +02:00
Daniel Calviño Sánchez
523fdb612c Add room shares to DAV and recent files "share-types" property 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
1ccc99ed83 Add support for room shares to the share owner updater 
A user can move her own shares into a received share. When that happens
she is effectively handing over the ownership of the file, so the share
needs to be updated to reflect the new owner.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
8084ba516f Add room shares to the MountProvider for shares 
The MountProvider for shares creates mount points for the files shared
with the user, which makes possible to use the received shared files and
folders as regular files and folders.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
382b27d035 Add support for room shares to DeletedShareAPIController 
In some cases, the DeletedShareAPIController requires explicit handling
of each type of share (for example, to format a share for a
DataResponse). Room shares are implemented in an external app (Nextcloud
Talk), so in order to keep the controller as isolated as possible from
room share specifics all that explicit handling is done in a helper
class provided by the Talk app.

In other cases it is just enough to call the share manager specifying a
room share type; note that the share manager is guarded against share
types for which there is no provider, so it is not necessary to
explicitly check that before passing room shares to the share manager.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
4ed7131e26 Add support for room shares to ShareAPIController 
In some cases, the ShareAPIController requires explicit handling of each
type of share (for example, to format a share for a DataResponse). Room
shares are implemented in an external app (Nextcloud Talk), so in order
to keep the controller as isolated as possible from room share specifics
all that explicit handling is done in a helper class provided by the
Talk app.

In other cases it is just enough to call the share manager specifying a
room share type; note that the share manager is guarded against share
types for which there is no provider, so it is not necessary to
explicitly check that before passing room shares to the share manager.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Nextcloud bot
1cb8fe3cb0
[tx-robot] updated from transifex 2018-08-08 00:13:19 +00:00
MartB
5109743383 Fix multiSelectMenu for public shares #10536 
Signed-off-by: Martin Böh (MartB) <mart.b@outlook.de>
 2018-08-06 12:42:13 +02:00
Nextcloud bot
a625a4d704
[tx-robot] updated from transifex 2018-08-05 00:12:29 +00:00
Nextcloud bot
62af5bf033
[tx-robot] updated from transifex 2018-08-02 00:12:37 +00:00
Nextcloud bot
5e43f3c6a6
[tx-robot] updated from transifex 2018-07-31 00:12:12 +00:00
Nextcloud bot
0c7a17795b
[tx-robot] updated from transifex 2018-07-28 00:12:07 +00:00
Roeland Jago Douma
5edab3b311
Merge pull request #10416 from nextcloud/bugfix/10414/fix-preview-url 
Use OC.generateUrl to properly prefix preview images
 2018-07-27 09:33:00 +02:00
Nextcloud bot
6ccc34f5af
[tx-robot] updated from transifex 2018-07-27 00:12:20 +00:00
Julius Härtl
093799f4b0
Use OC.generateUrl to properly prefix preview images 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-26 22:41:41 +02:00
Nextcloud bot
e98f4de66a
[tx-robot] updated from transifex 2018-07-26 00:12:01 +00:00
Daniel Calviño Sánchez
96108ab858 Add event to load additional scripts in the auth page for public shares 
Before the public share authentication page is rendered now an event to
load additional scripts is dispatched. Thanks to this any app can load
its own scripts that, when run on the browser, adjust as needed the page
generated by the server.

Note, however, that during the handling of the event apps are only able
to add scripts or styles to be loaded; they can not render arbitrary
content on the page, or change how the content is rendered by the
original template; all those changes have to be done by the scripts at
run-time.

This implies that the scripts of the apps can use only those parameters,
like the token of the share, added to the page when it is generated by
the "publicshareauth" template. Due to this, and given that the event is
being introduced to be used by Talk to inject the UI needed to request
the password for a share, the token of the share is now provided in the
generated page, just like done in the public share page.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 14:04:22 +02:00
Daniel Calviño Sánchez
7849630cef Add support for sending the password by Talk to ShareAPIController 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 14:04:17 +02:00
John Molakvoæ (skjnldsv)
440b5c944f
Fixed scrolling container 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 11:01:11 +02:00
John Molakvoæ (skjnldsv)
0274507cb1
Acceptance and mobile navigation fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 11:01:11 +02:00
Roeland Jago Douma
b41d0d32e2
Merge pull request #10218 from nextcloud/share-comments 
allow to add a personal note to a share
 2018-07-24 09:12:03 +02:00
Nextcloud bot
241e5705cb
[tx-robot] updated from transifex 2018-07-24 00:12:01 +00:00
Morris Jobke
b91e758baa
Merge pull request #10356 from nextcloud/bugfix/noid/dont-call-getuid-on-null 
Don't call getUID on null when the app is loaded for a guest
 2018-07-23 22:12:39 +02:00
Joas Schilling
3cac54b955
Don't call getUID on null when the app is loaded for a guest 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-23 16:39:03 +02:00
Nextcloud bot
4d060755e5
[tx-robot] updated from transifex 2018-07-23 00:12:05 +00:00
Nextcloud bot
8ac1f4168d
[tx-robot] updated from transifex 2018-07-22 00:12:42 +00:00
John Molakvoæ (skjnldsv)
e6ded2ad5e
Design fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 18:31:06 +02:00
John Molakvoæ (skjnldsv)
58debbe42c
Tests fixes and design bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:21 +02:00
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
Bjoern Schiessle
41a1528888
implement decline share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
bbce8c3ea1
adjust to latest api version 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:28 +02:00
Bjoern Schiessle
db428ea547
send accept share notification (WIP) 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-02 11:29:27 +02:00
Morris Jobke
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
Morris Jobke
326f07e756
Merge pull request #8854 from nextcloud/drop-old-sharing-code 
Get rid of shareItem
 2018-06-29 10:40:32 +02:00
Daniel Calviño Sánchez
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
Morris Jobke
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
Nextcloud bot
a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Morris Jobke
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
Nextcloud bot
18cf85d264
[tx-robot] updated from transifex 2018-06-26 00:12:07 +00:00
Nextcloud bot
a431cc3b58
[tx-robot] updated from transifex 2018-06-25 00:11:48 +00:00
Nextcloud bot
5428cd2f50
[tx-robot] updated from transifex 2018-06-23 00:12:41 +00:00
Nextcloud bot
e4551106f5
[tx-robot] updated from transifex 2018-06-22 00:12:11 +00:00
Roeland Jago Douma
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
Nextcloud bot
f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
John Molakvoæ (skjnldsv)
26918e4103
Various apps scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:20:51 +02:00
Roeland Jago Douma
a596b062f5
Fix index.php links 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 17:54:11 +02:00
Roeland Jago Douma
58376db92e
Update SharingCheckMiddlewareTest 
* They are handled now by the overal sharing public page middleware

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
9f658febca
Fix ShareControllerTest 
* Removed tests that are now handled by the middleware
* Updated tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
ff3f63fd47
Fix PublicPreviewControllerTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
20e514690c
Don't allow public share pages if link sharing is disabled 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
31392c2443
Move public auth page over 
Now this is in core so the basics (that 99% of the app will want to
use) looks always the same.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
366981fba6
Move public preview endpoint over 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Roeland Jago Douma
53a1b9a84e
Quick hack to make the files sharing app work with this properly 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-20 08:53:37 +02:00
Nextcloud bot
cad8824a8e
[tx-robot] updated from transifex 2018-06-20 00:12:26 +00:00
Nextcloud bot
b8c728de6d
[tx-robot] updated from transifex 2018-06-19 00:12:55 +00:00
Julius Härtl
5b60508af4
Merge pull request #9893 from kevgathuku/update-unshare-message 
Update message shown when unsharing a file
 2018-06-18 16:44:54 +02:00
blizzz
60adc92eb5
Merge pull request #9823 from nextcloud/bufgix/noid/update_token_on_session_id_regenerate 
Update the token on session regeneration
 2018-06-18 13:25:18 +02:00
Kevin Ndung'u
5d9c1d3fea
Update message shown when unsharing a file 
Signed-off-by: Kevin Ndung'u <kevgathuku@gmail.com>
 2018-06-18 13:12:23 +03:00
Nextcloud bot
db9ad32d75
[tx-robot] updated from transifex 2018-06-16 00:13:15 +00:00
Nextcloud bot
84a1c915e6
[tx-robot] updated from transifex 2018-06-15 00:12:49 +00:00
Roeland Jago Douma
8c47a632e0
Allow updating the token on session regeneration 
Sometimes when we force a session regeneration we want to update the
current token for this session.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-14 08:09:36 +02:00
Nextcloud bot
5ecfd80f07
[tx-robot] updated from transifex 2018-06-13 00:12:59 +00:00
Nextcloud bot
d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Nextcloud bot
bba1663350
[tx-robot] updated from transifex 2018-06-06 00:12:36 +00:00
Nextcloud bot
9ac36dc30b
[tx-robot] updated from transifex 2018-05-31 00:12:36 +00:00
Nextcloud bot
7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot
645eaaa434
[tx-robot] updated from transifex 2018-05-29 00:12:21 +00:00
Nextcloud bot
f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot
60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Roeland Jago Douma
9fed7aa2da
Backends are legacy code as well and need to go 
so no need to fix the tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 19:51:37 +02:00
Morris Jobke
bc34a7f4e9
Get rid of shareItem 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-23 19:51:37 +02:00
Roeland Jago Douma
33b639d23c
Fix ExpiresSharesJobTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 19:12:02 +02:00
Roeland Jago Douma
c5042f1545
Use node api 
* delete old test that can't happen anymore since we check for a valid
node

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-23 19:10:11 +02:00
Nextcloud bot
4bbad8f88a
[tx-robot] updated from transifex 2018-05-23 00:15:44 +00:00
Morris Jobke
b40bae816a
Merge pull request #9545 from nextcloud/bugfix/noid/ellipsis-below-public-textfiles 
Remove ellipsis below public text file shares
 2018-05-22 16:33:29 +02:00
Morris Jobke
8c043dd00d
Remove ellipsis below public text file shares 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-22 15:14:23 +02:00
Roeland Jago Douma
d4464cc3ef
Merge pull request #9515 from nextcloud/bugfix/noid/reset_session_when_auth_against_protected_share 
Regenerate session id after public share auth
 2018-05-22 09:21:39 +02:00
Maxence Lange
0009adae80 SharedWithDisplayName + SharedWithAvatar 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-21 01:24:45 +02:00
Nextcloud bot
514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Roeland Jago Douma
d6d0e60136
Regenerate session id after public share auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-17 22:07:20 +02:00
Nextcloud bot
ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Nextcloud bot
5fcb3dd1dc
[tx-robot] updated from transifex 2018-05-12 00:13:00 +00:00
Nextcloud bot
01c21601e8
[tx-robot] updated from transifex 2018-05-10 00:13:09 +00:00
Morris Jobke
a56ec1062a
Merge pull request #9346 from nextcloud/techdep/noid/needsPartFile_to_storage 
Use an actual function of the storage to determine needsPartFile
 2018-05-02 16:03:31 +02:00
Roeland Jago Douma
ea5393e9f8
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:20:20 +02:00
Roeland Jago Douma
055a003661
Use an actual function of the storage to determine needsPartFile 
We have a function for it so better to override that. Also because other
codes that might check this should get the right value.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:02:36 +02:00
Morris Jobke
d8350c69ef
Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logic 
Do not add sharePermission logic in JS
 2018-04-27 14:01:40 +02:00
Nextcloud bot
9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
Roeland Jago Douma
d379770cf2
Fix sharedfilelistSpec.js tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 16:34:24 +02:00
Roeland Jago Douma
0771dad57f
Do not add sharePermission logic in JS 
We have a dedicated dav property. We should do all the magic in 1 place.
Not several.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 12:14:37 +02:00
Morris Jobke
c907b68842
Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_api 
Make ShareesAPIController strict
 2018-04-25 11:53:52 +02:00
Roeland Jago Douma
4d5a2cce8d
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 08:07:25 +02:00
Roeland Jago Douma
3b3ff39431
Make ShareesAPIController strict 
Fixes #9279

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 22:05:21 +02:00
Roeland Jago Douma
3b34a77c58
Make the ShareAPIController strict 
Fixes #9279

With types we can force php to not cast a full nummeric user to an int.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 20:31:57 +02:00
Roeland Jago Douma
a80fcf177b
Merge pull request #9255 from nextcloud/less-deprecated-calls 
Less deprecated calls to OCP\Util::writeLog
 2018-04-23 08:04:50 +02:00
Morris Jobke
dd34cb7540
Less deprecated calls to OCP\Util::writeLog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-22 20:41:49 +02:00
Nextcloud bot
74b5ab8d39
[tx-robot] updated from transifex 2018-04-22 00:11:51 +00:00
Roeland Jago Douma
0b6e197491
Add background job to refresh federated discovery 
Once a day refresh the information automatically in cron

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-18 19:20:26 +02:00
Morris Jobke
66c92872ab
Fix user selectable text for public links for text files 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-16 16:36:29 +02:00
Julius Härtl
1624762d2f
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-05 15:40:58 +02:00
Julius Härtl
50a763e4c8
Update composer autoloader 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-05 14:27:34 +02:00
Julius Härtl
2e60f91ab1
Move external share saving to template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-05 13:11:55 +02:00
Julius Härtl
bbeb3402b6
Move styling and menu handling to publicpage.js 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-05 12:21:39 +02:00
Julius Härtl
cc3b1179fc
Do not hide primary action text 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-05 11:32:11 +02:00
Julius Härtl
eb19899f8e
Move common menu templates to public API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-05 11:09:19 +02:00
Roeland Jago Douma
d6cda3f2a6
When formatting a share node an Empty target is invalid 
Fixes #9028

For federated shares the share table holds no target information (since
it is on the other server). So when a node is actually invalid and not
found we should not display it anymore in the shared with sections etc
and thus throw the proper exceptions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-04 11:33:05 +02:00
Roeland Jago Douma
b2e34167eb
Merge pull request #8976 from nextcloud/dep_user_code 
Remove deprecated functions from OCP\User
 2018-03-28 08:23:57 +02:00
Roeland Jago Douma
f4fd0224db
Do not use \OCP\DB anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-26 14:40:23 +02:00
Roeland Jago Douma
7ebd96416c
Remove deprecated OCP\User::getDisplayname 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-25 20:42:03 +02:00
Nextcloud bot
64948bf30c
[tx-robot] updated from transifex 2018-03-23 01:11:28 +00:00
Jan-Christoph Borchardt
ce7775acd0 Replace information icon with confirmation button in share input 
The confirmation button right now is just an icon; its behaviour will be
added in the following commits.

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-03-20 19:09:03 +01:00
Daniel Calviño Sánchez
2c073dc53d Set "share_with" field to the ID of the circle 
When a share is shared with a circle the "share_with" field returned by
the API endpoint was always set to the name of the circle. However, the
name is not enough to identify a circle. The Circles app now provides
the ID of the circle in the "shared with" field of a Share, so this
commit modifies the API endpoint to set the "share_with" field to the ID
of the circle when provided by the Circles app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-03-16 04:58:00 +01:00
blizzz
208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name 
Full implement group display names
 2018-03-15 12:07:30 +01:00
Nextcloud bot
055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Roeland Jago Douma
2d5febd0b9
Merge pull request #8811 from nextcloud/remove_dep_util_link 
Remove deprecated URL functions for OCP\Util
 2018-03-14 09:49:51 +01:00
Roeland Jago Douma
b93d26a209
Replace ContactsManager 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:18:38 +01:00
Roeland Jago Douma
83873e3da1
Remove deprecated URL functions for OCP\Util 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 22:04:08 +01:00
Morris Jobke
53a899a1f5
Fix the HTTP 1.0 status code and properly detect 1.0 vs 1.1&2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-13 09:22:26 +01:00
Morris Jobke
e758cfcdc8
Remove unused methods of OC_Response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-03-12 18:42:30 +01:00
Nextcloud bot
a20e9d7891
[tx-robot] updated from transifex 2018-03-09 01:12:12 +00:00