Merge branch 'edge' into use-storageproviderid-for-routing

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · May 6, 2022 · ca7cf1c · ca7cf1c
2 parents d97f42f + bdbc57f
commit ca7cf1c
Show file tree

Hide file tree

Showing 91 changed files with 1,847 additions and 742 deletions.
diff --git a/.drone.env b/.drone.env
@@ -1,3 +1,3 @@
 # The test runner source for API tests
-CORE_COMMITID=f73c5f6086921d858d19c1013f1cbf762c8e27dd
+CORE_COMMITID=a11dbcf8ae3903c550bffea6bbfc7f587bede995
 CORE_BRANCH=master
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/RELEASE_DATE b/RELEASE_DATE
@@ -1 +1 @@
-2022-04-12
+2022-05-04
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0
+2.3.0
diff --git a/changelog/unreleased/app-editnew.md → changelog/2.3.0_2022-05-02/app-editnew.md b/changelog/unreleased/app-editnew.md → changelog/2.3.0_2022-05-02/app-editnew.md
diff --git a/...elog/unreleased/avoid-user-enumeration.md → ....3.0_2022-05-02/avoid-user-enumeration.md b/...elog/unreleased/avoid-user-enumeration.md → ....3.0_2022-05-02/avoid-user-enumeration.md
diff --git a/changelog/unreleased/bump-cs3api.md → changelog/2.3.0_2022-05-02/bump-cs3api.md b/changelog/unreleased/bump-cs3api.md → changelog/2.3.0_2022-05-02/bump-cs3api.md
diff --git a/changelog/unreleased/capabilities-public.md → ...g/2.3.0_2022-05-02/capabilities-public.md b/changelog/unreleased/capabilities-public.md → ...g/2.3.0_2022-05-02/capabilities-public.md
diff --git a/changelog/2.3.0_2022-05-02/centralize-space-id-functions.md b/changelog/2.3.0_2022-05-02/centralize-space-id-functions.md
@@ -0,0 +1,5 @@
+Change: Merge the utility functions for space ids/references into one package
+
+Merged the utility functions regarding space ids or references into one package. Also updated the functions to support the newly added provider id in the spaces id.
+
+https://github.com/cs3org/reva/pull/2816
diff --git a/changelog/unreleased/cephfs-fix-base.md → ...gelog/2.3.0_2022-05-02/cephfs-fix-base.md b/changelog/unreleased/cephfs-fix-base.md → ...gelog/2.3.0_2022-05-02/cephfs-fix-base.md
diff --git a/...leased/change-ocis-s3ng-fs-blob-layout.md → ...-05-02/change-ocis-s3ng-fs-blob-layout.md b/...leased/change-ocis-s3ng-fs-blob-layout.md → ...-05-02/change-ocis-s3ng-fs-blob-layout.md
diff --git a/...log/unreleased/change-public-link-hash.md → ...3.0_2022-05-02/change-public-link-hash.md b/...log/unreleased/change-public-link-hash.md → ...3.0_2022-05-02/change-public-link-hash.md
diff --git a/...gelog/unreleased/chi-method-workaround.md → ...2.3.0_2022-05-02/chi-method-workaround.md b/...gelog/unreleased/chi-method-workaround.md → ...2.3.0_2022-05-02/chi-method-workaround.md
diff --git a/...gelog/unreleased/enable-default-traces.md → ...2.3.0_2022-05-02/enable-default-traces.md b/...gelog/unreleased/enable-default-traces.md → ...2.3.0_2022-05-02/enable-default-traces.md
diff --git a/changelog/unreleased/eos-fix-deny-grant.md → ...og/2.3.0_2022-05-02/eos-fix-deny-grant.md b/changelog/unreleased/eos-fix-deny-grant.md → ...og/2.3.0_2022-05-02/eos-fix-deny-grant.md
diff --git a/changelog/unreleased/eos-scope-devs.md → changelog/2.3.0_2022-05-02/eos-scope-devs.md b/changelog/unreleased/eos-scope-devs.md → changelog/2.3.0_2022-05-02/eos-scope-devs.md
diff --git a/changelog/unreleased/eos-sys-acl-files.md → ...log/2.3.0_2022-05-02/eos-sys-acl-files.md b/changelog/unreleased/eos-sys-acl-files.md → ...log/2.3.0_2022-05-02/eos-sys-acl-files.md
diff --git a/changelog/unreleased/events.md → changelog/2.3.0_2022-05-02/events.md b/changelog/unreleased/events.md → changelog/2.3.0_2022-05-02/events.md
diff --git a/changelog/unreleased/events2.md → changelog/2.3.0_2022-05-02/events2.md b/changelog/unreleased/events2.md → changelog/2.3.0_2022-05-02/events2.md
diff --git a/changelog/unreleased/extend-events.md → changelog/2.3.0_2022-05-02/extend-events.md b/changelog/unreleased/extend-events.md → changelog/2.3.0_2022-05-02/extend-events.md
diff --git a/changelog/unreleased/fake-providerids.md → ...elog/2.3.0_2022-05-02/fake-providerids.md b/changelog/unreleased/fake-providerids.md → ...elog/2.3.0_2022-05-02/fake-providerids.md
diff --git a/changelog/unreleased/federated-accounts.md → ...og/2.3.0_2022-05-02/federated-accounts.md b/changelog/unreleased/federated-accounts.md → ...og/2.3.0_2022-05-02/federated-accounts.md
diff --git a/changelog/unreleased/fix-ocmd-tutorial.md → ...log/2.3.0_2022-05-02/fix-ocmd-tutorial.md b/changelog/unreleased/fix-ocmd-tutorial.md → ...log/2.3.0_2022-05-02/fix-ocmd-tutorial.md
diff --git a/changelog/unreleased/fix-space-shares.md → ...elog/2.3.0_2022-05-02/fix-space-shares.md b/changelog/unreleased/fix-space-shares.md → ...elog/2.3.0_2022-05-02/fix-space-shares.md
diff --git a/changelog/unreleased/fix-spaces-trashbin.md → ...g/2.3.0_2022-05-02/fix-spaces-trashbin.md b/changelog/unreleased/fix-spaces-trashbin.md → ...g/2.3.0_2022-05-02/fix-spaces-trashbin.md
diff --git a/changelog/2.3.0_2022-05-02/fix-trashbin-propfind.md b/changelog/2.3.0_2022-05-02/fix-trashbin-propfind.md
@@ -0,0 +1,6 @@
+Bugfix: Fix trash-bin propfind responses
+
+Fixed the href of the root element in trash-bin propfind responses.
+
+https://github.com/owncloud/ocis/issues/1846
+https://github.com/cs3org/reva/pull/2821
diff --git a/...unreleased/honour-tracing-service-name.md → ...2022-05-02/honour-tracing-service-name.md b/...unreleased/honour-tracing-service-name.md → ...2022-05-02/honour-tracing-service-name.md
diff --git a/changelog/unreleased/http-tpc.md → changelog/2.3.0_2022-05-02/http-tpc.md b/changelog/unreleased/http-tpc.md → changelog/2.3.0_2022-05-02/http-tpc.md
diff --git a/changelog/unreleased/ldap-login-filter.md → ...log/2.3.0_2022-05-02/ldap-login-filter.md b/changelog/unreleased/ldap-login-filter.md → ...log/2.3.0_2022-05-02/ldap-login-filter.md
diff --git a/...og/unreleased/list-spaces-unrestricted.md → ....0_2022-05-02/list-spaces-unrestricted.md b/...og/unreleased/list-spaces-unrestricted.md → ....0_2022-05-02/list-spaces-unrestricted.md
diff --git a/changelog/unreleased/mentix-prom-ext.md → ...gelog/2.3.0_2022-05-02/mentix-prom-ext.md b/changelog/unreleased/mentix-prom-ext.md → ...gelog/2.3.0_2022-05-02/mentix-prom-ext.md
diff --git a/changelog/unreleased/meta-path-for-user.md → ...og/2.3.0_2022-05-02/meta-path-for-user.md b/changelog/unreleased/meta-path-for-user.md → ...og/2.3.0_2022-05-02/meta-path-for-user.md
diff --git a/changelog/unreleased/mimetypes-config.md → ...elog/2.3.0_2022-05-02/mimetypes-config.md b/changelog/unreleased/mimetypes-config.md → ...elog/2.3.0_2022-05-02/mimetypes-config.md
diff --git a/...unreleased/nextcloud-ocm-share-manager.md → ...2022-05-02/nextcloud-ocm-share-manager.md b/...unreleased/nextcloud-ocm-share-manager.md → ...2022-05-02/nextcloud-ocm-share-manager.md
diff --git a/changelog/unreleased/oidc-fix.md → changelog/2.3.0_2022-05-02/oidc-fix.md b/changelog/unreleased/oidc-fix.md → changelog/2.3.0_2022-05-02/oidc-fix.md
diff --git a/changelog/unreleased/preferences-refactor.md → .../2.3.0_2022-05-02/preferences-refactor.md b/changelog/unreleased/preferences-refactor.md → .../2.3.0_2022-05-02/preferences-refactor.md
diff --git a/changelog/unreleased/public-ids.md → changelog/2.3.0_2022-05-02/public-ids.md b/changelog/unreleased/public-ids.md → changelog/2.3.0_2022-05-02/public-ids.md
diff --git a/changelog/unreleased/pull-transfer.md → changelog/2.3.0_2022-05-02/pull-transfer.md b/changelog/unreleased/pull-transfer.md → changelog/2.3.0_2022-05-02/pull-transfer.md
@@ -1,6 +1,6 @@
-Enhancement: New CS3API datatx methods
-
-CS3 datatx pull model methods: PullTransfer, RetryTransfer, ListTransfers
-Method CreateTransfer removed.
-
+Enhancement: New CS3API datatx methods
+
+CS3 datatx pull model methods: PullTransfer, RetryTransfer, ListTransfers
+Method CreateTransfer removed.
+
 https://github.com/cs3org/reva/pull/2052
diff --git a/...released/remove-base64-encoding-of-ids.md → ...22-05-02/remove-base64-encoding-of-ids.md b/...released/remove-base64-encoding-of-ids.md → ...22-05-02/remove-base64-encoding-of-ids.md
diff --git a/...eased/rename-oc10-share-manager-driver.md → ...05-02/rename-oc10-share-manager-driver.md b/...eased/rename-oc10-share-manager-driver.md → ...05-02/rename-oc10-share-manager-driver.md
diff --git a/changelog/unreleased/rfc3339-fix.md → changelog/2.3.0_2022-05-02/rfc3339-fix.md b/changelog/unreleased/rfc3339-fix.md → changelog/2.3.0_2022-05-02/rfc3339-fix.md
diff --git a/changelog/unreleased/share-jail-cache.md → ...elog/2.3.0_2022-05-02/share-jail-cache.md b/changelog/unreleased/share-jail-cache.md → ...elog/2.3.0_2022-05-02/share-jail-cache.md
diff --git a/changelog/unreleased/single-file-edit.md → ...elog/2.3.0_2022-05-02/single-file-edit.md b/changelog/unreleased/single-file-edit.md → ...elog/2.3.0_2022-05-02/single-file-edit.md
diff --git a/changelog/unreleased/siteacc-fix.md → changelog/2.3.0_2022-05-02/siteacc-fix.md b/changelog/unreleased/siteacc-fix.md → changelog/2.3.0_2022-05-02/siteacc-fix.md
diff --git a/...gelog/unreleased/siteacc-site-settings.md → ...2.3.0_2022-05-02/siteacc-site-settings.md b/...gelog/unreleased/siteacc-site-settings.md → ...2.3.0_2022-05-02/siteacc-site-settings.md
diff --git a/changelog/unreleased/siteacc-upd-2.md → changelog/2.3.0_2022-05-02/siteacc-upd-2.md b/changelog/unreleased/siteacc-upd-2.md → changelog/2.3.0_2022-05-02/siteacc-upd-2.md
diff --git a/changelog/unreleased/siteacc-upd.md → changelog/2.3.0_2022-05-02/siteacc-upd.md b/changelog/unreleased/siteacc-upd.md → changelog/2.3.0_2022-05-02/siteacc-upd.md
diff --git a/...gelog/unreleased/spaces-feature-flags.md → ...2.3.0_2022-05-02/spaces-feature-flags.md b/...gelog/unreleased/spaces-feature-flags.md → ...2.3.0_2022-05-02/spaces-feature-flags.md
diff --git a/changelog/unreleased/uniform-ocs-roles.md → ...log/2.3.0_2022-05-02/uniform-ocs-roles.md b/changelog/unreleased/uniform-ocs-roles.md → ...log/2.3.0_2022-05-02/uniform-ocs-roles.md
diff --git a/changelog/unreleased/unify-oidc.md → changelog/2.3.0_2022-05-02/unify-oidc.md b/changelog/unreleased/unify-oidc.md → changelog/2.3.0_2022-05-02/unify-oidc.md
diff --git a/changelog/unreleased/update-makefile.md → ...gelog/2.3.0_2022-05-02/update-makefile.md b/changelog/unreleased/update-makefile.md → ...gelog/2.3.0_2022-05-02/update-makefile.md
diff --git a/changelog/unreleased/user-provider-memory.md → .../2.3.0_2022-05-02/user-provider-memory.md b/changelog/unreleased/user-provider-memory.md → .../2.3.0_2022-05-02/user-provider-memory.md
diff --git a/changelog/unreleased/user-rest-refactor.md → ...og/2.3.0_2022-05-02/user-rest-refactor.md b/changelog/unreleased/user-rest-refactor.md → ...og/2.3.0_2022-05-02/user-rest-refactor.md
diff --git a/changelog/unreleased/waitForNats.md → changelog/2.3.0_2022-05-02/waitForNats.md b/changelog/unreleased/waitForNats.md → changelog/2.3.0_2022-05-02/waitForNats.md
diff --git a/changelog/NOTE.md b/changelog/NOTE.md