From 5e2962db785e7135fa6039fd4ea65adadb3d1ae9 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 25 Oct 2021 11:59:54 +0200 Subject: [PATCH 1/3] Bump version to 4.4.0 --- .drone.env | 2 +- .../bugfix-duplicated-event-subscriptions | 0 .../bugfix-external-apps-by-shares | 0 .../bugfix-new-collaborator-removes-wrong-collaborator | 0 .../bugfix-overlapping-view-requests | 0 .../{unreleased => 4.4.0_2021-10-25}/bugfix-router-clean-path | 0 .../bugfix-unnecessary-redirects-personal-home-folder | 0 .../enhancement-accessible-themeable-mediaviewer | 0 .../enhancement-datepicker-dropdown | 0 .../enhancement-sort-out-dependencies | 0 .../{unreleased => 4.4.0_2021-10-25}/enhancement-update-ods | 0 package.json | 2 +- packages/web-integration-oc10/appinfo/info.xml | 2 +- sonar-project.properties | 2 +- 14 files changed, 4 insertions(+), 4 deletions(-) rename changelog/{unreleased => 4.4.0_2021-10-25}/bugfix-duplicated-event-subscriptions (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/bugfix-external-apps-by-shares (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/bugfix-new-collaborator-removes-wrong-collaborator (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/bugfix-overlapping-view-requests (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/bugfix-router-clean-path (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/bugfix-unnecessary-redirects-personal-home-folder (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/enhancement-accessible-themeable-mediaviewer (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/enhancement-datepicker-dropdown (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/enhancement-sort-out-dependencies (100%) rename changelog/{unreleased => 4.4.0_2021-10-25}/enhancement-update-ods (100%) diff --git a/.drone.env b/.drone.env index a5c5418c179..090e1e4b8be 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The version of OCIS to use in pipelines that test against OCIS -OCIS_COMMITID=75a40159544732f47a71334436b48aa3641dfed3 +OCIS_COMMITID=25d6e4efd119049f290683d6d126185368058b4e OCIS_BRANCH=master diff --git a/changelog/unreleased/bugfix-duplicated-event-subscriptions b/changelog/4.4.0_2021-10-25/bugfix-duplicated-event-subscriptions similarity index 100% rename from changelog/unreleased/bugfix-duplicated-event-subscriptions rename to changelog/4.4.0_2021-10-25/bugfix-duplicated-event-subscriptions diff --git a/changelog/unreleased/bugfix-external-apps-by-shares b/changelog/4.4.0_2021-10-25/bugfix-external-apps-by-shares similarity index 100% rename from changelog/unreleased/bugfix-external-apps-by-shares rename to changelog/4.4.0_2021-10-25/bugfix-external-apps-by-shares diff --git a/changelog/unreleased/bugfix-new-collaborator-removes-wrong-collaborator b/changelog/4.4.0_2021-10-25/bugfix-new-collaborator-removes-wrong-collaborator similarity index 100% rename from changelog/unreleased/bugfix-new-collaborator-removes-wrong-collaborator rename to changelog/4.4.0_2021-10-25/bugfix-new-collaborator-removes-wrong-collaborator diff --git a/changelog/unreleased/bugfix-overlapping-view-requests b/changelog/4.4.0_2021-10-25/bugfix-overlapping-view-requests similarity index 100% rename from changelog/unreleased/bugfix-overlapping-view-requests rename to changelog/4.4.0_2021-10-25/bugfix-overlapping-view-requests diff --git a/changelog/unreleased/bugfix-router-clean-path b/changelog/4.4.0_2021-10-25/bugfix-router-clean-path similarity index 100% rename from changelog/unreleased/bugfix-router-clean-path rename to changelog/4.4.0_2021-10-25/bugfix-router-clean-path diff --git a/changelog/unreleased/bugfix-unnecessary-redirects-personal-home-folder b/changelog/4.4.0_2021-10-25/bugfix-unnecessary-redirects-personal-home-folder similarity index 100% rename from changelog/unreleased/bugfix-unnecessary-redirects-personal-home-folder rename to changelog/4.4.0_2021-10-25/bugfix-unnecessary-redirects-personal-home-folder diff --git a/changelog/unreleased/enhancement-accessible-themeable-mediaviewer b/changelog/4.4.0_2021-10-25/enhancement-accessible-themeable-mediaviewer similarity index 100% rename from changelog/unreleased/enhancement-accessible-themeable-mediaviewer rename to changelog/4.4.0_2021-10-25/enhancement-accessible-themeable-mediaviewer diff --git a/changelog/unreleased/enhancement-datepicker-dropdown b/changelog/4.4.0_2021-10-25/enhancement-datepicker-dropdown similarity index 100% rename from changelog/unreleased/enhancement-datepicker-dropdown rename to changelog/4.4.0_2021-10-25/enhancement-datepicker-dropdown diff --git a/changelog/unreleased/enhancement-sort-out-dependencies b/changelog/4.4.0_2021-10-25/enhancement-sort-out-dependencies similarity index 100% rename from changelog/unreleased/enhancement-sort-out-dependencies rename to changelog/4.4.0_2021-10-25/enhancement-sort-out-dependencies diff --git a/changelog/unreleased/enhancement-update-ods b/changelog/4.4.0_2021-10-25/enhancement-update-ods similarity index 100% rename from changelog/unreleased/enhancement-update-ods rename to changelog/4.4.0_2021-10-25/enhancement-update-ods diff --git a/package.json b/package.json index 249e5054b62..9604f034000 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.3.0", + "version": "4.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 f1f11aeab28..1acdff1b377 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 - 4.3.0 + 4.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 1227be50fb3..64bd7e4084e 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=4.3.0 +sonar.projectVersion=4.4.0 sonar.host.url=https://sonarcloud.io # ===================================================== From ec920a8edb888ee178a4c143e2a57498e9a610c5 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 26 Oct 2021 15:18:22 +0200 Subject: [PATCH 2/3] Remove horizontal fake-spacing around share modifiers --- .../SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue index 77b85929f93..d55609973c0 100644 --- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue +++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/CollaboratorsEditOptions.vue @@ -1,6 +1,5 @@ -
From 327fd46ccc556065103268e50be5f6789dd02f9c Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 26 Oct 2021 15:20:59 +0200 Subject: [PATCH 3/3] rename changelog folder --- .../bugfix-duplicated-event-subscriptions | 0 .../bugfix-external-apps-by-shares | 0 .../bugfix-new-collaborator-removes-wrong-collaborator | 0 .../bugfix-overlapping-view-requests | 0 .../bugfix-router-clean-path | 0 .../bugfix-unnecessary-redirects-personal-home-folder | 0 .../enhancement-accessible-themeable-mediaviewer | 0 .../enhancement-datepicker-dropdown | 0 .../enhancement-sort-out-dependencies | 0 .../{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/enhancement-update-ods | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/bugfix-duplicated-event-subscriptions (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/bugfix-external-apps-by-shares (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/bugfix-new-collaborator-removes-wrong-collaborator (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/bugfix-overlapping-view-requests (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/bugfix-router-clean-path (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/bugfix-unnecessary-redirects-personal-home-folder (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/enhancement-accessible-themeable-mediaviewer (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/enhancement-datepicker-dropdown (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/enhancement-sort-out-dependencies (100%) rename changelog/{4.4.0_2021-10-25 => 4.4.0_2021-10-26}/enhancement-update-ods (100%) diff --git a/changelog/4.4.0_2021-10-25/bugfix-duplicated-event-subscriptions b/changelog/4.4.0_2021-10-26/bugfix-duplicated-event-subscriptions similarity index 100% rename from changelog/4.4.0_2021-10-25/bugfix-duplicated-event-subscriptions rename to changelog/4.4.0_2021-10-26/bugfix-duplicated-event-subscriptions diff --git a/changelog/4.4.0_2021-10-25/bugfix-external-apps-by-shares b/changelog/4.4.0_2021-10-26/bugfix-external-apps-by-shares similarity index 100% rename from changelog/4.4.0_2021-10-25/bugfix-external-apps-by-shares rename to changelog/4.4.0_2021-10-26/bugfix-external-apps-by-shares diff --git a/changelog/4.4.0_2021-10-25/bugfix-new-collaborator-removes-wrong-collaborator b/changelog/4.4.0_2021-10-26/bugfix-new-collaborator-removes-wrong-collaborator similarity index 100% rename from changelog/4.4.0_2021-10-25/bugfix-new-collaborator-removes-wrong-collaborator rename to changelog/4.4.0_2021-10-26/bugfix-new-collaborator-removes-wrong-collaborator diff --git a/changelog/4.4.0_2021-10-25/bugfix-overlapping-view-requests b/changelog/4.4.0_2021-10-26/bugfix-overlapping-view-requests similarity index 100% rename from changelog/4.4.0_2021-10-25/bugfix-overlapping-view-requests rename to changelog/4.4.0_2021-10-26/bugfix-overlapping-view-requests diff --git a/changelog/4.4.0_2021-10-25/bugfix-router-clean-path b/changelog/4.4.0_2021-10-26/bugfix-router-clean-path similarity index 100% rename from changelog/4.4.0_2021-10-25/bugfix-router-clean-path rename to changelog/4.4.0_2021-10-26/bugfix-router-clean-path diff --git a/changelog/4.4.0_2021-10-25/bugfix-unnecessary-redirects-personal-home-folder b/changelog/4.4.0_2021-10-26/bugfix-unnecessary-redirects-personal-home-folder similarity index 100% rename from changelog/4.4.0_2021-10-25/bugfix-unnecessary-redirects-personal-home-folder rename to changelog/4.4.0_2021-10-26/bugfix-unnecessary-redirects-personal-home-folder diff --git a/changelog/4.4.0_2021-10-25/enhancement-accessible-themeable-mediaviewer b/changelog/4.4.0_2021-10-26/enhancement-accessible-themeable-mediaviewer similarity index 100% rename from changelog/4.4.0_2021-10-25/enhancement-accessible-themeable-mediaviewer rename to changelog/4.4.0_2021-10-26/enhancement-accessible-themeable-mediaviewer diff --git a/changelog/4.4.0_2021-10-25/enhancement-datepicker-dropdown b/changelog/4.4.0_2021-10-26/enhancement-datepicker-dropdown similarity index 100% rename from changelog/4.4.0_2021-10-25/enhancement-datepicker-dropdown rename to changelog/4.4.0_2021-10-26/enhancement-datepicker-dropdown diff --git a/changelog/4.4.0_2021-10-25/enhancement-sort-out-dependencies b/changelog/4.4.0_2021-10-26/enhancement-sort-out-dependencies similarity index 100% rename from changelog/4.4.0_2021-10-25/enhancement-sort-out-dependencies rename to changelog/4.4.0_2021-10-26/enhancement-sort-out-dependencies diff --git a/changelog/4.4.0_2021-10-25/enhancement-update-ods b/changelog/4.4.0_2021-10-26/enhancement-update-ods similarity index 100% rename from changelog/4.4.0_2021-10-25/enhancement-update-ods rename to changelog/4.4.0_2021-10-26/enhancement-update-ods