From a7d1403f7c96e9eb7a6a52598d6aa6145692c93b Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Thu, 16 Nov 2023 10:18:01 +0100 Subject: [PATCH 1/3] chore: bump web to v8.0.0-alpha.8 --- .drone.env | 4 ++-- changelog/5.0.0_2023-11-08/update-web-8.0.0.md | 10 ++++++++-- services/web/Makefile | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.drone.env b/.drone.env index 4fc3343cace..7b4c033a064 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for UI tests -WEB_COMMITID=67ced24b3a6f06b767ff8111537b4a0b85c40993 -WEB_BRANCH=changeRespCode +WEB_COMMITID=6514050264308fc630abf0fbf5b4dcf728ab4f44 +WEB_BRANCH=master diff --git a/changelog/5.0.0_2023-11-08/update-web-8.0.0.md b/changelog/5.0.0_2023-11-08/update-web-8.0.0.md index f2872650e3f..3906f58572f 100644 --- a/changelog/5.0.0_2023-11-08/update-web-8.0.0.md +++ b/changelog/5.0.0_2023-11-08/update-web-8.0.0.md @@ -23,7 +23,10 @@ We updated ownCloud Web to v8.0.0. Please refer to the changelog (linked) for de * Bugfix [owncloud/web#9861](https://github.com/owncloud/web/pull/9861) - Duplicated file search request * Bugfix [owncloud/web#9873](https://github.com/owncloud/web/pull/9873) - Tags are no longer editable for a locked file * Bugfix [owncloud/web#9881](https://github.com/owncloud/web/pull/9881) - Prevent rendering of old/wrong set of resources in search list +* Bugfix [owncloud/web#9913](https://github.com/owncloud/web/pull/9913) - Private link resolving via share jail ID +* Bugfix [owncloud/web#9915](https://github.com/owncloud/web/pull/9915) - Keep both folders conflict in same-named folders * Enhancement [owncloud/web#7317](https://github.com/owncloud/ocis/pull/7317) - Make login url configurable +* Enhancement [owncloud/web#7497](https://github.com/owncloud/ocis/issues/7497) - Permission checks for shares and favorites * Enhancement [owncloud/web#7600](https://github.com/owncloud/web/issues/7600) - Scroll to newly created folder * Enhancement [owncloud/web#9302](https://github.com/owncloud/web/issues/9302) - Application unification * Enhancement [owncloud/web#9423](https://github.com/owncloud/web/pull/9423) - Show local loading spinner in sharing button @@ -60,9 +63,12 @@ We updated ownCloud Web to v8.0.0. Please refer to the changelog (linked) for de * Enhancement [owncloud/web#9863](https://github.com/owncloud/web/pull/9863) - Location picker in embed mode * Enhancement [owncloud/web#9864](https://github.com/owncloud/web/pull/9864) - Search tags filter chips style aligned * Enhancement [owncloud/web#9884](https://github.com/owncloud/web/pull/9884) - Enable dark theme on importer +* Enhancement [owncloud/web#9890](https://github.com/owncloud/web/pull/9890) - Create shortcuts +* Enhancement [owncloud/web#9905](https://github.com/owncloud/web/pull/9905) - Manage tags in details panel * Enhancement [owncloud/web#9906](https://github.com/owncloud/web/pull/9906) - Reorganize "New" menu * Enhancement [owncloud/web#9911](https://github.com/owncloud/web/pull/9911) - Provide vendor neutral file icons +* Enhancement [owncloud/web#9912](https://github.com/owncloud/web/pull/9912) - Add media type filter chip -https://github.com/owncloud/ocis/pull/7673 -https://github.com/owncloud/web/releases/tag/v8.0.0-alpha.7 +https://github.com/owncloud/ocis/pull/7734 +https://github.com/owncloud/web/releases/tag/v8.0.0-alpha.8 diff --git a/services/web/Makefile b/services/web/Makefile index 9cc2ef863df..074d281201b 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v8.0.0-alpha.7 +WEB_ASSETS_VERSION = v8.0.0-alpha.8 include ../../.make/recursion.mk From 469927391965fb3a619dcd856a46f53fd4909041 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 16 Nov 2023 10:31:09 +0100 Subject: [PATCH 2/3] Install correct pnpm version in ci pipeline --- .drone.star | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.star b/.drone.star index e32509a58d3..697d98c54c7 100644 --- a/.drone.star +++ b/.drone.star @@ -2627,6 +2627,7 @@ def generateWebPnpmCache(ctx): "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION, "commands": [ "cd %s" % dirs["web"], + 'npm install --silent --global --force "$(jq -r ".packageManager" < package.json)"', "pnpm config set store-dir ./.pnpm-store", "retry -t 3 'pnpm install'", ], @@ -2718,6 +2719,7 @@ def restoreWebPnpmCache(): "cd %s" % dirs["web"], "rm -rf .pnpm-store", "tar -xvf %s" % dirs["webPnpmZip"], + 'npm install --silent --global --force "$(jq -r ".packageManager" < package.json)"', "pnpm config set store-dir ./.pnpm-store", "retry -t 3 'pnpm install'", ], From 7b4655a2c9bcc8f0cac469e1842b93ab2bd0dd3b Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Thu, 16 Nov 2023 12:02:40 +0100 Subject: [PATCH 3/3] chore: bump web commit id --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index 7b4c033a064..4387f3b927f 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for UI tests -WEB_COMMITID=6514050264308fc630abf0fbf5b4dcf728ab4f44 +WEB_COMMITID=958a0f8547685319d70f81c9358845b8a4345450 WEB_BRANCH=master