summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12668 from nextcloud/add-capabilitiesJohn Molakvoæ2018-11-281-0/+1
|\ | | | | add capabilities for multiple share links
| * add capabilities for multiple share linksBjoern Schiessle2018-11-261-0/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #12708 from nextcloud/getbyid-mount-rootMorris Jobke2018-11-282-1/+49
|\ \ | | | | | | Fix folder path containing leading slash when getting mount root by id
| * | Fix folder path containing leading slash when getting mount root by idRobin Appelman2018-11-282-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | This fixes collabora on public link shared groupfolders Fixes https://github.com/nextcloud/groupfolders/issues/225 Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #12698 from nextcloud/6275-fix-sidebar-widthMorris Jobke2018-11-281-1/+1
|\ \ \ | | | | | | | | I changed the width of the srollbar to make it a bit bigger
| * | | I changed the width of the srollbar to make it a bit biggerGretaD2018-11-271-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com>
* | | | Merge pull request #12677 from nextcloud/bugfix/12601/fix-csp-issue-updaterMorris Jobke2018-11-283-39/+26
|\ \ \ \ | |_|/ / |/| | | Open the updater via a POST form submit instead of eval the JS code directly
| * | | Open the updater via a POST form submit instead of eval the JS code directlyMorris Jobke2018-11-273-39/+26
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-11-288-48/+776
| | | |
* | | | Merge pull request #12659 from ↵Roeland Jago Douma2018-11-274-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-router-3.0.2 Bump vue-router from 3.0.1 to 3.0.2 in /settings
| * | | | Compile assetsRoeland Jago Douma2018-11-272-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump vue-router from 3.0.1 to 3.0.2 in /settingsdependabot[bot]2018-11-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/vuejs/vue-router/releases) - [Commits](https://github.com/vuejs/vue-router/compare/v3.0.1...v3.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | Merge pull request #12650 from nextcloud/bugfix/12614/count-on-stringMorris Jobke2018-11-271-2/+15
|\ \ \ \ \ | |/ / / / |/| | | | Fix count on string
| * | | | Add return typeDaniel Kesselberg2018-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Fix count on stringDaniel Kesselberg2018-11-241-2/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #12660 from ↵Roeland Jago Douma2018-11-274-8/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-infinite-loading-2.4.3 Bump vue-infinite-loading from 2.4.1 to 2.4.3 in /settings
| * | | | Compile assetsRoeland Jago Douma2018-11-262-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump vue-infinite-loading from 2.4.1 to 2.4.3 in /settingsdependabot[bot]2018-11-262-4/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bumps [vue-infinite-loading](https://github.com/PeachScript/vue-infinite-loading) from 2.4.1 to 2.4.3. - [Release notes](https://github.com/PeachScript/vue-infinite-loading/releases) - [Commits](https://github.com/PeachScript/vue-infinite-loading/compare/v2.4.1...v2.4.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* / | | [tx-robot] updated from transifexNextcloud bot2018-11-2730-34/+188
|/ / /
* | | Merge pull request #12658 from ↵Roeland Jago Douma2018-11-264-6/+6
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.26.1 Bump webpack from 4.26.0 to 4.26.1 in /apps/accessibility
| * | | Compile assetsRoeland Jago Douma2018-11-263-6/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Bump webpack from 4.26.0 to 4.26.1 in /apps/accessibilitydependabot[bot]2018-11-262-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12663 from ↵Roeland Jago Douma2018-11-264-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.26.1 Bump webpack from 4.26.0 to 4.26.1 in /apps/updatenotification
| * | | | Compile assetsRoeland Jago Douma2018-11-263-6/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump webpack from 4.26.0 to 4.26.1 in /apps/updatenotificationdependabot[bot]2018-11-262-13/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12662 from ↵Roeland Jago Douma2018-11-264-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.26.1 Bump webpack from 4.26.0 to 4.26.1 in /apps/oauth2
| * | | | Compile assetsRoeland Jago Douma2018-11-263-6/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump webpack from 4.26.0 to 4.26.1 in /apps/oauth2dependabot[bot]2018-11-262-13/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12661 from ↵Roeland Jago Douma2018-11-268-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-4.26.1 Bump webpack from 4.26.0 to 4.26.1 in /settings
| * | | | Commpile assetsRoeland Jago Douma2018-11-267-11/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Bump webpack from 4.26.0 to 4.26.1 in /settingsdependabot[bot]2018-11-262-13/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.26.0 to 4.26.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.26.0...v4.26.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | Merge pull request #12649 from ↵Morris Jobke2018-11-262-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/make-acceptance-tests-for-comments-more-robust Make acceptance tests for comments more robust
| * | | | Wait for the comment to be added before changing to another fileDaniel Calviño Sánchez2018-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the server is too slow, changing to a different file immediately after sending a new comment but without waiting for the comment to be shown for the original file could cause the new comment to be shown for the current file instead. This is, indeed, a bug in the comments. However, it is not possible to test it reliably in the acceptance tests, as it depends on how fast the server adds the message and how fast the client changes to a different file; sometimes the test would fail and sometimes it would not. Therefore, now it is waited for the comment to be added before changing to another file, as in this case it can be reliably tested that changing to a different file does not cause the comments from the previous file to be shown in the current file (this was a different bug already fixed and due to which this test was added in the first place). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Wait for the empty content element to be shownDaniel Calviño Sánchez2018-11-241-2/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the "Comments" tab is open the empty content element is always in the DOM, although it is only shown once the message collection was fetched and there were no messages. Due to this it is necessary to explicitly wait for it to be shown instead of relying on the implicit wait made to find the element; otherwise it would be found immediately and if the collection was not fetched yet it would not be visible, causing the test to fail. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #12632 from ↵Morris Jobke2018-11-2610-480/+991
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/add-acceptance-tests-for-sharing-files-and-folders-with-another-user Add acceptance tests for sharing files and folders with another user
| * | | | Rename "FilesSharingAppContext" to "PublicShareContext"Daniel Calviño Sánchez2018-11-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having both "FilesAppSharingContext" and "FilesSharingAppContext" was confusing, so "FilesSharingAppContext" was renamed to a more descriptive name. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Extract locators and steps for sharing in Files app to their own contextDaniel Calviño Sánchez2018-11-233-489/+519
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Extract sharing related acceptance tests to their own feature filesDaniel Calviño Sánchez2018-11-234-416/+436
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Add acceptance tests for folders that can not be resharedDaniel Calviño Sánchez2018-11-232-0/+142
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Add acceptance tests for resharing a folder with another userDaniel Calviño Sánchez2018-11-231-0/+52
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Add acceptance test for checking that the owner can see resharesDaniel Calviño Sánchez2018-11-231-0/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Add acceptance test for resharing a file with another userDaniel Calviño Sánchez2018-11-234-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To reshare a file there must be at least three enabled users in the system; although it would be possible to run the steps to create a third user in the scenarios that need it for convenience a third enabled user besides "admin" and "user0" was added to the default setup. In a similar way, a new step was added too to login as a given user name, similar to the steps to log in as "user0" and as "admin". Finally, another actor, "Jim", was introduced for those scenarios which should be played by three standard actors (that is, without a special configuration like "Rubeus"). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Add acceptance tests for sharing a folder with another userDaniel Calviño Sánchez2018-11-231-0/+59
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | Add acceptance tests for sharing a file with another userDaniel Calviño Sánchez2018-11-232-0/+143
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #12647 from nextcloud/cloud-federation-versionMorris Jobke2018-11-261-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix spelling mistake cloud_federation_api
| * | | | update compatible versions for cloud federation apiRobin Appelman2018-11-241-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2018-11-2624-2/+242
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-11-2518-28/+64
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2018-11-24114-194/+222
| | |
* | | Merge pull request #12556 from nextcloud/anonymous-options-allRobin Appelman2018-11-232-2/+2
|\ \ \ | | | | | | | | extend anonymous options to work on every dav url