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

4042 commits

Author SHA1 Message Date
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
Joas Schilling
db9b2398dd
Fix group displaynames in activity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-03-08 17:13:49 +01:00
John Molakvoæ (skjnldsv)
e1ec4514cc
Use label for better focus on external share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 15:28:03 +01:00
John Molakvoæ (skjnldsv)
446a3a9d5a
Fixed ext share style and use varable for popover height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 15:12:06 +01:00
John Molakvoæ (skjnldsv)
8d986160b8
Improved inline confirm icon with opacity and fixed ext share loading state 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 13:17:37 +01:00
Morris Jobke
d1aa96fef9
Merge pull request #8373 from nextcloud/right-header-stdrd 
New standard for top right header
 2018-03-07 12:33:11 +01:00
John Molakvoæ (skjnldsv)
d9bd6f3253
Fixed public template 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-07 11:05:23 +01:00
Tobia De Koninck
55b9a5d886
Remove OC_App::disable method 
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2018-03-06 10:45:20 +01:00
Nextcloud bot
3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Roeland Jago Douma
05ef2d70e7
Merge pull request #8590 from nextcloud/redirect-to-download-after-share 
Sharing: redirect to download after authentification if requested
 2018-03-05 11:11:43 +01:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex 2018-03-02 01:12:16 +00:00
John Molakvoæ (skjnldsv)
3824e6f631
fixup! fixup! Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-01 13:17:08 +01:00
John Molakvoæ (skjnldsv)
4c2aff0807
fixup! Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-01 13:12:24 +01:00
John Molakvoæ (skjnldsv)
7bcc821642
fixup! Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 19:03:00 +01:00
John Molakvoæ (skjnldsv)
8c69d783e0
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 17:35:42 +01:00
John Molakvoæ (skjnldsv)
a0641e43dc
fixup! Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 17:08:25 +01:00
John Molakvoæ (skjnldsv)
fb890807c0
Sharing: redirect to download after authentification if requested 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 17:05:55 +01:00
Roeland Jago Douma
4b05f03c34
Merge pull request #8569 from nextcloud/cleanup_unused_static_sharing 
Remove unused static sharing helper code
 2018-02-28 13:09:06 +01:00
Nextcloud bot
533e8351ad
[tx-robot] updated from transifex 2018-02-28 01:12:31 +00:00
Roeland Jago Douma
7e8c84ec20
Remove unused static sharing helper code 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 22:40:59 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms 
Let the admin configure the default share permissions
 2018-02-27 13:44:34 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
ebb15283a6
share api: use default permission of no permission is given 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Julius Härtl
4a1cbefc90
Fix files_sharing tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Julius Härtl
038aad73c7
Add missing phpdoc for public API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Julius Härtl
4f83462f67
Add phpdoc, typehints and sanitize HTML 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Julius Härtl
8a13851da8
Use PublicTemplateResponse for files_sharing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:52 +01:00
Nextcloud bot
a210247559
[tx-robot] updated from transifex 2018-02-24 01:12:16 +00:00
Nextcloud bot
4b352a345b
[tx-robot] updated from transifex 2018-02-22 01:12:26 +00:00
Nextcloud bot
6591a3bc36
[tx-robot] updated from transifex 2018-02-21 01:12:10 +00:00
Nextcloud bot
b3ca73dc27
[tx-robot] updated from transifex 2018-02-19 01:11:54 +00:00
Nextcloud bot
667d21ac7d
[tx-robot] updated from transifex 2018-02-18 01:12:03 +00:00
Nextcloud bot
d953db8683
[tx-robot] updated from transifex 2018-02-17 01:12:04 +00:00
Joas Schilling
f095001e4b
Fix info.xml files of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:24:03 +01:00
Julius Härtl
c300a64520
Merge pull request #8277 from nextcloud/avatars-shared-all 
Show share owner avatars on all file lists
 2018-02-15 12:11:09 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke
236086c457
Merge pull request #8335 from nextcloud/remove-unused-import 
Remove unused import statements
 2018-02-14 22:23:07 +01:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Joas Schilling
d1fb939e86
Merge pull request #8338 from nextcloud/simplify-return-statement 
Simplify return statement
 2018-02-14 10:08:28 +01:00
Nextcloud bot
ff1b343c4a
[tx-robot] updated from transifex 2018-02-14 01:11:53 +00:00
Morris Jobke
e2974f1133
Simplify return statement 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:55:24 +01:00
Nextcloud bot
3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot
91c67eb667
[tx-robot] updated from transifex 2018-02-12 21:33:37 +00:00
Joas Schilling
4bd14ef308
Merge pull request #8308 from nextcloud/public_link_wa_preview 
Show open graph preview in WhatsApp
 2018-02-12 11:09:08 +01:00
Roeland Jago Douma
20844c828a
Show open graph preview in WhatsApp 
Whatsapp is picky about the size of the open graph images.
So we do some special handling.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-12 10:42:18 +01:00
Nextcloud bot
ee77f37df2
[tx-robot] updated from transifex 2018-02-09 15:28:58 +00:00
Julius Härtl
cae311460a
Show share owner avatars on all file lists 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-09 11:42:47 +01:00
Nextcloud bot
15b4797629
[tx-robot] updated from transifex 2018-02-09 01:10:53 +00:00
Nextcloud bot
71382daf67
[tx-robot] updated from transifex 2018-02-08 01:10:28 +00:00
Nextcloud bot
2a3272331f
[tx-robot] updated from transifex 2018-02-07 01:10:23 +00:00
Nextcloud bot
58b568fd5d
[tx-robot] updated from transifex 2018-02-04 01:10:28 +00:00
Nextcloud bot
7af48b4187
[tx-robot] updated from transifex 2018-02-03 01:10:30 +00:00
Nextcloud bot
17a2dbb7de
[tx-robot] updated from transifex 2018-02-02 01:10:15 +00:00
Nextcloud bot
b006f25457
[tx-robot] updated from transifex 2018-02-01 17:19:47 +00:00
Morris Jobke
eb51f06a3b
Use ::class statement instead of string 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-29 12:03:47 +01:00
Morris Jobke
a661f043e1
Remove unneeded semicolon and parentheses 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 23:46:40 +01:00
Morris Jobke
6bbea33133
Simplify ternary operator statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 12:36:25 +01:00
Joas Schilling
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Morris Jobke
0a56d2185e
Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00
Morris Jobke
7800a9bc24
Fix array method usages with a proper call 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:20:10 +01:00
Roeland Jago Douma
8160d0bc2a
Merge pull request #8036 from nextcloud/phpunit6 
Require PHPUnit 6.5 or higher
 2018-01-25 14:50:46 +01:00
Joas Schilling
bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +01:00
Daniel Calviño Sánchez
5d7eded809 Fix missing clipboard icon in shared links 
The clipboard icon in shared links appears either directly on the link
input field or, if any social sharing app is enabled, in a menu. The
clipboard icon uses the same CSS rules as other icons (like the
information icon) to be posioned on the end of the input field, and
those rules have to be "cancelled" when the icon is shown in the menu.

Fixes #7990

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-01-24 16:40:21 +01:00
Roeland Jago Douma
4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions 
Properly log the full exception instead of only the message
 2018-01-23 11:56:02 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Julius Härtl
4d3dbb345f
Remove video preview from files_sharing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-22 13:22:52 +01:00
Roeland Jago Douma
1e7b20f615
Remove IAppConfig::setValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:57 +01:00
Morris Jobke
55532f19d9
Cleanup OC_User and OCP\User 
* mainly removes deprecated methods and old static code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-16 18:39:11 +01:00
Nextcloud bot
0f729e2cd3
[tx-robot] updated from transifex 2018-01-15 01:10:43 +00:00
Roeland Jago Douma
db411f8771
Bump apps 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-14 11:40:53 +01:00
Morris Jobke
f578b69729
Update composer 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-12 23:16:10 +01:00
Bjoern Schiessle
286de0c239
return correct mount type for federated shares 
fix https://github.com/nextcloud/server/issues/6584

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-01-11 10:17:05 +01:00
Nextcloud bot
2e683d3502
[tx-robot] updated from transifex 2018-01-06 01:11:09 +00:00
Roeland Jago Douma
0280cff66f
Composer updated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-04 16:31:16 +01:00
Nextcloud bot
298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
Julius Härtl
aed7052a38
Use guest css on sharing authentication page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-03 12:03:26 +01:00
Morris Jobke
588b0085dd
Merge pull request #7598 from nextcloud/fix-closing-menu-on-second-click-in-sharing-page 
Fix closing menu on second click in sharing page
 2018-01-02 15:11:30 +01:00
Daniel Calviño Sánchez
eb256b3ed5 Fix anchor change when clicking on sharing page menu 
The share menu toggle and some share menu items included an 'href="#"'
attribute, so they were handled as internal links by the browser, which
changed the current anchor when they were clicked. However, there was no
real need to change the anchor in those cases, and it could interfere
with other apps (for example, the PDF viewer sets the current anchor to
"#pdfviewer" when it is shown and it hides itself when that anchor is
modified). According to the HTML 5 spec the "href" attribute is not
mandatory for "a" elements, so they were removed.

Other options would have been to change the elements from "a" to "div"
or something like that, but that would have required changes to the CSS
rules too, or to prevent the default event handling for those elements
through JavaScript, which would have been a workaround instead of the
proper solution.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-12-21 14:19:29 +01:00
Daniel Calviño Sánchez
372e7acfaf Fix closing menu on second click in sharing page 
When a "mouseup" event was triggered on any element except on the share
menu or its descendants the share menu was closed. The share menu toggle
is not a descendant of the share menu, so clicking on it when the share
menu was shown closed it by removing its "open" CSS class. However, once
that happened the click event was then handled by the share menu toggle,
which toggled the "open" CSS class in the share menu and thus added it
again. So, from the user point of view, nothing happened when clicking
on the share menu toggle if the share menu was open.

Now a "mouseup" event on the share menu toggle no longer closes the
share menu, and thus toggling the "open" CSS class when handling the
"click" event works as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-12-21 12:37:35 +01:00
Morris Jobke
d2d73f1ce8
Also replace all other occurences 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-18 20:57:11 +01:00
Roeland Jago Douma
49b095b78e
Use proper authorative-autoloader for app autoloaders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-14 08:31:31 +01:00
Roeland Jago Douma
ce12763ab7
Merge pull request #7485 from nextcloud/fix_7001 
Also cache invalid DiscoveryService response
 2017-12-14 07:47:13 +01:00
Roeland Jago Douma
3b343e287f
Also cache invalid DiscoveryService response 
* Cache it for a day so we will retry eventually
* Cache the status.php response as well so we will try it once a day as
well

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-13 15:50:53 +01:00
Morris Jobke
5a95260bf3
Show tha copy share link button properly inline 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-13 10:32:13 +01:00
Nextcloud bot
a684f033bd
[tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Daniel Calviño Sánchez
b70b38ce31 Fix constructor spy in unit test with Sinon 4.1.3 
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-12-08 21:26:45 +01:00
Nextcloud bot
ef2b0969dd
[tx-robot] updated from transifex 2017-12-08 01:10:13 +00:00
Morris Jobke
c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root 
delay calculating the shared cache root until it's used
 2017-12-06 15:14:48 +01:00
Nextcloud bot
9505c56447
[tx-robot] updated from transifex 2017-12-06 01:10:23 +00:00
Robin Appelman
c87d689253
delay calculating the shared cache root until it's used 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 15:16:39 +01:00
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
blizzz
f700cd14fa
Merge pull request #7222 from nextcloud/fix-filerow-avatars 
Fix filerow avatars
 2017-11-27 16:46:11 +01:00
Lukas Reschke
e02229e412
Merge pull request #7246 from william-p/Add_html5_audioplayer_public 
Add HTML5 audio player in public view
 2017-11-27 12:32:21 +01:00
Arthur Schiwon
5a9c99e6ac
recycle SharedFileInfo values in fileInfo 
fileInfo is composed of data from sharing, however additional data is
pulled when sidebar opens, e.g. the size. Then, existing data is
overwritten by data from the other source (files). The data points that
would be lost are not dirty however and still used, so we keep them.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 17:51:56 +01:00
Arthur Schiwon
077381c7b3
rip out obsolete recipientsDisplayName 
also needs tests adjustements, and this also brings in natural sorting

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:14 +01:00
Arthur Schiwon
9d95391ff1
adjust tests and apply sorting 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:13 +01:00
Arthur Schiwon
4247936dd6
Fix avatars in file rows of incoming shares 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:13 +01:00