From bba86823a5aa8af9ea11562f44e9b1cdb2e95187 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 9 Jul 2021 00:01:09 +0200 Subject: [PATCH] Prepare release 3.4.0 --- .drone.env | 2 +- .../bugfix-delete-batch-action-in-viewer-shares | 0 .../enhancement-add-page-size | 0 .../enhancement-add-view-options | 0 .../enhancement-details-in-sharing-sidebar | 0 .../enhancement-feedback-link | 0 .../enhancement-oc10-web-csp | 0 .../enhancement-share-batch-actions | 0 .../enhancement-update-ods-8.0.0 | 2 ++ changelog/unreleased/enhancement-update-ods | 6 ------ package.json | 2 +- packages/web-integration-oc10/appinfo/info.xml | 2 +- sonar-project.properties | 2 +- 13 files changed, 6 insertions(+), 10 deletions(-) rename changelog/{unreleased => 3.4.0_2021-07-09}/bugfix-delete-batch-action-in-viewer-shares (100%) rename changelog/{unreleased => 3.4.0_2021-07-09}/enhancement-add-page-size (100%) rename changelog/{unreleased => 3.4.0_2021-07-09}/enhancement-add-view-options (100%) rename changelog/{unreleased => 3.4.0_2021-07-09}/enhancement-details-in-sharing-sidebar (100%) rename changelog/{unreleased => 3.4.0_2021-07-09}/enhancement-feedback-link (100%) rename changelog/{unreleased => 3.4.0_2021-07-09}/enhancement-oc10-web-csp (100%) rename changelog/{unreleased => 3.4.0_2021-07-09}/enhancement-share-batch-actions (100%) rename changelog/{unreleased => 3.4.0_2021-07-09}/enhancement-update-ods-8.0.0 (70%) delete mode 100644 changelog/unreleased/enhancement-update-ods diff --git a/.drone.env b/.drone.env index 756a412ee5f..06a60a7f28e 100644 --- a/.drone.env +++ b/.drone.env @@ -1,5 +1,5 @@ # The version of OCIS to use in pipelines that test against OCIS -OCIS_COMMITID=458de9f554fb64883d333626c151c6612aedf1aa +OCIS_COMMITID=2119d12cbc0ad242e91793953badc1d4f831df92 OCIS_BRANCH=master # The test runner source for API tests diff --git a/changelog/unreleased/bugfix-delete-batch-action-in-viewer-shares b/changelog/3.4.0_2021-07-09/bugfix-delete-batch-action-in-viewer-shares similarity index 100% rename from changelog/unreleased/bugfix-delete-batch-action-in-viewer-shares rename to changelog/3.4.0_2021-07-09/bugfix-delete-batch-action-in-viewer-shares diff --git a/changelog/unreleased/enhancement-add-page-size b/changelog/3.4.0_2021-07-09/enhancement-add-page-size similarity index 100% rename from changelog/unreleased/enhancement-add-page-size rename to changelog/3.4.0_2021-07-09/enhancement-add-page-size diff --git a/changelog/unreleased/enhancement-add-view-options b/changelog/3.4.0_2021-07-09/enhancement-add-view-options similarity index 100% rename from changelog/unreleased/enhancement-add-view-options rename to changelog/3.4.0_2021-07-09/enhancement-add-view-options diff --git a/changelog/unreleased/enhancement-details-in-sharing-sidebar b/changelog/3.4.0_2021-07-09/enhancement-details-in-sharing-sidebar similarity index 100% rename from changelog/unreleased/enhancement-details-in-sharing-sidebar rename to changelog/3.4.0_2021-07-09/enhancement-details-in-sharing-sidebar diff --git a/changelog/unreleased/enhancement-feedback-link b/changelog/3.4.0_2021-07-09/enhancement-feedback-link similarity index 100% rename from changelog/unreleased/enhancement-feedback-link rename to changelog/3.4.0_2021-07-09/enhancement-feedback-link diff --git a/changelog/unreleased/enhancement-oc10-web-csp b/changelog/3.4.0_2021-07-09/enhancement-oc10-web-csp similarity index 100% rename from changelog/unreleased/enhancement-oc10-web-csp rename to changelog/3.4.0_2021-07-09/enhancement-oc10-web-csp diff --git a/changelog/unreleased/enhancement-share-batch-actions b/changelog/3.4.0_2021-07-09/enhancement-share-batch-actions similarity index 100% rename from changelog/unreleased/enhancement-share-batch-actions rename to changelog/3.4.0_2021-07-09/enhancement-share-batch-actions diff --git a/changelog/unreleased/enhancement-update-ods-8.0.0 b/changelog/3.4.0_2021-07-09/enhancement-update-ods-8.0.0 similarity index 70% rename from changelog/unreleased/enhancement-update-ods-8.0.0 rename to changelog/3.4.0_2021-07-09/enhancement-update-ods-8.0.0 index 5166b6065c5..c1da2bb47a7 100644 --- a/changelog/unreleased/enhancement-update-ods-8.0.0 +++ b/changelog/3.4.0_2021-07-09/enhancement-update-ods-8.0.0 @@ -3,5 +3,7 @@ Enhancement: Update Design System to 8.0.0 The ownCloud design system has been updated to its latest version. https://github.com/owncloud/owncloud-design-system/releases/tag/v8.0.0 +https://github.com/owncloud/owncloud-design-system/releases/tag/v7.5.0 https://github.com/owncloud/web/pull/5465 https://github.com/owncloud/web/pull/5483 +https://github.com/owncloud/web/pull/5408 diff --git a/changelog/unreleased/enhancement-update-ods b/changelog/unreleased/enhancement-update-ods deleted file mode 100644 index 56795a9a3cd..00000000000 --- a/changelog/unreleased/enhancement-update-ods +++ /dev/null @@ -1,6 +0,0 @@ -Enhancement: Update owncloud-design-system to v7.5.0 - -We've updated owncloud-design-system to version 7.5.0 - -https://github.com/owncloud/owncloud-design-system/releases/tag/v7.5.0 -https://github.com/owncloud/web/pull/5408 \ No newline at end of file diff --git a/package.json b/package.json index dd795331455..e5c05f77c08 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "3.3.1", + "version": "3.4.0", "private": true, "homepage": "https://github.com/owncloud/web", "license": "AGPL-3.0", diff --git a/packages/web-integration-oc10/appinfo/info.xml b/packages/web-integration-oc10/appinfo/info.xml index 7829c61f2b7..55a12b99c6c 100644 --- a/packages/web-integration-oc10/appinfo/info.xml +++ b/packages/web-integration-oc10/appinfo/info.xml @@ -15,7 +15,7 @@ For feedback and bug reports, please use the [public issue tracker](https://gith AGPL ownCloud - 3.3.1 + 3.4.0 tools https://github.com/owncloud/web https://github.com/owncloud/web/issues diff --git a/sonar-project.properties b/sonar-project.properties index 335720ec2ee..bf51b1f247b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=owncloud_web sonar.organization=owncloud-1 sonar.projectName=Web -sonar.projectVersion=3.3.1 +sonar.projectVersion=3.4.0 sonar.host.url=https://sonarcloud.io # =====================================================