From d2307f49d9b7bed6b700c8d93b2f5495c9ec780f Mon Sep 17 00:00:00 2001 From: pwengerter Date: Wed, 20 Oct 2021 18:52:01 +0100 Subject: [PATCH 1/3] Add versioned user settings capability --- changelog/unreleased/add-user-setting-capability.md | 6 ++++++ storage/pkg/command/frontend.go | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 changelog/unreleased/add-user-setting-capability.md diff --git a/changelog/unreleased/add-user-setting-capability.md b/changelog/unreleased/add-user-setting-capability.md new file mode 100644 index 00000000000..8096fbb5cfc --- /dev/null +++ b/changelog/unreleased/add-user-setting-capability.md @@ -0,0 +1,6 @@ +Enhancement: Add user setting capability + +We've added a capability to communicate the existance of a user settings service to clients. + +https://github.com/owncloud/ocis/pull/2655 +https://github.com/owncloud/web/issues/5926 diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go index 9e14b53de50..f55b5618fec 100644 --- a/storage/pkg/command/frontend.go +++ b/storage/pkg/command/frontend.go @@ -272,6 +272,12 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s "user": map[string]interface{}{ "send_mail": true, "profile_picture": false, + "settings": []map[string]interface{}{ + { + "enabled": true, + "version": "1.0.0", + }, + }, }, "user_enumeration": map[string]interface{}{ "enabled": true, From a837e4881f39049bee95825ee8452fb27616cbfb Mon Sep 17 00:00:00 2001 From: pwengerter Date: Wed, 20 Oct 2021 18:54:06 +0100 Subject: [PATCH 2/3] Improve wording in changelog items --- changelog/unreleased/buf-tooling.md | 4 ++-- changelog/unreleased/create-space-quota.md | 2 +- changelog/unreleased/go-embed-instead-fileb0x.md | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/changelog/unreleased/buf-tooling.md b/changelog/unreleased/buf-tooling.md index 7b37d725fc8..3b0944a53a6 100644 --- a/changelog/unreleased/buf-tooling.md +++ b/changelog/unreleased/buf-tooling.md @@ -1,7 +1,7 @@ -Bugfix: Enhancement +Enhancement: Broaden bufbuild/Buf usage We've switched the usage of bufbuild/Buf from a protoc replacement only to -also using it to configuring the outputs and pinning dependencies. +also using it to confige the outputs and pinning dependencies. https://github.com/owncloud/ocis/pull/2630 https://github.com/owncloud/ocis/pull/2616 diff --git a/changelog/unreleased/create-space-quota.md b/changelog/unreleased/create-space-quota.md index 7651cf7460d..ddc6f829b36 100644 --- a/changelog/unreleased/create-space-quota.md +++ b/changelog/unreleased/create-space-quota.md @@ -1,6 +1,6 @@ Change: Configurable default quota -When creating a new space a (configurable) default quota will be used (instead the hardcoded one) +When creating a new space a (configurable) default quota will be used (instead the hardcoded one). One can set the EnvVar `GRAPH_SPACES_DEFAULT_QUOTA` to configure it https://github.com/owncloud/ocis/issues/2621 diff --git a/changelog/unreleased/go-embed-instead-fileb0x.md b/changelog/unreleased/go-embed-instead-fileb0x.md index 9b7338fa8d3..d7ac2116d61 100644 --- a/changelog/unreleased/go-embed-instead-fileb0x.md +++ b/changelog/unreleased/go-embed-instead-fileb0x.md @@ -1,6 +1,7 @@ -Enhancement: use go-embed insted of fileb0x +Enhancement: Replace fileb0x with go-embed -go-embed delivers already the funtionality we need but with less code. We decided to use it instead of 3rd party fileb0x +go-embed already brings the functionality we need but with less code. We decided to use it instead of 3rd party fileb0x https://github.com/owncloud/ocis/issues/1199 https://github.com/owncloud/ocis/pull/2631 +https://github.com/owncloud/ocis/pull/2649 From f30b5af0af14b71997770ea2c0234c3a9516931e Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 21 Oct 2021 13:40:27 +0200 Subject: [PATCH 3/3] update reva --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8be3fe61d87..010383f3cbf 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/blevesearch/bleve/v2 v2.2.1 github.com/coreos/go-oidc/v3 v3.1.0 github.com/cs3org/go-cs3apis v0.0.0-20211018122138-391b29bd7803 - github.com/cs3org/reva v1.14.1-0.20211021070229-852282ce34f5 + github.com/cs3org/reva v1.14.1-0.20211021110426-87c920ffc25f github.com/disintegration/imaging v1.6.2 github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733 github.com/go-chi/chi/v5 v5.0.4 diff --git a/go.sum b/go.sum index c9f536e6f85..2371db35da9 100644 --- a/go.sum +++ b/go.sum @@ -305,8 +305,8 @@ github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= github.com/cs3org/go-cs3apis v0.0.0-20211018122138-391b29bd7803 h1:R/6llgTNKxQQ7GaSTgFn6Fp8N50wIlagmdR7WY5LntM= github.com/cs3org/go-cs3apis v0.0.0-20211018122138-391b29bd7803/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva v1.14.1-0.20211021070229-852282ce34f5 h1:mGWW3ACgRp4iLOjUx6OiOX16j2SFUIM3DcWqzFs8KJQ= -github.com/cs3org/reva v1.14.1-0.20211021070229-852282ce34f5/go.mod h1:wkZXgaxq5nO6Dvl9qRpHpbGUQrWyTfwqWtBqOiCWy+k= +github.com/cs3org/reva v1.14.1-0.20211021110426-87c920ffc25f h1:eTNBGvvU6r6OhnL/3M8QxdCp3yHgklhfMHktOa111BY= +github.com/cs3org/reva v1.14.1-0.20211021110426-87c920ffc25f/go.mod h1:wkZXgaxq5nO6Dvl9qRpHpbGUQrWyTfwqWtBqOiCWy+k= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=