Merge branch 'master' into tls-config-location

2026-01-17 09:40:07 -06:00 · 2021-06-08 09:31:09 +02:00
parent 870201902a 4fa69900a3
commit 7028bc4a44
8 changed files with 20 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,28 @@

 The following sections list the changes for unreleased.

-[unreleased]: https://github.com/owncloud/ocis/compare/v1.6.0...master
+[unreleased]: https://github.com/owncloud/ocis/compare/v1.7.0...master
+
+## Summary
+
+* Bugfix - External storage registration used wrong config: [#2120](https://github.com/owncloud/ocis/pull/2120)
+
+## Details
+
+* Bugfix - External storage registration used wrong config: [#2120](https://github.com/owncloud/ocis/pull/2120)
+
+   The go-micro registry-singleton ignores the ocis configuration and defaults to mdns
+
+   https://github.com/owncloud/ocis/pull/2120
+# Changelog for [1.7.0] (2021-06-04)
+
+The following sections list the changes for 1.7.0.
+
+[1.7.0]: https://github.com/owncloud/ocis/compare/v1.6.0...v1.7.0

 ## Summary

 * Bugfix - Change the groups index to be case sensitive: [#2109](https://github.com/owncloud/ocis/pull/2109)
-* Bugfix - External storage registration used wrong config: [#2120](https://github.com/owncloud/ocis/pull/2120)
 * Change - Update ownCloud Web to v3.2.0: [#2096](https://github.com/owncloud/ocis/pull/2096)
 * Enhancement - Enable the s3ng storage driver: [#1886](https://github.com/owncloud/ocis/pull/1886)
 * Enhancement - Color contrasts on IDP/OIDC login pages: [#2088](https://github.com/owncloud/ocis/pull/2088)
@@ -23,12 +39,6 @@ The following sections list the changes for unreleased.

   https://github.com/owncloud/ocis/pull/2109

-* Bugfix - External storage registration used wrong config: [#2120](https://github.com/owncloud/ocis/pull/2120)
-
-   The go-micro registry-singleton ignores the ocis configuration and defaults to mdns
-
-   https://github.com/owncloud/ocis/pull/2120
-
 * Change - Update ownCloud Web to v3.2.0: [#2096](https://github.com/owncloud/ocis/pull/2096)

   Tags: web
--- a/changelog/1.7.0_2021-06-04/enable-s3ng-storage-driver.md
+++ b/changelog/1.7.0_2021-06-04/enable-s3ng-storage-driver.md
--- a/changelog/1.7.0_2021-06-04/enhancement-idp-color-contrasts.md
+++ b/changelog/1.7.0_2021-06-04/enhancement-idp-color-contrasts.md
--- a/changelog/1.7.0_2021-06-04/enhancement-user-profile-picture-capability.md
+++ b/changelog/1.7.0_2021-06-04/enhancement-user-profile-picture-capability.md
--- a/changelog/1.7.0_2021-06-04/fix-groups-index.md
+++ b/changelog/1.7.0_2021-06-04/fix-groups-index.md
--- a/changelog/1.7.0_2021-06-04/update-reva-to-b74a2b156af6.md
+++ b/changelog/1.7.0_2021-06-04/update-reva-to-b74a2b156af6.md
--- a/changelog/1.7.0_2021-06-04/update-web-3.2.0.md
+++ b/changelog/1.7.0_2021-06-04/update-web-3.2.0.md
--- a/docs/ocis/getting-started/_index.md
+++ b/docs/ocis/getting-started/_index.md
@@ -27,11 +27,11 @@ You can find the latest official release of oCIS at [our download mirror](https:
 The latest build from the master branch can be found at [our download mirrors testing section](https://download.owncloud.com/ocis/ocis/testing/).

 To run oCIS as binary you need to download it first and then run the following commands.
-For this example, assuming version 1.6.0 of oCIS running on a Linux AMD64 host:
+For this example, assuming version 1.7.0 of oCIS running on a Linux AMD64 host:

 ```console
 # download
-curl https://download.owncloud.com/ocis/ocis/1.6.0/ocis-1.6.0-linux-amd64 --output ocis
+curl https://download.owncloud.com/ocis/ocis/1.7.0/ocis-1.7.0-linux-amd64 --output ocis

 # make binary executable
 chmod +x ocis