From 0f6308448aabe4d9c33c30b8ac420ee57f454904 Mon Sep 17 00:00:00 2001 From: Pascal Wengerter Date: Wed, 23 Mar 2022 14:31:17 +0100 Subject: [PATCH] Bump web to v5.3.0 --- .drone.env | 2 +- changelog/unreleased/update-web-5.3.0-rc.1.md | 9 --------- changelog/unreleased/update-web-5.3.0.md | 10 ++++++++++ settings/ui/tests/acceptance/helpers/language.js | 8 ++++++-- .../expected-failures-webUI-on-OCIS-storage.md | 4 ++-- web/Makefile | 2 +- 6 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 changelog/unreleased/update-web-5.3.0-rc.1.md create mode 100644 changelog/unreleased/update-web-5.3.0.md diff --git a/.drone.env b/.drone.env index 0a75c5a741e..179fbfb2ce6 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=8fc353d79e7c0de1e137220c2422efcfe2ac5b89 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=bb612cfc1c63316a159c7e29b81438595cef8fdb +WEB_COMMITID=77faf9890974083c0c555fd83586c2448845b11d WEB_BRANCH=master diff --git a/changelog/unreleased/update-web-5.3.0-rc.1.md b/changelog/unreleased/update-web-5.3.0-rc.1.md deleted file mode 100644 index b1417284376..00000000000 --- a/changelog/unreleased/update-web-5.3.0-rc.1.md +++ /dev/null @@ -1,9 +0,0 @@ -Enhancement: Update ownCloud Web to v5.3.0-rc.1 - -Tags: web - -We updated ownCloud Web to v5.3.0-rc.1. Please refer to the changelog (linked) for details on the web release. - -https://github.com/owncloud/web/pull/6561 -https://github.com/owncloud/ocis/pull/3291 -https://github.com/owncloud/web/releases/tag/v5.3.0-rc.1 diff --git a/changelog/unreleased/update-web-5.3.0.md b/changelog/unreleased/update-web-5.3.0.md new file mode 100644 index 00000000000..dbe7c9a2418 --- /dev/null +++ b/changelog/unreleased/update-web-5.3.0.md @@ -0,0 +1,10 @@ +Enhancement: Update ownCloud Web to v5.3.0 + +Tags: web + +We updated ownCloud Web to v5.3.0. Please refer to the changelog (linked) for details on the web release. + +https://github.com/owncloud/web/pull/6561 +https://github.com/owncloud/ocis/pull/3291 +https://github.com/owncloud/ocis/pull/3375 +https://github.com/owncloud/web/releases/tag/v5.3.0 diff --git a/settings/ui/tests/acceptance/helpers/language.js b/settings/ui/tests/acceptance/helpers/language.js index 8bc2bb27736..606c94299b3 100644 --- a/settings/ui/tests/acceptance/helpers/language.js +++ b/settings/ui/tests/acceptance/helpers/language.js @@ -6,8 +6,8 @@ const filesMenu = { 'Deleted files' ], Deutsch: [ - 'Persöhnlich', - 'Shares', + 'Persönlich', + 'Geteilt', 'Spaces\nbeta', 'Gelöschte Dateien' ], @@ -55,24 +55,28 @@ const accountMenu = { const filesListHeaderMenu = { English: [ 'Name', + 'Shares', 'Size', 'Modified', 'Actions' ], Deutsch: [ 'Name', + 'Geteilt', 'Größe', 'Bearbeitet', 'Aktionen' ], Español: [ 'Nombre', + 'Shares', 'Tamaño', 'Modificado', 'Acciones' ], Français: [ 'Nom', + 'Shares', 'Taille', 'Modifié', 'Actions' diff --git a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md index 18935ea8203..b0abde88428 100644 --- a/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-webUI-on-OCIS-storage.md @@ -308,7 +308,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L60) ### [Listing shares via ocs API does not show path for parent folders](https://github.com/owncloud/ocis/issues/1231) -- [webUISharingPublicManagement/shareByPublicLink.feature:134](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L134) +- [webUISharingPublicManagement/shareByPublicLink.feature:133](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L133) ### [Propfind response to trashbin endpoint is different in ocis](https://github.com/owncloud/product/issues/186) ### [restoring a file from "Deleted files" (trashbin) is not possible if the original folder does not exist any-more](https://github.com/owncloud/web/issues/1753) @@ -469,7 +469,7 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIUpload/upload.feature:129](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L129) - [webUIUpload/upload.feature:142](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L142) - [webUIUpload/upload.feature:159](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L159) -- [webUIUpload/uploadEdgecases.feature:67](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L67) +- [webUIUpload/uploadEdgecases.feature:69](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/uploadEdgecases.feature#L69) ### [browsing directly to a details 'tab' is not possible](https://github.com/owncloud/web/issues/5464) - [webUIFiles/browseDirectlyToDetailsTab.feature:21](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/browseDirectlyToDetailsTab.feature#L21) diff --git a/web/Makefile b/web/Makefile index d195a3588fd..96749214009 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v5.3.0-rc.1 +WEB_ASSETS_VERSION = v5.3.0 include ../.make/recursion.mk