Commit Graph

50843 Commits

Author SHA1 Message Date
Roeland Jago Douma bea5bbde31
Merge pull request #17449 from nextcloud/fix/joas-should-know-you-have-to-increaste-the-server-version-for-new-migrations
Increase server version to trigger latest migration
2019-10-07 19:46:31 +02:00
John Molakvoæ f8d1990eb8
Do not follow symlinks with webpack (#17448)
Do not follow symlinks with webpack
2019-10-07 18:26:35 +02:00
Christoph Wurst 79db678075
Increase server version to trigger all migrations
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-07 16:37:15 +02:00
John Molakvoæ (skjnldsv) 8d87312d9a
Do not follow symlinks with webpack
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-07 16:28:10 +02:00
Roeland Jago Douma a02a626606
Merge pull request #17411 from kinolaev/fix-oauth2-redirect
Fix oauth client redirect
2019-10-07 12:03:52 +02:00
Nextcloud bot 049628a3f5
[tx-robot] updated from transifex 2019-10-07 02:14:42 +00:00
Roeland Jago Douma 1843ff60fd
Merge pull request #17421 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.2
Bump handlebars from 4.4.0 to 4.4.2 in /build
2019-10-06 12:42:28 +02:00
John Molakvoæ 9939005853
Use @nextcloud/paths and deprecate OC helpers (#17392)
Use @nextcloud/paths and deprecate OC helpers
2019-10-06 10:01:45 +02:00
Nextcloud bot e20dbc04ba
[tx-robot] updated from transifex 2019-10-06 02:15:13 +00:00
dependabot-preview[bot] a0acb4b5d5
Bump handlebars from 4.4.0 to 4.4.2 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.0 to 4.4.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.4.2/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.0...v4.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-06 01:13:11 +00:00
Christoph Wurst a27a4f757d
Use @nextcloud/paths and deprecate OC helpers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-05 23:44:20 +02:00
John Molakvoæ 5c21d11207
Fix Axios CSRF token update (#17404)
Fix Axios CSRF token update
2019-10-05 23:37:10 +02:00
Christoph Wurst 81613d2246
Switch to @nextcloud/axios for the CSRF update fix
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-10-05 19:06:00 +02:00
John Molakvoæ 62399c76e8
Allow group displaynames in the database backend (#17221)
Allow group displaynames in the database backend
2019-10-05 18:34:14 +02:00
Roeland Jago Douma 637c50e647
Merge pull request #17387 from nextcloud/fix/remove/federated_share
Allow removing federated shares of locally reshared files
2019-10-05 15:18:37 +02:00
Roeland Jago Douma a32c9cc260
Merge pull request #17370 from nextcloud/jospoortvliet-patch-1
Update README.md
2019-10-05 15:16:32 +02:00
Jos Poortvliet 355f479a07
Update README.md
some minor readme updates
2019-10-05 15:16:17 +02:00
John Molakvoæ 37dbe821e3
Fix updating and deleting authtokens (#17397)
Fix updating and deleting authtokens
2019-10-05 12:34:57 +02:00
John Molakvoæ 79c59fb2b9
allow trash backends to overwrite the tooltip for trash items (#17374)
allow trash backends to overwrite the tooltip for trash items
2019-10-05 11:17:07 +02:00
Sergej Nikolaev 9aa992e60b
fix updating and deleting authtokens
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
2019-10-05 10:28:47 +02:00
Christoph Wurst 8c023eeabd
Emit an event when the CSRF token changes
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-05 10:25:45 +02:00
John Molakvoæ 87ad219daf
Merge pull request #17405 from nextcloud/enh/switch/escapeHTML
Move to escape-html
2019-10-05 10:25:12 +02:00
Robin Appelman ce433637da
allow trash backends to overwrite the tooltip for trash items
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-10-05 10:23:30 +02:00
Nextcloud bot e9cef938ea
[tx-robot] updated from transifex 2019-10-05 02:15:04 +00:00
John Molakvoæ 2169c26195
Fix shares read permissions (#16761)
Fix shares read permissions
2019-10-04 22:54:04 +02:00
John Molakvoæ (skjnldsv) ff895abac0
Fix shares read permissions
A user with reshare permissions on a file is now able to get any share
of that file (just like the owner).

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 21:40:30 +02:00
Sergej Nikolaev 1b5d85a4ca fix oauth client redirect
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
2019-10-04 21:09:13 +03:00
Roeland Jago Douma 32587d7007
Remove the tests since the library is tested
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-04 19:32:12 +02:00
John Molakvoæ (skjnldsv) b1069b29fa
Add checks for whether a user with access to a share can delete it
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 19:25:11 +02:00
John Molakvoæ (skjnldsv) f02cff1304
Extract check for whether a user with access to a share can edit it
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 19:25:11 +02:00
Daniel Calviño Sánchez 6d4f4c1c70
Add assorted integration tests for shares
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-04 19:25:11 +02:00
Daniel Calviño Sánchez a7526d74ae
Do not expect a 200 HTTP status code when updating a share
This will be needed to test scenarios in which updating a share return a
different HTTP status code, like 401.

The assertion for the 200 HTTP status code was added in those scenarios
that tested updating a share (that is, those that were also checking the
OCS status code), but not in those in which updating a share was just a
preparatory step for the actual test (in the same way that the HTTP
status code is not checked in those tests when creating a share).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-04 19:25:10 +02:00
John Molakvoæ (skjnldsv) 99404bdfb3
Move sharing integration tests to their own directory
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 19:25:10 +02:00
John Molakvoæ (skjnldsv) ba1ba1a55e
Add helper script to run integration tests on a Docker container
Copied and adjusted from "tests/integration/run-docker.sh" in Talk; see
its commit history for further reference.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 19:25:10 +02:00
Roeland Jago Douma 6c489a6d40
Move to escape-html
* If there is a package that does exactly the same then lets us use that
* Import it properly in the internals (less deprecation warnings)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-04 13:23:32 +02:00
Roeland Jago Douma 2507f26428
Merge pull request #17357 from nextcloud/enh/oauth/no_oc_binding
Import router in oauth js
2019-10-04 11:33:40 +02:00
Roeland Jago Douma 7b729c581d
Merge pull request #17359 from nextcloud/bugfix/noid/dont-call-basename-on-null
Don't call basename on null
2019-10-04 11:29:14 +02:00
John Molakvoæ 9fb56e233c
Use same settings for mail share as link shares (#16629)
Use same settings for mail share as link shares
2019-10-04 09:55:44 +02:00
John Molakvoæ (skjnldsv) c49469c4d8
Prevent non owners to update others link shares
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 08:19:07 +02:00
John Molakvoæ (skjnldsv) c8d50538b8
Use same settings for mail share as link shares
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 08:19:07 +02:00
John Molakvoæ 6d819e2820
Fix master testing and update eslint-config (#17367)
Fix master testing and update eslint-config
2019-10-04 08:18:13 +02:00
John Molakvoæ (skjnldsv) 4293ede565
Fix tag acceptance tests after #16682
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-04 07:48:45 +02:00
John Molakvoæ 7d9a5036a2
Add Fatal logging option (#17363)
Add Fatal logging option
2019-10-04 07:08:28 +02:00
John Molakvoæ (skjnldsv) 972279d31b
Split drone webpack tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-10-04 07:04:29 +02:00
John Molakvoæ (skjnldsv) c2c7c2778b
Fix master testing and update eslint-config
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-10-04 06:44:21 +02:00
Nextcloud bot 23af2726e8
[tx-robot] updated from transifex 2019-10-04 02:15:27 +00:00
Roeland Jago Douma dcae3e7711
Merge pull request #17388 from nextcloud/fix/undefined_index/loginflowv2
Don't use an undefined index if not needed
2019-10-03 19:12:00 +02:00
Roeland Jago Douma 1ddd6b4080
Don't use an undefined index if not needed
It is not set. And not used. Just some copy paste leftover.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-03 16:17:19 +02:00
Roeland Jago Douma 22f6960f83
Allow removing federated shares of locally reshared files
* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-03 15:21:04 +02:00
Roeland Jago Douma c436b2ccf6
fixup! Import router
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-03 10:49:55 +02:00