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
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
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
ff3f63fd47
Fix PublicPreviewControllerTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
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
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
366981fba6
Move public preview endpoint over
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-20 08:53:37 +02:00
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
cad8824a8e
[tx-robot] updated from transifex
2018-06-20 00:12:26 +00:00
b8c728de6d
[tx-robot] updated from transifex
2018-06-19 00:12:55 +00:00
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
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
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
db9ad32d75
[tx-robot] updated from transifex
2018-06-16 00:13:15 +00:00
84a1c915e6
[tx-robot] updated from transifex
2018-06-15 00:12:49 +00:00
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
5ecfd80f07
[tx-robot] updated from transifex
2018-06-13 00:12:59 +00:00
d91bed9490
[tx-robot] updated from transifex
2018-06-12 00:12:46 +00:00
bba1663350
[tx-robot] updated from transifex
2018-06-06 00:12:36 +00:00
9ac36dc30b
[tx-robot] updated from transifex
2018-05-31 00:12:36 +00:00
7df563ee39
[tx-robot] updated from transifex
2018-05-30 00:12:08 +00:00
645eaaa434
[tx-robot] updated from transifex
2018-05-29 00:12:21 +00:00
f0fdac8078
[tx-robot] updated from transifex
2018-05-26 00:13:01 +00:00
60734cd79d
[tx-robot] updated from transifex
2018-05-25 00:14:54 +00:00
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
bc34a7f4e9
Get rid of shareItem
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-23 19:51:37 +02:00
33b639d23c
Fix ExpiresSharesJobTest
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-23 19:12:02 +02:00
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
4bbad8f88a
[tx-robot] updated from transifex
2018-05-23 00:15:44 +00:00
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
8c043dd00d
Remove ellipsis below public text file shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-05-22 15:14:23 +02:00
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
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
514b374923
[tx-robot] updated from transifex
2018-05-18 00:13:45 +00:00
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
ef665fde42
[tx-robot] updated from transifex
2018-05-17 00:13:46 +00:00
5fcb3dd1dc
[tx-robot] updated from transifex
2018-05-12 00:13:00 +00:00
01c21601e8
[tx-robot] updated from transifex
2018-05-10 00:13:09 +00:00
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
ea5393e9f8
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-05-01 15:20:20 +02:00
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
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
9e3522af54
[tx-robot] updated from transifex
2018-04-27 00:11:53 +00:00
d379770cf2
Fix sharedfilelistSpec.js tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-26 16:34:24 +02:00
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
c907b68842
Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_api
...
Make ShareesAPIController strict
2018-04-25 11:53:52 +02:00
4d5a2cce8d
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-24 08:07:25 +02:00
3b3ff39431
Make ShareesAPIController strict
...
Fixes #9279
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-23 22:05:21 +02:00
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
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
dd34cb7540
Less deprecated calls to OCP\Util::writeLog
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-04-22 20:41:49 +02:00
74b5ab8d39
[tx-robot] updated from transifex
2018-04-22 00:11:51 +00:00
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
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
1624762d2f
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 15:40:58 +02:00
50a763e4c8
Update composer autoloader
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 14:27:34 +02:00
2e60f91ab1
Move external share saving to template
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 13:11:55 +02:00
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
cc3b1179fc
Do not hide primary action text
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-04-05 11:32:11 +02:00
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
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
b2e34167eb
Merge pull request #8976 from nextcloud/dep_user_code
...
Remove deprecated functions from OCP\User
2018-03-28 08:23:57 +02:00
f4fd0224db
Do not use \OCP\DB anymore
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-26 14:40:23 +02:00
7ebd96416c
Remove deprecated OCP\User::getDisplayname
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-25 20:42:03 +02:00
64948bf30c
[tx-robot] updated from transifex
2018-03-23 01:11:28 +00:00
Daniel Calviño Sánchez
Morris Jobke
Bjoern Schiessle
Nextcloud bot
John Molakvoæ (skjnldsv)
Roeland Jago Douma
Roeland Jago Douma
Julius Härtl
blizzz
Kevin Ndung'u
Maxence Lange