Commit Graph

652 Commits

Author SHA1 Message Date
Roeland Jago Douma fc77f530d7
Don't show link shares hash in inherited share list
This adds no value at all. Just showing the text "(Shared link)" now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-15 09:21:53 +01:00
Christoph Wurst 6127c288e8 Fix license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-01-13 14:23:49 +01:00
John Molakvoæ (skjnldsv) edf8893479
Fix tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-12-10 23:44:17 +01:00
Christoph Wurst 5bf3d1bb38
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
Christoph Wurst a166796378
Update license script apps
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:38 +01:00
Maxence Lange ccf7d87c11
integration tests
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
add tests on non-owner pov

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
duplicate

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
small fixes

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
removed tags

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2019-12-03 08:10:27 +01:00
Roeland Jago Douma 407c2c13ab
Merge pull request #18159 from nextcloud/tests/comments-integration
Do not call count on null
2019-12-02 08:53:02 +01:00
Julius Härtl 330cb7047e
Do not call count on null
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-11-29 09:59:35 +01:00
Roeland Jago Douma 3cda67c8b1
Fix integration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-28 10:22:05 +01:00
dependabot-preview[bot] 8a15447d63
Bump handlebars from 4.5.2 to 4.5.3 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-24 02:12:31 +00:00
Daniel Calviño Sánchez 54f8f75f6f Accept incoming shares in integration tests
Now all incoming shares need to be explicitly accepted before being able
to use the shared file or get information about a reshare (although
getting the information of the incoming share is possible before
accepting it).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-11-20 15:47:11 +01:00
Daniel Calviño Sánchez 9004e90f5d Replace direct calls to share API with specific share steps
This makes possible to use steps that reference the last share, which
will be needed to accept pending shares.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-11-20 13:11:49 +01:00
Daniel Calviño Sánchez 847bd0f05b Remove extra spaces at the end of lines
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-11-20 13:10:35 +01:00
dependabot-preview[bot] 43b58ca30f
Bump handlebars from 4.5.1 to 4.5.2 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.1 to 4.5.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.1...v4.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-17 02:13:10 +00:00
dependabot-preview[bot] f166744f17
Bump handlebars from 4.4.5 to 4.5.1 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.5 to 4.5.1.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.5...v4.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-10 02:12:31 +00:00
Gary Kim f3009bc76e
Add .editorconfig to expected files
Signed-off-by: Gary Kim <gary@garykim.dev>
2019-11-08 08:28:39 +08:00
John Molakvoæ (skjnldsv) eebcf89091
Cleanup sharing leftovers
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-11-05 19:03:44 +01:00
John Molakvoæ (skjnldsv) 515171a653 Transpile also dependencies in node_modules
Some of the dependencies in node_modules, such as "p-queue", are not ES5
compatible, so they need to be transpiled to work in older browsers like
Internet Explorer 11.

Besides not excluding the dependencies for babel-loader in
"webpack.common.js" the global Babel configuration must be defined in
"babel.config.js", as in Babel 7.X, when ".babelrc.js" is used, all the
dependencies in "node_modules" are ignored (even if whitelisted in the
configuration file itself).

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-29 12:56:00 +01:00
John Molakvoæ (skjnldsv) ea6f423e2c Extend data returned when searching remote shares
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-29 12:55:59 +01:00
Roeland Jago Douma 11faf739c2
Merge pull request #17698 from nextcloud/dependabot/npm_and_yarn/build/node-sass-4.13.0
Bump node-sass from 4.12.0 to 4.13.0 in /build
2019-10-27 22:34:49 +01:00
dependabot-preview[bot] 64ce503bce
Bump handlebars from 4.4.3 to 4.4.5 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.3 to 4.4.5.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.3...v4.4.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-27 10:18:39 +00:00
dependabot-preview[bot] baeb369a67
Bump node-sass from 4.12.0 to 4.13.0 in /build
Bumps [node-sass](https://github.com/sass/node-sass) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.12.0...v4.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-27 07:47:52 +00:00
Daniel Calviño Sánchez d0b205d0dd
Add more integration tests for getting shares
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-26 14:22:17 +02:00
Daniel Calviño Sánchez eaa98ed343 Add integration tests for getting shares including subfiles
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-25 18:37:36 +02:00
Daniel Calviño Sánchez bb9814d052 Replace fully qualified name with alias
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-25 10:48:38 +02:00
John Molakvoæ (skjnldsv) a1480c95eb
Merge all babelrc into one file
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-17 00:06:09 +02:00
dependabot-preview[bot] 929295ac31
Bump handlebars from 4.4.2 to 4.4.3 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.2 to 4.4.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.2...v4.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-13 01:13:38 +00:00
Daniel Kesselberg 99358d70e8
Remove settings/ from phan
settings is a app now. so the directory does not exist.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-09 14:34:05 +02: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
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
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
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
Roeland Jago Douma 87c7852c48
Merge pull request #17336 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.0
Bump handlebars from 4.2.1 to 4.4.0 in /build
2019-10-01 12:54:35 +02:00
Christoph Wurst 6b54b974f8
Use handlebars from node_modules (on CI)
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-09-30 16:20:44 +02:00
dependabot-preview[bot] 5d6b8f63fe
Bump handlebars from 4.2.1 to 4.4.0 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.1 to 4.4.0.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.4.0/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.1...v4.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-30 12:46:39 +00:00
Roeland Jago Douma 9e2bb5ef36 Move oauth admin settings to initialstate
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-28 13:30:34 +00:00
Christoph Wurst de6940352a Move settings to an app
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-28 09:39:28 +00:00
dependabot-preview[bot] 086e59a0df
Bump handlebars from 4.2.0 to 4.2.1 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.2.1/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-22 17:59:05 +00:00
dependabot-preview[bot] 5f2f7a6def
Bump handlebars from 4.1.2 to 4.2.0 in /build
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.2.0.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-08 18:14:32 +00:00
Roeland Jago Douma 1ee9122244
Fix npm audit warning in build
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-30 11:46:24 +02:00
dependabot-preview[bot] 88cf6e13af
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /build
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-27 18:07:31 +00:00
dependabot[bot] 3eef078b4f
Bump js-yaml from 3.12.0 to 3.13.1 in /build
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-08 07:43:03 +00:00
dependabot-preview[bot] 0d278eddf6
[Security] Bump fstream from 1.0.11 to 1.0.12 in /build
Bumps [fstream](https://github.com/npm/fstream) from 1.0.11 to 1.0.12. **This update includes a security fix.**
- [Release notes](https://github.com/npm/fstream/releases)
- [Commits](https://github.com/npm/fstream/compare/v1.0.11...v1.0.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-25 14:01:22 +00:00
dependabot-preview[bot] efd6c06658
Bump jsdoc from 3.6.2 to 3.6.3 in /build
Bumps [jsdoc](https://github.com/jsdoc/jsdoc) from 3.6.2 to 3.6.3.
- [Release notes](https://github.com/jsdoc/jsdoc/releases)
- [Changelog](https://github.com/jsdoc/jsdoc/blob/master/CHANGES.md)
- [Commits](https://github.com/jsdoc/jsdoc/compare/3.6.2...3.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-21 01:12:55 +00:00
dependabot-preview[bot] 7a4e9f7a81
[Security] Bump lodash from 4.17.11 to 4.17.14 in /build
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-11 02:21:38 +00:00
Morris Jobke c5c14d09b1
Merge pull request #16186 from nextcloud/bugfix/noid/also-check-permissions-when-creating-a-share
Better check reshare permissions part2
2019-07-03 20:07:05 +02:00
Joas Schilling e4addbae3e
Better check reshare permissions when creating a share
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-07-03 14:00:13 +02:00