From 01f6ca12f0bfbf7353d34a1f14522544d0f69f3f Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 9 Sep 2022 10:56:04 +0200 Subject: [PATCH 1/2] chore: update web to v5.7.0-rc.13 --- .drone.env | 2 +- changelog/unreleased/update-web-beta.8.md | 15 ++++++++++++--- services/web/Makefile | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.drone.env b/.drone.env index 4f7d7faf10..d4930bec59 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=dc32078d4c9a158f7c412c780035bc90906a8ab8 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=437951c562079e42a5e0db2640d94f074392a2a1 +WEB_COMMITID=b02ac476b5b39e68c3293453c173e7f0a0c58e18 WEB_BRANCH=master diff --git a/changelog/unreleased/update-web-beta.8.md b/changelog/unreleased/update-web-beta.8.md index 49bcfd6b74..161b69ebd8 100644 --- a/changelog/unreleased/update-web-beta.8.md +++ b/changelog/unreleased/update-web-beta.8.md @@ -1,8 +1,8 @@ -Enhancement: Update ownCloud Web to v5.7.0-rc.11 +Enhancement: Update ownCloud Web to v5.7.0-rc.13 Tags: web -We updated ownCloud Web to v5.7.0-rc.11. Please refer to the changelog (linked) for details on the web release. +We updated ownCloud Web to v5.7.0-rc.13. Please refer to the changelog (linked) for details on the web release. * Bugfix [owncloud/web#7522](https://github.com/owncloud/web/pull/7522): Allow uploads outside of user's home despite quota being exceeded * Bugfix [owncloud/web#7516](https://github.com/owncloud/web/pull/7516): File name in text editor @@ -13,12 +13,21 @@ We updated ownCloud Web to v5.7.0-rc.11. Please refer to the changelog (linked) * Bugfix [owncloud/web#7534](https://github.com/owncloud/web/issues/7534): Redirect after removing self from space members * Bugfix [owncloud/web#7519](https://github.com/owncloud/web/issues/7519): Sidebar for current folder * Bugfix [owncloud/web#7453](https://github.com/owncloud/web/issues/7453): Stuck After Session Expired +* Bugfix [owncloud/web#7560](https://github.com/owncloud/web/pull/7560): Search share representation +* Bugfix [owncloud/web#7595](https://github.com/owncloud/web/pull/7595): Typo when reading public links capabilities * Enhancement [owncloud/web#7540](https://github.com/owncloud/web/issues/7540): Left sidebar hover effect * Enhancement [owncloud/web#7555](https://github.com/owncloud/web/pull/7555): Propose unique file name while creating a new file * Enhancement [owncloud/web#7485](https://github.com/owncloud/web/pull/7485): Add resource name to the WebDAV properties * Enhancement [owncloud/web#7559](https://github.com/owncloud/web/pull/7559): Don't open right sidebar from private links * Enhancement [owncloud/web#7177](https://github.com/owncloud/web/issues/7177): Update Uppy to v3.0.1 * Enhancement [owncloud/web#7570](https://github.com/owncloud/web/pull/7570): Adjust spacing of the files list options menu +* Enhancement [owncloud/web#7038](https://github.com/owncloud/web/issues/7038): Reduce pagination options +* Enhancement [owncloud/web#6173](https://github.com/owncloud/web/pull/6173): Remember the UI that was last selected via the application switcher +* Enhancement [owncloud/web#7584](https://github.com/owncloud/web/pull/7584): Remove clickOutside directive +* Enhancement [owncloud/web#7586](https://github.com/owncloud/web/pull/7586): Search improvements +* Enhancement [owncloud/web#7605](https://github.com/owncloud/web/pull/7605): Simplify mime type checking +* Enhancement [owncloud/web#7606](https://github.com/owncloud/web/pull/7606): Update ODS to v14.0.0-alpha.17 https://github.com/owncloud/ocis/pull/4508 -https://github.com/owncloud/web/releases/tag/v5.7.0-rc.11 +https://github.com/owncloud/ocis/pull/4547 +https://github.com/owncloud/web/releases/tag/v5.7.0-rc.13 diff --git a/services/web/Makefile b/services/web/Makefile index 740a347b0d..bc0495b42e 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v5.7.0-rc.11 +WEB_ASSETS_VERSION = v5.7.0-rc.13 include ../../.make/recursion.mk From c8314892589d052dfc6a71c20ffa73c36a8ea2ff Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 9 Sep 2022 12:41:05 +0200 Subject: [PATCH 2/2] ci: fix php code style --- .../features/bootstrap/SpacesContext.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php index 8525c55d1b..0397f61cae 100644 --- a/tests/acceptance/features/bootstrap/SpacesContext.php +++ b/tests/acceptance/features/bootstrap/SpacesContext.php @@ -3170,20 +3170,20 @@ class SpacesContext implements Context { $this->featureContext->setResponseXmlObject($responseXml); } - /** - * @Then /^as user "([^"]*)" (?:file|folder|entry) "([^"]*)" inside space "([^"]*)" (should|should not) be favorited$/ - * - * @param string $user - * @param string $path - * @param string $spaceName - * @param string $shouldOrNot - * - * @return void - */ - public function asUserFileOrFolderInsideSpaceShouldOrNotBeFavorited(string $user, string $path, string $spaceName, string $shouldOrNot):void { - $this->setSpaceIDByName($user, $spaceName); - $this->favoritesContext->asUserFileOrFolderShouldBeFavorited($user, $path, ($shouldOrNot === 'should') ? 1 : 0); - } + /** + * @Then /^as user "([^"]*)" (?:file|folder|entry) "([^"]*)" inside space "([^"]*)" (should|should not) be favorited$/ + * + * @param string $user + * @param string $path + * @param string $spaceName + * @param string $shouldOrNot + * + * @return void + */ + public function asUserFileOrFolderInsideSpaceShouldOrNotBeFavorited(string $user, string $path, string $spaceName, string $shouldOrNot):void { + $this->setSpaceIDByName($user, $spaceName); + $this->favoritesContext->asUserFileOrFolderShouldBeFavorited($user, $path, ($shouldOrNot === 'should') ? 1 : 0); + } /** * @When /^user "([^"]*)" favorites element "([^"]*)" in space "([^"]*)" using the WebDAV API$/