Merge branch 'master' into update-bridge-docs

2026-02-18 03:18:52 -06:00 · 2021-09-29 12:09:29 +02:00
parent 5554c72d9a f36017f188
commit 6166bb5a4c
511 changed files with 12687 additions and 17566 deletions
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.4.0. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
@@ -17,23 +17,23 @@ GO     ?= $(shell which go)
 #	@echo "Running bingo"
 #	@$(BINGO) <flags/args..>
 #
-BINGO := $(GOBIN)/bingo-v0.4.0
+BINGO := $(GOBIN)/bingo-v0.5.1
 $(BINGO): $(BINGO_DIR)/bingo.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/bingo-v0.4.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.4.0 "github.com/bwplotka/bingo"
+	@echo "(re)installing $(GOBIN)/bingo-v0.5.1"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.5.1 "github.com/bwplotka/bingo"

-BUF := $(GOBIN)/buf-v0.40.0
+BUF := $(GOBIN)/buf-v0.56.0
 $(BUF): $(BINGO_DIR)/buf.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/buf-v0.40.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buf.mod -o=$(GOBIN)/buf-v0.40.0 "github.com/bufbuild/buf/cmd/buf"
+	@echo "(re)installing $(GOBIN)/buf-v0.56.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buf.mod -o=$(GOBIN)/buf-v0.56.0 "github.com/bufbuild/buf/cmd/buf"

-BUILDIFIER := $(GOBIN)/buildifier-v0.0.0-20210227132407-f2aed9ee205d
+BUILDIFIER := $(GOBIN)/buildifier-v0.0.0-20210920153738-d6daef01a1a2
 $(BUILDIFIER): $(BINGO_DIR)/buildifier.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/buildifier-v0.0.0-20210227132407-f2aed9ee205d"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buildifier.mod -o=$(GOBIN)/buildifier-v0.0.0-20210227132407-f2aed9ee205d "github.com/bazelbuild/buildtools/buildifier"
+	@echo "(re)installing $(GOBIN)/buildifier-v0.0.0-20210920153738-d6daef01a1a2"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buildifier.mod -o=$(GOBIN)/buildifier-v0.0.0-20210920153738-d6daef01a1a2 "github.com/bazelbuild/buildtools/buildifier"

 CALENS := $(GOBIN)/calens-v0.2.0
 $(CALENS): $(BINGO_DIR)/calens.mod
@@ -53,11 +53,11 @@ $(FLAEX): $(BINGO_DIR)/flaex.mod
 	@echo "(re)installing $(GOBIN)/flaex-v0.2.1-0.20210701123229-9d7dceed124f"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=flaex.mod -o=$(GOBIN)/flaex-v0.2.1-0.20210701123229-9d7dceed124f "github.com/owncloud/flaex"

-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.37.1
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.42.1
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.37.1"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.37.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.42.1"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.42.1 "github.com/golangci/golangci-lint/cmd/golangci-lint"

 GOX := $(GOBIN)/gox-v1.0.1
 $(GOX): $(BINGO_DIR)/gox.mod
@@ -65,11 +65,11 @@ $(GOX): $(BINGO_DIR)/gox.mod
 	@echo "(re)installing $(GOBIN)/gox-v1.0.1"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=gox.mod -o=$(GOBIN)/gox-v1.0.1 "github.com/mitchellh/gox"

-HUGO := $(GOBIN)/hugo-v0.87.0
+HUGO := $(GOBIN)/hugo-v0.88.1
 $(HUGO): $(BINGO_DIR)/hugo.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/hugo-v0.87.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.87.0 "github.com/gohugoio/hugo"
+	@echo "(re)installing $(GOBIN)/hugo-v0.88.1"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.88.1 "github.com/gohugoio/hugo"

 MUTAGEN := $(GOBIN)/mutagen-v0.11.8
 $(MUTAGEN): $(BINGO_DIR)/mutagen.mod
@@ -77,45 +77,45 @@ $(MUTAGEN): $(BINGO_DIR)/mutagen.mod
 	@echo "(re)installing $(GOBIN)/mutagen-v0.11.8"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mutagen.mod -o=$(GOBIN)/mutagen-v0.11.8 "github.com/mutagen-io/mutagen/cmd/mutagen"

-OAPI_CODEGEN := $(GOBIN)/oapi-codegen-v1.6.1
+OAPI_CODEGEN := $(GOBIN)/oapi-codegen-v1.8.2
 $(OAPI_CODEGEN): $(BINGO_DIR)/oapi-codegen.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/oapi-codegen-v1.6.1"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=oapi-codegen.mod -o=$(GOBIN)/oapi-codegen-v1.6.1 "github.com/deepmap/oapi-codegen/cmd/oapi-codegen"
+	@echo "(re)installing $(GOBIN)/oapi-codegen-v1.8.2"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=oapi-codegen.mod -o=$(GOBIN)/oapi-codegen-v1.8.2 "github.com/deepmap/oapi-codegen/cmd/oapi-codegen"

-PROTOC_GEN_DOC := $(GOBIN)/protoc-gen-doc-v1.4.1
+PROTOC_GEN_DOC := $(GOBIN)/protoc-gen-doc-v1.5.0
 $(PROTOC_GEN_DOC): $(BINGO_DIR)/protoc-gen-doc.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/protoc-gen-doc-v1.4.1"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-doc.mod -o=$(GOBIN)/protoc-gen-doc-v1.4.1 "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
+	@echo "(re)installing $(GOBIN)/protoc-gen-doc-v1.5.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-doc.mod -o=$(GOBIN)/protoc-gen-doc-v1.5.0 "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"

-PROTOC_GEN_GO := $(GOBIN)/protoc-gen-go-v1.26.0
+PROTOC_GEN_GO := $(GOBIN)/protoc-gen-go-v1.27.1
 $(PROTOC_GEN_GO): $(BINGO_DIR)/protoc-gen-go.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/protoc-gen-go-v1.26.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-go.mod -o=$(GOBIN)/protoc-gen-go-v1.26.0 "google.golang.org/protobuf/cmd/protoc-gen-go"
+	@echo "(re)installing $(GOBIN)/protoc-gen-go-v1.27.1"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-go.mod -o=$(GOBIN)/protoc-gen-go-v1.27.1 "google.golang.org/protobuf/cmd/protoc-gen-go"

-PROTOC_GEN_MICRO := $(GOBIN)/protoc-gen-micro-v3.0.0-20210329103359-9b41d1bf0888
+PROTOC_GEN_MICRO := $(GOBIN)/protoc-gen-micro-v3.0.0-20210924081004-8c39b1e1204d
 $(PROTOC_GEN_MICRO): $(BINGO_DIR)/protoc-gen-micro.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/protoc-gen-micro-v3.0.0-20210329103359-9b41d1bf0888"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-micro.mod -o=$(GOBIN)/protoc-gen-micro-v3.0.0-20210329103359-9b41d1bf0888 "github.com/asim/go-micro/cmd/protoc-gen-micro/v3"
+	@echo "(re)installing $(GOBIN)/protoc-gen-micro-v3.0.0-20210924081004-8c39b1e1204d"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-micro.mod -o=$(GOBIN)/protoc-gen-micro-v3.0.0-20210924081004-8c39b1e1204d "github.com/asim/go-micro/cmd/protoc-gen-micro/v3"

-PROTOC_GEN_MICROWEB := $(GOBIN)/protoc-gen-microweb-v0.0.0-20210224131655-d9b1137a84d4
+PROTOC_GEN_MICROWEB := $(GOBIN)/protoc-gen-microweb-v0.0.0-20210824101557-828409dbfbf9
 $(PROTOC_GEN_MICROWEB): $(BINGO_DIR)/protoc-gen-microweb.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/protoc-gen-microweb-v0.0.0-20210224131655-d9b1137a84d4"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-microweb.mod -o=$(GOBIN)/protoc-gen-microweb-v0.0.0-20210224131655-d9b1137a84d4 "github.com/owncloud/protoc-gen-microweb"
+	@echo "(re)installing $(GOBIN)/protoc-gen-microweb-v0.0.0-20210824101557-828409dbfbf9"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-microweb.mod -o=$(GOBIN)/protoc-gen-microweb-v0.0.0-20210824101557-828409dbfbf9 "github.com/owncloud/protoc-gen-microweb"

-PROTOC_GEN_OPENAPIV2 := $(GOBIN)/protoc-gen-openapiv2-v2.3.0
+PROTOC_GEN_OPENAPIV2 := $(GOBIN)/protoc-gen-openapiv2-v2.6.0
 $(PROTOC_GEN_OPENAPIV2): $(BINGO_DIR)/protoc-gen-openapiv2.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/protoc-gen-openapiv2-v2.3.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-openapiv2.mod -o=$(GOBIN)/protoc-gen-openapiv2-v2.3.0 "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2"
+	@echo "(re)installing $(GOBIN)/protoc-gen-openapiv2-v2.6.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=protoc-gen-openapiv2.mod -o=$(GOBIN)/protoc-gen-openapiv2-v2.6.0 "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2"

-REFLEX := $(GOBIN)/reflex-v0.3.0
+REFLEX := $(GOBIN)/reflex-v0.3.1
 $(REFLEX): $(BINGO_DIR)/reflex.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/reflex-v0.3.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=reflex.mod -o=$(GOBIN)/reflex-v0.3.0 "github.com/cespare/reflex"
+	@echo "(re)installing $(GOBIN)/reflex-v0.3.1"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=reflex.mod -o=$(GOBIN)/reflex-v0.3.1 "github.com/cespare/reflex"

--- a/.bingo/bingo.mod
+++ b/.bingo/bingo.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/bwplotka/bingo v0.4.0
+require github.com/bwplotka/bingo v0.5.1
--- a/.bingo/buf.mod
+++ b/.bingo/buf.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/bufbuild/buf v0.40.0 // cmd/buf
+require github.com/bufbuild/buf v0.56.0 // cmd/buf
--- a/.bingo/buildifier.mod
+++ b/.bingo/buildifier.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/bazelbuild/buildtools v0.0.0-20210227132407-f2aed9ee205d // buildifier
+require github.com/bazelbuild/buildtools v0.0.0-20210920153738-d6daef01a1a2 // buildifier
--- a/.bingo/golangci-lint.mod
+++ b/.bingo/golangci-lint.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/golangci/golangci-lint v1.37.1 // cmd/golangci-lint
+require github.com/golangci/golangci-lint v1.42.1 // cmd/golangci-lint
--- a/.bingo/hugo.mod
+++ b/.bingo/hugo.mod
@@ -4,4 +4,4 @@ go 1.16

 replace github.com/markbates/inflect => github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6

-require github.com/gohugoio/hugo v0.87.0
+require github.com/gohugoio/hugo v0.88.1
--- a/.bingo/oapi-codegen.mod
+++ b/.bingo/oapi-codegen.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.15

-require github.com/deepmap/oapi-codegen v1.6.1 // cmd/oapi-codegen
+require github.com/deepmap/oapi-codegen v1.8.2 // cmd/oapi-codegen
--- a/.bingo/protoc-gen-doc.mod
+++ b/.bingo/protoc-gen-doc.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/pseudomuto/protoc-gen-doc v1.4.1 // cmd/protoc-gen-doc
+require github.com/pseudomuto/protoc-gen-doc v1.5.0 // cmd/protoc-gen-doc
--- a/.bingo/protoc-gen-go.mod
+++ b/.bingo/protoc-gen-go.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require google.golang.org/protobuf v1.26.0 // cmd/protoc-gen-go
+require google.golang.org/protobuf v1.27.1 // cmd/protoc-gen-go
--- a/.bingo/protoc-gen-micro.mod
+++ b/.bingo/protoc-gen-micro.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/asim/go-micro/cmd/protoc-gen-micro/v3 v3.0.0-20210329103359-9b41d1bf0888
+require github.com/asim/go-micro/cmd/protoc-gen-micro/v3 v3.0.0-20210924081004-8c39b1e1204d
--- a/.bingo/protoc-gen-microweb.mod
+++ b/.bingo/protoc-gen-microweb.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/owncloud/protoc-gen-microweb v0.0.0-20210224131655-d9b1137a84d4
+require github.com/owncloud/protoc-gen-microweb v0.0.0-20210824101557-828409dbfbf9
--- a/.bingo/protoc-gen-openapiv2.mod
+++ b/.bingo/protoc-gen-openapiv2.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0 // protoc-gen-openapiv2
+require github.com/grpc-ecosystem/grpc-gateway/v2 v2.6.0 // protoc-gen-openapiv2
--- a/.bingo/reflex.mod
+++ b/.bingo/reflex.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

 go 1.16

-require github.com/cespare/reflex v0.3.0
+require github.com/cespare/reflex v0.3.1
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.4.0. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
 GOBIN=${GOBIN:=$(go env GOBIN)}
@@ -8,11 +8,11 @@ if [ -z "$GOBIN" ]; then
 fi


-BINGO="${GOBIN}/bingo-v0.4.0"
+BINGO="${GOBIN}/bingo-v0.5.1"

-BUF="${GOBIN}/buf-v0.40.0"
+BUF="${GOBIN}/buf-v0.56.0"

-BUILDIFIER="${GOBIN}/buildifier-v0.0.0-20210227132407-f2aed9ee205d"
+BUILDIFIER="${GOBIN}/buildifier-v0.0.0-20210920153738-d6daef01a1a2"

 CALENS="${GOBIN}/calens-v0.2.0"

@@ -20,25 +20,25 @@ FILEB0X="${GOBIN}/fileb0x-v1.1.4"

 FLAEX="${GOBIN}/flaex-v0.2.1-0.20210701123229-9d7dceed124f"

-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.37.1"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.42.1"

 GOX="${GOBIN}/gox-v1.0.1"

-HUGO="${GOBIN}/hugo-v0.87.0"
+HUGO="${GOBIN}/hugo-v0.88.1"

 MUTAGEN="${GOBIN}/mutagen-v0.11.8"

-OAPI_CODEGEN="${GOBIN}/oapi-codegen-v1.6.1"
+OAPI_CODEGEN="${GOBIN}/oapi-codegen-v1.8.2"

-PROTOC_GEN_DOC="${GOBIN}/protoc-gen-doc-v1.4.1"
+PROTOC_GEN_DOC="${GOBIN}/protoc-gen-doc-v1.5.0"

-PROTOC_GEN_GO="${GOBIN}/protoc-gen-go-v1.26.0"
+PROTOC_GEN_GO="${GOBIN}/protoc-gen-go-v1.27.1"

-PROTOC_GEN_MICRO="${GOBIN}/protoc-gen-micro-v3.0.0-20210329103359-9b41d1bf0888"
+PROTOC_GEN_MICRO="${GOBIN}/protoc-gen-micro-v3.0.0-20210924081004-8c39b1e1204d"

-PROTOC_GEN_MICROWEB="${GOBIN}/protoc-gen-microweb-v0.0.0-20210224131655-d9b1137a84d4"
+PROTOC_GEN_MICROWEB="${GOBIN}/protoc-gen-microweb-v0.0.0-20210824101557-828409dbfbf9"

-PROTOC_GEN_OPENAPIV2="${GOBIN}/protoc-gen-openapiv2-v2.3.0"
+PROTOC_GEN_OPENAPIV2="${GOBIN}/protoc-gen-openapiv2-v2.6.0"

-REFLEX="${GOBIN}/reflex-v0.3.0"
+REFLEX="${GOBIN}/reflex-v0.3.1"

--- a/.codacy.yml
+++ b/.codacy.yml
@@ -16,5 +16,6 @@ exclude_paths:
  - 'ocis/docker/eos-ocis-dev/Dockerfile'
  - 'deployments/**'
  - 'tests/acceptance/expected-failures-*.md'
+  - 'tests/acceptance/features/bootstrap/**'

 ...
--- a/.drone.env
+++ b/.drone.env
@@ -1,7 +1,7 @@
 # The test runner source for API tests
-CORE_COMMITID=bafc216216471439b15a1cfbeffcf612406177ce
+CORE_COMMITID=af211e517ac4771d9a318b2a5c8682237a3718a1
 CORE_BRANCH=master

 # The test runner source for UI tests
-WEB_COMMITID=c778edabc0fd8ecba4067ad136d4f3b26bb5e1af
+WEB_COMMITID=76036fd83dbd3a787db8321114e88d81d04cf63f
 WEB_BRANCH=master
--- a/.drone.star
+++ b/.drone.star
@@ -9,7 +9,6 @@ config = {
        "ocis-pkg",
        "ocis",
        "ocs",
-        "onlyoffice",
        "proxy",
        "settings",
        "storage",
@@ -150,7 +149,7 @@ def main(ctx):
    elif (ctx.build.event == "pull_request" and "[docs-only]" in ctx.build.title) or \
         (ctx.build.event != "pull_request" and "[docs-only]" in (ctx.build.title + ctx.build.message)):
        # [docs-only] is not taken from PR messages, but from commit messages
-        pipelines = [docs(ctx)]
+        pipelines = [docs(ctx), changelog(ctx)]

    else:
        test_pipelines.append(
@@ -1620,6 +1619,7 @@ def example_deploys(ctx):
        "ocis_wopi/latest.yml",
        "ocis_hello/latest.yml",
        "ocis_s3/latest.yml",
+        "oc10_ocis_parallel/latest.yml",
    ]
    released_configs = [
        "cs3_users_ocis/released.yml",
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,4 @@
-/accounts/ @kulmann @pascalwengerter 
-/onlyoffice/ @kulmann @pascalwengerter 
-/settings/ @kulmann @pascalwengerter 
-/web/ @kulmann @pascalwengerter 
+accounts/ @kulmann @pascalwengerter @paulcod3
+settings/ @kulmann @pascalwengerter @paulcod3
+web/ @kulmann @pascalwengerter 
 .drone.star @wkloucek @micbar @phil-davis @individual-it
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,12 +18,6 @@ updates:
      interval: "weekly"
    open-pull-requests-limit: 2

-  - package-ecosystem: "npm"
-    directory: "/onlyoffice"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 2
-
  - package-ecosystem: "npm"
    directory: "/idp"
    schedule:
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -23,6 +23,18 @@ labels:
  - name: OCIS-Fastlane
    color: "#deadbf"
    description: Planned outside of the sprint
+  - name: Storage:EOS
+    color: "#3F7A62"
+  - name: Storage:S3NG
+    color: "#3F7A62"
+  - name: Storage:CephFS
+    color: "#3F7A62"
+  - name: Storage:OCIS
+    color: "#3F7A62"
+  - name: Storage:POSIX
+    color: "#3F7A62"
+  - name: Storage:ownCloudSQL
+    color: "#3F7A62"
  
 teams:
  - name: ci
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,258 @@

 The following sections list the changes for unreleased.

-[unreleased]: https://github.com/owncloud/ocis/compare/v1.10.0...master
+[unreleased]: https://github.com/owncloud/ocis/compare/v1.12.0...master
+
+## Summary
+
+* Bugfix - Use proper url path decode on the username: [#2511](https://github.com/owncloud/ocis/pull/2511)
+* Bugfix - Remove notifications placeholder: [#2514](https://github.com/owncloud/ocis/pull/2514)
+* Change - Make the drives create method odata compliant: [#2531](https://github.com/owncloud/ocis/pull/2531)
+* Enhancement - Add maximum files and size to archiver capabilities: [#2544](https://github.com/owncloud/ocis/pull/2544)
+* Enhancement - Expose the reva archiver in OCIS: [#2509](https://github.com/owncloud/ocis/pull/2509)
+* Enhancement - Add option to skip generation of demo users and groups: [#2495](https://github.com/owncloud/ocis/pull/2495)
+* Enhancement - Allow overriding the cookie based route by claim: [#2508](https://github.com/owncloud/ocis/pull/2508)
+* Enhancement - Redirect invalid links to oC Web: [#2493](https://github.com/owncloud/ocis/pull/2493)
+* Enhancement - Use reva's Authenticate method instead of spawning token managers: [#2528](https://github.com/owncloud/ocis/pull/2528)
+* Enhancement - TLS config options for ldap in reva: [#2492](https://github.com/owncloud/ocis/pull/2492)
+* Enhancement - Set reva JWT token expiration time to 24 hours by default: [#2527](https://github.com/owncloud/ocis/pull/2527)
+
+## Details
+
+* Bugfix - Use proper url path decode on the username: [#2511](https://github.com/owncloud/ocis/pull/2511)
+
+   We now properly decode the username when reading it from a url parameter
+
+   https://github.com/owncloud/ocis/pull/2511
+
+* Bugfix - Remove notifications placeholder: [#2514](https://github.com/owncloud/ocis/pull/2514)
+
+   Since Reva was communicating its notification capabilities incorrectly, oCIS relied on a
+   hardcoded string to overwrite them. This has been fixed in
+   [reva#1819](https://github.com/cs3org/reva/pull/1819) so we now removed the hardcoded
+   string and don't modify Reva's notification capabilities anymore in order to fix clients
+   having to poll a (non-existent) notifications endpoint.
+
+   https://github.com/owncloud/ocis/pull/2514
+
+* Change - Make the drives create method odata compliant: [#2531](https://github.com/owncloud/ocis/pull/2531)
+
+   When creating a space on the graph API we now use the POST Body to provide the parameters.
+
+   https://github.com/owncloud/ocis/pull/2531
+   https://www.odata.org/getting-started/basic-tutorial/#modifyData
+
+* Enhancement - Add maximum files and size to archiver capabilities: [#2544](https://github.com/owncloud/ocis/pull/2544)
+
+   We added the maximum files count and maximum archive size of the archiver to the capabilities
+   endpoint. Clients can use this to generate warnings before the actual archive creation fails.
+
+   https://github.com/owncloud/ocis/issues/2537
+   https://github.com/owncloud/ocis/pull/2544
+   https://github.com/cs3org/reva/pull/2105
+
+* Enhancement - Expose the reva archiver in OCIS: [#2509](https://github.com/owncloud/ocis/pull/2509)
+
+   The reva archiver can now be accessed through the storage frontend service
+
+   https://github.com/owncloud/ocis/pull/2509
+
+* Enhancement - Add option to skip generation of demo users and groups: [#2495](https://github.com/owncloud/ocis/pull/2495)
+
+   We've added a new environment variable to decide whether we should generate the demo users and
+   groups or not. This environment variable is set to `true` by default, so the demo users and
+   groups will get generated by default as long as oCIS is in its "technical preview" stage.
+
+   In any case, there are still some users and groups automatically generated: for users: Reva
+   IOP, Kopano IDP, admin; for groups: sysusers and users.
+
+   https://github.com/owncloud/ocis/pull/2495
+
+* Enhancement - Allow overriding the cookie based route by claim: [#2508](https://github.com/owncloud/ocis/pull/2508)
+
+   When determining the routing policy we now let the claim override the cookie so that users are
+   routed to the correct backend after login.
+
+   https://github.com/owncloud/ocis/pull/2508
+
+* Enhancement - Redirect invalid links to oC Web: [#2493](https://github.com/owncloud/ocis/pull/2493)
+
+   Invalid links (eg. https://foo.bar/index.php/apps/pdfviewer) will be redirect to
+   ownCloud Web instead of displaying a blank page with a "not found" message.
+
+   https://github.com/owncloud/ocis/pull/2493
+   https://github.com/owncloud/ocis/pull/2512
+
+* Enhancement - Use reva's Authenticate method instead of spawning token managers: [#2528](https://github.com/owncloud/ocis/pull/2528)
+
+   When using the CS3 proxy backend, we previously obtained the user from reva's userprovider
+   service and minted the token ourselves. This required maintaining a shared JWT secret between
+   ocis and reva, as well duplication of logic. This PR delegates this logic by using the
+   `Authenticate` method provided by the reva gateway service to obtain this token, making it an
+   arbitrary, indestructible entry. Currently, the changes have been made to the proxy service
+   but will be extended to others as well.
+
+   https://github.com/owncloud/ocis/pull/2528
+
+* Enhancement - TLS config options for ldap in reva: [#2492](https://github.com/owncloud/ocis/pull/2492)
+
+   We added the new config options "ldap-cacert" and "ldap-insecure" to the auth-, users- and
+   groups-provider services to be able to do proper TLS configuration for the LDAP clients.
+   "ldap-cacert" is by default configured to add the bundled glauth LDAP servers certificate to
+   the trusted set for the LDAP clients. "ldap-insecure" is set to "false" by default and can be
+   used to disable certificate checks (only advisable for development and test enviroments).
+
+   https://github.com/owncloud/ocis/pull/2492
+
+* Enhancement - Set reva JWT token expiration time to 24 hours by default: [#2527](https://github.com/owncloud/ocis/pull/2527)
+
+   https://github.com/owncloud/ocis/pull/2527
+# Changelog for [1.12.0] (2021-09-14)
+
+The following sections list the changes for 1.12.0.
+
+[1.12.0]: https://github.com/owncloud/ocis/compare/v1.11.0...v1.12.0
+
+## Summary
+
+* Bugfix - Remove non working proxy route and fix cs3 users example: [#2474](https://github.com/owncloud/ocis/pull/2474)
+* Bugfix - Set English as default language in the dropdown in the settings page: [#2465](https://github.com/owncloud/ocis/pull/2465)
+* Change - Remove OnlyOffice extension: [#2433](https://github.com/owncloud/ocis/pull/2433)
+* Change - Remove OnlyOffice extension: [#2433](https://github.com/owncloud/ocis/pull/2433)
+* Change - Update ownCloud Web to v4.2.0: [#2501](https://github.com/owncloud/ocis/pull/2501)
+* Enhancement - Add app provider and app provider registry: [#2204](https://github.com/owncloud/ocis/pull/2204)
+* Enhancement - Add the create space permission: [#2461](https://github.com/owncloud/ocis/pull/2461)
+* Enhancement - Add set space quota permission: [#2459](https://github.com/owncloud/ocis/pull/2459)
+* Enhancement - Create a Space using the Graph API: [#2471](https://github.com/owncloud/ocis/pull/2471)
+* Enhancement - Update go-chi/chi to version 5.0.3: [#2429](https://github.com/owncloud/ocis/pull/2429)
+* Enhancement - Upgrade go micro to v3.6.0: [#2451](https://github.com/owncloud/ocis/pull/2451)
+* Enhancement - Update reva to v1.13.0: [#2477](https://github.com/owncloud/ocis/pull/2477)
+
+## Details
+
+* Bugfix - Remove non working proxy route and fix cs3 users example: [#2474](https://github.com/owncloud/ocis/pull/2474)
+
+   We removed a non working route from the proxy default configuration and fixed the cs3 users
+   deployment example since it still used the accounts service. It now only uses the configured
+   LDAP.
+
+   https://github.com/owncloud/ocis/pull/2474
+
+* Bugfix - Set English as default language in the dropdown in the settings page: [#2465](https://github.com/owncloud/ocis/pull/2465)
+
+   The language dropdown didn't have a default language selected, and it was showing an empty
+   value. Now it shows English instead.
+
+   https://github.com/owncloud/ocis/pull/2465
+
+* Change - Remove OnlyOffice extension: [#2433](https://github.com/owncloud/ocis/pull/2433)
+
+   Tags: OnlyOffice
+
+   We've removed the OnlyOffice extension in oCIS. OnlyOffice has their own web extension for
+   OC10 backend now with [a dedicated
+   guide](https://owncloud.dev/clients/web/deployments/oc10-app/#onlyoffice). In
+   oCIS, we will follow up with a guide on how to start a WOPI server providing OnlyOffice soon.
+
+   https://github.com/owncloud/ocis/pull/2433
+
+* Change - Remove OnlyOffice extension: [#2433](https://github.com/owncloud/ocis/pull/2433)
+
+   Tags: OnlyOffice
+
+   We've removed the OnlyOffice extension in oCIS. OnlyOffice has their own web extension for
+   OC10 backend now with [a dedicated
+   guide](https://owncloud.dev/clients/web/deployments/oc10-app/#onlyoffice). In
+   oCIS, we will follow up with a guide on how to start a WOPI server providing OnlyOffice soon.
+
+   https://github.com/owncloud/ocis/pull/2433
+
+* Change - Update ownCloud Web to v4.2.0: [#2501](https://github.com/owncloud/ocis/pull/2501)
+
+   Tags: web
+
+   We updated ownCloud Web to v4.2.0. Please refer to the changelog (linked) for details on the web
+   release.
+
+   https://github.com/owncloud/ocis/pull/2501
+   https://github.com/owncloud/web/releases/tag/v4.2.0
+
+* Enhancement - Add app provider and app provider registry: [#2204](https://github.com/owncloud/ocis/pull/2204)
+
+   We added the app provider and app provider registry. Now the CS3org WOPI server can be
+   registered and OpenInApp requests can be done.
+
+   https://github.com/owncloud/ocis/pull/2204
+   https://github.com/cs3org/reva/pull/1785
+
+* Enhancement - Add the create space permission: [#2461](https://github.com/owncloud/ocis/pull/2461)
+
+   In preparation for the upcoming spaces features a `Create Space` permission was added.
+
+   https://github.com/owncloud/ocis/pull/2461
+
+* Enhancement - Add set space quota permission: [#2459](https://github.com/owncloud/ocis/pull/2459)
+
+   In preparation for the upcoming spaces features a `SetSpaceQuota` permission was added.
+
+   https://github.com/owncloud/ocis/pull/2459
+
+* Enhancement - Create a Space using the Graph API: [#2471](https://github.com/owncloud/ocis/pull/2471)
+
+   Spaces can now be created on `POST /drives/{drive-name}`. Only users with the `create-space`
+   permissions can perform this operation.
+
+   Allowed body form values are:
+
+   - `quota` (bytes) maximum amount of bytes stored in the space. - `maxQuotaFiles` (integer)
+   maximum amount of files supported by the space.
+
+   https://github.com/owncloud/ocis/pull/2471
+
+* Enhancement - Update go-chi/chi to version 5.0.3: [#2429](https://github.com/owncloud/ocis/pull/2429)
+
+   Updated go-chi/chi to the latest release
+
+   https://github.com/owncloud/ocis/pull/2429
+
+* Enhancement - Upgrade go micro to v3.6.0: [#2451](https://github.com/owncloud/ocis/pull/2451)
+
+   Go micro and all go micro plugins are now on v3.6.0
+
+   https://github.com/owncloud/ocis/pull/2451
+
+* Enhancement - Update reva to v1.13.0: [#2477](https://github.com/owncloud/ocis/pull/2477)
+
+   This update includes:
+
+  * Bugfix [cs3org/reva#2054](https://github.com/cs3org/reva/pull/2054): Fix the response after deleting a share
+  * Bugfix [cs3org/reva#2026](https://github.com/cs3org/reva/pull/2026): Fix moving of a shared file
+  * Bugfix [cs3org/reva#1605](https://github.com/cs3org/reva/pull/1605): Allow to expose full paths in OCS API
+  * Bugfix [cs3org/reva#2033](https://github.com/cs3org/reva/pull/2033): Fix the storage id of shares
+  * Bugfix [cs3org/reva#1991](https://github.com/cs3org/reva/pull/1991): Remove share references when declining shares
+  * Enhancement [cs3org/reva#1994](https://github.com/cs3org/reva/pull/1994): Add owncloudsql driver for the userprovider
+  * Enhancement [cs3org/reva#2065](https://github.com/cs3org/reva/pull/2065): New sharing role Manager
+  * Enhancement [cs3org/reva#2015](https://github.com/cs3org/reva/pull/2015): Add spaces to the list of capabilities
+  * Enhancement [cs3org/reva#2041](https://github.com/cs3org/reva/pull/2041): Create operations for Spaces
+  * Enhancement [cs3org/reva#2029](https://github.com/cs3org/reva/pull/2029): Tracing agent configuration
+
+   https://github.com/owncloud/ocis/pull/2477
+# Changelog for [1.11.0] (2021-08-24)
+
+The following sections list the changes for 1.11.0.
+
+[1.11.0]: https://github.com/owncloud/ocis/compare/v1.10.0...v1.11.0

 ## Summary

 * Bugfix - Specify primary user type for all accounts: [#2364](https://github.com/owncloud/ocis/pull/2364)
 * Bugfix - Fix naming of the user- and groupprovider services: [#2388](https://github.com/owncloud/ocis/pull/2388)
+* Change - Update ownCloud Web to v4.1.0: [#2426](https://github.com/owncloud/ocis/pull/2426)
 * Enhancement - Use non root user for the owncloud/ocis docker image: [#2380](https://github.com/owncloud/ocis/pull/2380)
 * Enhancement - Replace unmaintained jwt library: [#2386](https://github.com/owncloud/ocis/pull/2386)
 * Enhancement - Update bleve to version 2.1.0: [#2391](https://github.com/owncloud/ocis/pull/2391)
 * Enhancement - Update github.com/coreos/go-oidc to v3.0.0: [#2393](https://github.com/owncloud/ocis/pull/2393)
+* Enhancement - Update reva to v1.12: [#2423](https://github.com/owncloud/ocis/pull/2423)

 ## Details

@@ -26,6 +268,16 @@ The following sections list the changes for unreleased.

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

+* Change - Update ownCloud Web to v4.1.0: [#2426](https://github.com/owncloud/ocis/pull/2426)
+
+   Tags: web
+
+   We updated ownCloud Web to v4.1.0. Please refer to the changelog (linked) for details on the web
+   release.
+
+   https://github.com/owncloud/ocis/pull/2426
+   https://github.com/owncloud/web/releases/tag/v4.1.0
+
 * Enhancement - Use non root user for the owncloud/ocis docker image: [#2380](https://github.com/owncloud/ocis/pull/2380)

   The owncloud/ocis docker image now uses a non root user and enables you to set a different user
@@ -57,6 +309,28 @@ The following sections list the changes for unreleased.
   Updated the github.com/coreos/go-oidc library to the version 3.0.0.

   https://github.com/owncloud/ocis/pull/2393
+
+* Enhancement - Update reva to v1.12: [#2423](https://github.com/owncloud/ocis/pull/2423)
+
+  * Enhancement cs3org/reva#1803: Introduce new webdav spaces endpoint
+  * Bugfix cs3org/reva#1819: Disable notifications
+  * Enhancement cs3org/reva#1861: Add support for runtime plugins
+  * Bugfix cs3org/reva#1913: Logic to restore files to readonly nodes
+  * Enhancement cs3org/reva#1946: Add share manager that connects to oc10 databases
+  * Bugfix cs3org/reva#1954: Fix response format of the sharees API
+  * Bugfix cs3org/reva#1956: Fix trashbin listing with depth 0
+  * Bugfix cs3org/reva#1957: Fix etag propagation on deletes
+  * Bugfix cs3org/reva#1960: Return the updated share after updating
+  * Bugfix cs3org/reva#1965 cs3org/reva#1967: Fix the file target of user and group shares
+  * Bugfix cs3org/reva#1980: Propagate the etag after restoring a file version
+  * Enhancement cs3org/reva#1984: Replace OpenCensus with OpenTelemetry
+  * Bugfix cs3org/reva#1985: Add quota stubs
+  * Bugfix cs3org/reva#1987: Fix windows build
+  * Bugfix cs3org/reva#1990: Increase oc10 compatibility of owncloudsql
+  * Bugfix cs3org/reva#1992: Check if symlink exists instead of spamming the console
+  * Bugfix cs3org/reva#1993: fix owncloudsql GetMD
+
+   https://github.com/owncloud/ocis/pull/2423
 # Changelog for [1.10.0] (2021-08-06)

 The following sections list the changes for 1.10.0.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,7 +44,7 @@ We also have a [Rocket Chat Server](https://talk.owncloud.com/channel/ocis) to a

 ### ownCloud is hosted on Github

-To effectivly contribute to ownCloud Infinite Scale, you need a Github account. You can get that for free at [Github](https://github.com/join). You can find howtos on the internet, for example [here](https://www.wikihow.com/Create-an-Account-on-GitHub).
+To effectively contribute to ownCloud Infinite Scale, you need a Github account. You can get that for free at [Github](https://github.com/join). You can find howtos on the internet, for example [here](https://www.wikihow.com/Create-an-Account-on-GitHub).

 For other ways of contributing, for example with translations, other systems require you to have an account as well, for example [Transifex](https://www.transifex.com).

--- a/3
+++ b/3
@@ -24,7 +24,6 @@ OCIS_MODULES = \
 	ocis \
 	ocis-pkg \
 	ocs \
-	onlyoffice \
 	proxy \
 	settings \
 	storage \
@@ -33,7 +32,7 @@ OCIS_MODULES = \
 	web \
 	webdav

-ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI
+ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include .bingo/Variables.mk
 endif

--- a/accounts/Makefile
+++ b/accounts/Makefile
@@ -7,7 +7,7 @@ test-acceptance-webui:


 ############ tooling ############
-ifneq (, $(shell which go 2> /dev/null)) # supress `command not found warnings` for non go targets in CI
+ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
 include ../.bingo/Variables.mk
 endif

@@ -32,7 +32,7 @@ include ../.make/generate.mk

 .PHONY: ci-go-generate
 ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
-	@go generate $(GENERATE)
+	@go generate ./...

 .PHONY: ci-node-generate
 ci-node-generate: yarn-build
--- a/accounts/l10n/translations.json
+++ b/accounts/l10n/translations.json
--- a/accounts/package.json
+++ b/accounts/package.json
@@ -17,10 +17,10 @@
    "watch": "rollup -c -w",
    "test": "echo 'Not implemented'",
    "generate-api": "node node_modules/swagger-vue-generator/bin/generate-api.js --package-version v0 --source pkg/proto/v0/accounts.swagger.json --moduleName accounts --destination ui/client/accounts/index.js",
-    "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format node_modules/cucumber-pretty -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
+    "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
  },
  "devDependencies": {
-    "@babel/core": "^7.14.0",
+    "@babel/core": "^7.15.5",
    "@babel/plugin-proposal-class-properties": "^7.13.0",
    "@babel/plugin-proposal-export-default-from": "^7.7.4",
    "@babel/plugin-proposal-object-rest-spread": "^7.7.7",
@@ -29,16 +29,16 @@
    "@babel/polyfill": "^7.10.1",
    "@babel/preset-env": "^7.13.12",
    "@babel/register": "^7.14.5",
+    "@cucumber/cucumber": "^7.3.1",
+    "@cucumber/pretty-formatter": "^1.0.0-alpha.1",
    "@erquhart/rollup-plugin-node-builtins": "^2.1.5",
    "@rollup/plugin-commonjs": "^17.1.0",
    "@rollup/plugin-json": "^4.0.1",
    "@rollup/plugin-replace": "^2.3.0",
    "archiver": "^5.3.0",
-    "axios": "^0.21.1",
-    "core-js": "3",
+    "axios": "^0.21.4",
+    "core-js": "^3.17.3",
    "cross-env": "^7.0.3",
-    "cucumber": "^6.0.5",
-    "cucumber-pretty": ">=6.0.0",
    "debounce": "^1.2.1",
    "easygettext": "^2.17.0",
    "eslint": "7.24.0",
@@ -51,8 +51,8 @@
    "fs-extra": "^9.0.1",
    "join-path": "^1.1.1",
    "ldapjs": "^2.2.3",
-    "nightwatch": "^1.6.0",
-    "nightwatch-api": "^3.0.1",
+    "nightwatch": "1.5.1",
+    "nightwatch-api": "3.0.2",
    "nightwatch-vrt": "^0.2.10",
    "node-fetch": "^2.6.1",
    "qs": "^6.10.1",
@@ -76,7 +76,7 @@
    "not dead"
  ],
  "peerDependencies": {
-    "owncloud-design-system": "^7.4.2"
+    "owncloud-design-system": "^9.3.0"
  },
  "dependencies": {
    "validator": "^13.1.1"
--- a/accounts/pkg/assets/embed.go
+++ b/accounts/pkg/assets/embed.go
--- a/accounts/pkg/command/add_account.go
+++ b/accounts/pkg/command/add_account.go
@@ -4,10 +4,10 @@ import (
 	"fmt"

 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )

 // AddAccount command creates a new account
--- a/accounts/pkg/command/inspect_account.go
+++ b/accounts/pkg/command/inspect_account.go
@@ -6,11 +6,11 @@ import (
 	"strconv"

 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )

 // InspectAccount command shows detailed information about a specific account.
--- a/accounts/pkg/command/list_accounts.go
+++ b/accounts/pkg/command/list_accounts.go
@@ -6,11 +6,11 @@ import (
 	"strconv"

 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )

 // ListAccounts command lists all accounts
--- a/accounts/pkg/command/rebuild_index.go
+++ b/accounts/pkg/command/rebuild_index.go
@@ -6,9 +6,9 @@ import (

 	"github.com/asim/go-micro/plugins/client/grpc/v3"
 	merrors "github.com/asim/go-micro/v3/errors"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	index "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )

 // RebuildIndex rebuilds the entire configured index.
--- a/accounts/pkg/command/remove_account.go
+++ b/accounts/pkg/command/remove_account.go
@@ -5,10 +5,10 @@ import (
 	"os"

 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )

 // RemoveAccount command deletes an existing account.
--- a/accounts/pkg/command/root.go
+++ b/accounts/pkg/command/root.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"

-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	"github.com/owncloud/ocis/accounts/pkg/version"
@@ -14,6 +13,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )

 var (
--- a/accounts/pkg/command/server.go
+++ b/accounts/pkg/command/server.go
@@ -6,7 +6,6 @@ import (

 	"github.com/owncloud/ocis/ocis-pkg/sync"

-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/accounts/pkg/server/http"
 	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/accounts/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )

 // Server is the entry point for the server command.
@@ -40,7 +40,7 @@ func Server(cfg *config.Config) *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
-			err := tracing.Configure(cfg, logger)
+			err := tracing.Configure(cfg)
 			if err != nil {
 				return err
 			}
--- a/accounts/pkg/command/update_account.go
+++ b/accounts/pkg/command/update_account.go
@@ -5,10 +5,10 @@ import (
 	"fmt"

 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 	"google.golang.org/genproto/protobuf/field_mask"
 )

--- a/accounts/pkg/command/version.go
+++ b/accounts/pkg/command/version.go
@@ -6,10 +6,10 @@ import (

 	"github.com/owncloud/ocis/ocis-pkg/registry"

-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )

 // PrintVersion prints the service versions of all running instances.
--- a/accounts/pkg/config/config.go
+++ b/accounts/pkg/config/config.go
@@ -42,9 +42,10 @@ type GRPC struct {

 // Server configures a server.
 type Server struct {
-	Version        string
-	Name           string
-	HashDifficulty int
+	Version            string
+	Name               string
+	HashDifficulty     int
+	DemoUsersAndGroups bool
 }

 // Asset defines the available asset configuration.
--- a/accounts/pkg/flagset/flagset.go
+++ b/accounts/pkg/flagset/flagset.go
@@ -1,10 +1,10 @@
 package flagset

 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
+	"github.com/urfave/cli/v2"
 )

 // RootWithConfig applies cfg to the root flagset
@@ -47,28 +47,28 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		&cli.BoolFlag{
 			Name:        "tracing-enabled",
 			Usage:       "Enable sending traces",
-			EnvVars:     []string{"ACCOUNTS_TRACING_ENABLED"},
+			EnvVars:     []string{"ACCOUNTS_TRACING_ENABLED", "OCIS_TRACING_ENABLED"},
 			Destination: &cfg.Tracing.Enabled,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-type",
 			Value:       flags.OverrideDefaultString(cfg.Tracing.Type, "jaeger"),
 			Usage:       "Tracing backend type",
-			EnvVars:     []string{"ACCOUNTS_TRACING_TYPE"},
+			EnvVars:     []string{"ACCOUNTS_TRACING_TYPE", "OCIS_TRACING_TYPE"},
 			Destination: &cfg.Tracing.Type,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-endpoint",
 			Value:       flags.OverrideDefaultString(cfg.Tracing.Endpoint, ""),
 			Usage:       "Endpoint for the agent",
-			EnvVars:     []string{"ACCOUNTS_TRACING_ENDPOINT"},
+			EnvVars:     []string{"ACCOUNTS_TRACING_ENDPOINT", "OCIS_TRACING_ENDPOINT"},
 			Destination: &cfg.Tracing.Endpoint,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-collector",
 			Value:       flags.OverrideDefaultString(cfg.Tracing.Collector, ""),
 			Usage:       "Endpoint for the collector",
-			EnvVars:     []string{"ACCOUNTS_TRACING_COLLECTOR"},
+			EnvVars:     []string{"ACCOUNTS_TRACING_COLLECTOR", "OCIS_TRACING_COLLECTOR"},
 			Destination: &cfg.Tracing.Collector,
 		},
 		&cli.StringFlag{
@@ -134,6 +134,13 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"ACCOUNTS_HASH_DIFFICULTY"},
 			Destination: &cfg.Server.HashDifficulty,
 		},
+		&cli.BoolFlag{
+			Name:        "demo-users-and-groups",
+			Value:       flags.OverrideDefaultBool(cfg.Server.DemoUsersAndGroups, true),
+			Usage:       "Enable demo users and groups",
+			EnvVars:     []string{"ACCOUNTS_DEMO_USERS_AND_GROUPS"},
+			Destination: &cfg.Server.DemoUsersAndGroups,
+		},
 		&cli.StringFlag{
 			Name:        "asset-path",
 			Value:       flags.OverrideDefaultString(cfg.Asset.Path, ""),
--- a/accounts/pkg/proto/v0/accounts.mock.go
+++ b/accounts/pkg/proto/v0/accounts.mock.go
@@ -9,7 +9,7 @@ import (

 // MockAccountsService can be used to write tests
 /*
-To creata a mock overwrite the functions of an instance like this:
+To create a mock overwrite the functions of an instance like this:

 ```go
 func mockAccSvc(retErr bool) proto.AccountsService {
--- a/accounts/pkg/proto/v0/accounts.pb.go
+++ b/accounts/pkg/proto/v0/accounts.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.26.0
-// 	protoc        v3.15.2
+// 	protoc-gen-go v1.27.1
+// 	protoc        v3.17.3
 // source: accounts.proto

 package proto
@@ -457,7 +457,7 @@ func (x *DeleteAccountRequest) GetId() string {
 	return ""
 }

-// Account follows the properties of the ms graph api user resuorce.
+// Account follows the properties of the ms graph api user resource.
 // See https://docs.microsoft.com/en-us/graph/api/resources/user?view=graph-rest-1.0#properties
 type Account struct {
 	state         protoimpl.MessageState
--- a/accounts/pkg/proto/v0/accounts.pb.micro.go
+++ b/accounts/pkg/proto/v0/accounts.pb.micro.go
@@ -5,12 +5,12 @@ package proto

 import (
 	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
 	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "github.com/golang/protobuf/ptypes/timestamp"
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	_ "google.golang.org/genproto/protobuf/field_mask"
+	proto "google.golang.org/protobuf/proto"
 	math "math"
 )

@@ -26,12 +26,6 @@ var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf

-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
 // Reference imports to suppress errors if they are not otherwise used.
 var _ api.Endpoint
 var _ context.Context
@@ -42,35 +36,35 @@ var _ server.Option

 func NewAccountsServiceEndpoints() []*api.Endpoint {
 	return []*api.Endpoint{
-		&api.Endpoint{
+		{
 			Name:    "AccountsService.ListAccounts",
 			Path:    []string{"/api/v0/accounts/accounts-list"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "AccountsService.GetAccount",
 			Path:    []string{"/api/v0/accounts/accounts-get"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "AccountsService.CreateAccount",
 			Path:    []string{"/api/v0/accounts/accounts-create"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "AccountsService.UpdateAccount",
 			Path:    []string{"/api/v0/accounts/accounts-update"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "AccountsService.DeleteAccount",
 			Path:    []string{"/api/v0/accounts/accounts-delete"},
 			Method:  []string{"POST"},
@@ -250,56 +244,56 @@ func (h *accountsServiceHandler) DeleteAccount(ctx context.Context, in *DeleteAc

 func NewGroupsServiceEndpoints() []*api.Endpoint {
 	return []*api.Endpoint{
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.ListGroups",
 			Path:    []string{"/api/v0/accounts/groups-list"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.GetGroup",
 			Path:    []string{"/api/v0/accounts/groups-get"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.CreateGroup",
 			Path:    []string{"/api/v0/accounts/groups-create"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.UpdateGroup",
 			Path:    []string{"/api/v0/accounts/groups-update"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.DeleteGroup",
 			Path:    []string{"/api/v0/accounts/groups-delete"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.AddMember",
 			Path:    []string{"/api/v0/groups/{group_id=*}/members/$ref"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.RemoveMember",
 			Path:    []string{"/api/v0/groups/{group_id=*}/members/{account_id}/$ref"},
 			Method:  []string{"POST"},
 			Body:    "*",
 			Handler: "rpc",
 		},
-		&api.Endpoint{
+		{
 			Name:    "GroupsService.ListMembers",
 			Path:    []string{"/api/v0/groups/{id=*}/members/$ref"},
 			Method:  []string{"POST"},
@@ -557,7 +551,7 @@ func (h *groupsServiceHandler) ListMembers(ctx context.Context, in *ListMembersR

 func NewIndexServiceEndpoints() []*api.Endpoint {
 	return []*api.Endpoint{
-		&api.Endpoint{
+		{
 			Name:    "IndexService.RebuildIndex",
 			Path:    []string{"/api/v0/index/rebuild"},
 			Method:  []string{"POST"},
--- a/accounts/pkg/proto/v0/accounts.pb.micro_test.go
+++ b/accounts/pkg/proto/v0/accounts.pb.micro_test.go
@@ -81,6 +81,7 @@ func init() {

 	cfg := config.New()
 	cfg.Repo.Disk.Path = dataPath
+	cfg.Server.DemoUsersAndGroups = true
 	var hdlr *svc.Service
 	var err error

@@ -616,7 +617,7 @@ func TestUpdateNonUpdatableFieldsInAccount(t *testing.T) {
 				errMsg := fmt.Sprintf("can not update field %s, either unknown or readonly", tt.updateMask[0])
 				assert.Equal(t, errMsg, e.Detail)
 			} else {
-				t.Fatal("Expected merror errors but found something else.")
+				t.Fatal("Expected merrors errors but found something else.")
 			}
 		})
 	}
--- a/accounts/pkg/proto/v0/accounts.pb.web.go
+++ b/accounts/pkg/proto/v0/accounts.pb.web.go
@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	"net/http"

-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/render"
 	"github.com/golang/protobuf/jsonpb"

--- a/accounts/pkg/proto/v0/accounts.proto
+++ b/accounts/pkg/proto/v0/accounts.proto
@@ -247,7 +247,7 @@ message DeleteAccountRequest {
    string id = 1;
 }

-// Account follows the properties of the ms graph api user resuorce.
+// Account follows the properties of the ms graph api user resource.
 // See https://docs.microsoft.com/en-us/graph/api/resources/user?view=graph-rest-1.0#properties
 message Account {

@@ -383,7 +383,7 @@ message Account {
    repeated OnPremisesProvisioningError on_premises_provisioning_errors = 29;

    // TODO do we need to sync uidnumber and gidnumber from the external ldap? we may assign different numbers so eos has a non colliding namespace.
-    // we can sync them to the (uid|gid)_number fileds but what if they changed in the external ldap and now collide?
+    // we can sync them to the (uid|gid)_number fields but what if they changed in the external ldap and now collide?
    // move those properties to a posixaccount message so we can exchange that part with an external (readonly or writeable) ldap server?

    // For an external user invited to the tenant using the invitation API, this property represents the invited user's invitation status.
--- a/accounts/pkg/proto/v0/accounts.swagger.json
+++ b/accounts/pkg/proto/v0/accounts.swagger.json
@@ -396,7 +396,13 @@
            "in": "body",
            "required": true,
            "schema": {
-              "$ref": "#/definitions/v0AddMemberRequest"
+              "type": "object",
+              "properties": {
+                "accountId": {
+                  "type": "string",
+                  "title": "The account id to add"
+                }
+              }
            }
          }
        ],
@@ -443,7 +449,7 @@
            "in": "body",
            "required": true,
            "schema": {
-              "$ref": "#/definitions/v0RemoveMemberRequest"
+              "type": "object"
            }
          }
        ],
@@ -483,7 +489,26 @@
            "in": "body",
            "required": true,
            "schema": {
-              "$ref": "#/definitions/v0ListMembersRequest"
+              "type": "object",
+              "properties": {
+                "pageSize": {
+                  "type": "integer",
+                  "format": "int32"
+                },
+                "pageToken": {
+                  "type": "string",
+                  "title": "Optional. A pagination token returned from a previous call to `Get`\nthat indicates from where search should continue"
+                },
+                "fieldMask": {
+                  "type": "string",
+                  "description": "Optional. Used to specify a subset of fields that should be\nreturned by a get operation or modified by an update operation."
+                },
+                "query": {
+                  "type": "string",
+                  "description": "TODO update query language\nQuery expressions can be used to restrict results based upon\nthe account properties where the operators `=`, `NOT`, `AND` and `OR`\ncan be used along with the suffix wildcard symbol `*`.\n\nThe string properties in a query expression should use escaped quotes\nfor values that include whitespace to prevent unexpected behavior.\n\nSome example queries are:\n\n* Query `display_name=Th*` returns accounts whose display_name\nstarts with \"Th\"\n* Query `display_name=\\\\\"Test String\\\\\"` returns groups with\ndisplay names that include both \"Test\" and \"String\"",
+                  "title": "Optional. Search criteria used to select the groups to return.\nIf no search criteria is specified then all groups will be\nreturned"
+                }
+              }
            }
          }
        ],
@@ -529,14 +554,11 @@
    "protobufAny": {
      "type": "object",
      "properties": {
-        "typeUrl": {
+        "@type": {
          "type": "string"
-        },
-        "value": {
-          "type": "string",
-          "format": "byte"
        }
-      }
+      },
+      "additionalProperties": {}
    },
    "rpcStatus": {
      "type": "object",
@@ -689,20 +711,7 @@
          "description": "Any refresh tokens or sessions tokens (session cookies) issued before this time are invalid, and applications will get\nan error when using an invalid refresh or sessions token to acquire a delegated access token (to access APIs such as Microsoft Graph).\nIf this happens, the application will need to acquire a new refresh token by making a request to the authorize endpoint.\nRead-only. Use revokeSignInSessions to reset."
        }
      },
-      "title": "Account follows the properties of the ms graph api user resuorce.\nSee https://docs.microsoft.com/en-us/graph/api/resources/user?view=graph-rest-1.0#properties"
-    },
-    "v0AddMemberRequest": {
-      "type": "object",
-      "properties": {
-        "groupId": {
-          "type": "string",
-          "title": "The id of the group to add a member to"
-        },
-        "accountId": {
-          "type": "string",
-          "title": "The account id to add"
-        }
-      }
+      "title": "Account follows the properties of the ms graph api user resource.\nSee https://docs.microsoft.com/en-us/graph/api/resources/user?view=graph-rest-1.0#properties"
    },
    "v0CreateAccountRequest": {
      "type": "object",
@@ -948,32 +957,6 @@
        }
      }
    },
-    "v0ListMembersRequest": {
-      "type": "object",
-      "properties": {
-        "pageSize": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "pageToken": {
-          "type": "string",
-          "title": "Optional. A pagination token returned from a previous call to `Get`\nthat indicates from where search should continue"
-        },
-        "fieldMask": {
-          "type": "string",
-          "description": "Optional. Used to specify a subset of fields that should be\nreturned by a get operation or modified by an update operation."
-        },
-        "query": {
-          "type": "string",
-          "description": "TODO update query language\nQuery expressions can be used to restrict results based upon\nthe account properties where the operators `=`, `NOT`, `AND` and `OR`\ncan be used along with the suffix wildcard symbol `*`.\n\nThe string properties in a query expression should use escaped quotes\nfor values that include whitespace to prevent unexpected behavior.\n\nSome example queries are:\n\n* Query `display_name=Th*` returns accounts whose display_name\nstarts with \"Th\"\n* Query `display_name=\\\\\"Test String\\\\\"` returns groups with\ndisplay names that include both \"Test\" and \"String\"",
-          "title": "Optional. Search criteria used to select the groups to return.\nIf no search criteria is specified then all groups will be\nreturned"
-        },
-        "id": {
-          "type": "string",
-          "title": "The id of the group to list members from"
-        }
-      }
-    },
    "v0ListMembersResponse": {
      "type": "object",
      "properties": {
@@ -1047,19 +1030,6 @@
    "v0RebuildIndexResponse": {
      "type": "object"
    },
-    "v0RemoveMemberRequest": {
-      "type": "object",
-      "properties": {
-        "groupId": {
-          "type": "string",
-          "title": "The id of the group to remove a member from"
-        },
-        "accountId": {
-          "type": "string",
-          "title": "The account id to remove"
-        }
-      }
-    },
    "v0UpdateAccountRequest": {
      "type": "object",
      "properties": {
--- a/accounts/pkg/server/grpc/option.go
+++ b/accounts/pkg/server/grpc/option.go
@@ -3,11 +3,11 @@ package grpc
 import (
 	"context"

-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/metrics"
 	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )

 // Option defines a single option function.
--- a/accounts/pkg/server/http/option.go
+++ b/accounts/pkg/server/http/option.go
@@ -3,11 +3,11 @@ package http
 import (
 	"context"

-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/metrics"
 	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )

 // Option defines a single option function.
--- a/accounts/pkg/server/http/server.go
+++ b/accounts/pkg/server/http/server.go
@@ -2,8 +2,8 @@ package http

 import (
 	"github.com/asim/go-micro/v3"
-	"github.com/go-chi/chi"
-	chimiddleware "github.com/go-chi/chi/middleware"
+	"github.com/go-chi/chi/v5"
+	chimiddleware "github.com/go-chi/chi/v5/middleware"
 	"github.com/owncloud/ocis/accounts/pkg/assets"
 	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/accounts/pkg/version"
@@ -31,6 +31,7 @@ func Server(opts ...Option) http.Service {

 	mux.Use(chimiddleware.RealIP)
 	mux.Use(chimiddleware.RequestID)
+	mux.Use(middleware.TraceContext)
 	mux.Use(middleware.NoCache)
 	mux.Use(middleware.Cors)
 	mux.Use(middleware.Secure)
--- a/accounts/pkg/service/v0/accounts.go
+++ b/accounts/pkg/service/v0/accounts.go
@@ -12,10 +12,9 @@ import (
 	"strconv"
 	"time"

-	"github.com/owncloud/ocis/ocis-pkg/sync"
-	"golang.org/x/crypto/bcrypt"
+	"go.opentelemetry.io/otel/trace"

-	"github.com/owncloud/ocis/ocis-pkg/log"
+	"go.opentelemetry.io/otel/attribute"

 	merrors "github.com/asim/go-micro/v3/errors"
 	"github.com/asim/go-micro/v3/metadata"
@@ -24,11 +23,15 @@ import (
 	fieldmask_utils "github.com/mennanov/fieldmask-utils"
 	"github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/accounts/pkg/storage"
+	accTracing "github.com/owncloud/ocis/accounts/pkg/tracing"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/roles"
+	"github.com/owncloud/ocis/ocis-pkg/sync"
 	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
 	settings_svc "github.com/owncloud/ocis/settings/pkg/service/v0"
 	"github.com/rs/zerolog"
+	"golang.org/x/crypto/bcrypt"
 	"google.golang.org/genproto/protobuf/field_mask"
 	p "google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -124,6 +127,15 @@ func (s Service) getInMemoryServiceUser() proto.Account {
 // ListAccounts implements the AccountsServiceHandler interface
 // the query contains account properties
 func (s Service) ListAccounts(ctx context.Context, in *proto.ListAccountsRequest, out *proto.ListAccountsResponse) (err error) {
+	var span trace.Span
+	ctx, span = accTracing.TraceProvider.Tracer("accounts").Start(ctx, "Accounts.ListAccounts")
+	defer span.End()
+
+	span.SetAttributes(
+		attribute.KeyValue{Key: "page_size", Value: attribute.Int64Value(int64(in.PageSize))},
+		attribute.KeyValue{Key: "page_token", Value: attribute.StringValue(in.PageToken)},
+	)
+
 	hasSelf := s.hasSelfManagementPermissions(ctx)
 	hasManagement := s.hasAccountManagementPermissions(ctx)
 	if !hasSelf && !hasManagement {
@@ -269,6 +281,15 @@ func (s Service) findAccountsByQuery(ctx context.Context, query string) ([]strin

 // GetAccount implements the AccountsServiceHandler interface
 func (s Service) GetAccount(ctx context.Context, in *proto.GetAccountRequest, out *proto.Account) (err error) {
+	var span trace.Span
+
+	ctx, span = accTracing.TraceProvider.Tracer("accounts").Start(ctx, "Accounts.GetAccount")
+	defer span.End()
+
+	span.SetAttributes(
+		attribute.KeyValue{Key: "account_id", Value: attribute.StringValue(in.Id)},
+	)
+
 	hasSelf := s.hasSelfManagementPermissions(ctx)
 	hasManagement := s.hasAccountManagementPermissions(ctx)
 	if !hasSelf && !hasManagement {
@@ -317,6 +338,15 @@ func (s Service) GetAccount(ctx context.Context, in *proto.GetAccountRequest, ou

 // CreateAccount implements the AccountsServiceHandler interface
 func (s Service) CreateAccount(ctx context.Context, in *proto.CreateAccountRequest, out *proto.Account) (err error) {
+	var span trace.Span
+
+	ctx, span = accTracing.TraceProvider.Tracer("accounts").Start(ctx, "Accounts.CreateAccount")
+	defer span.End()
+
+	span.SetAttributes(
+		attribute.KeyValue{Key: "account", Value: attribute.StringValue(in.Account.String())},
+	)
+
 	if !s.hasAccountManagementPermissions(ctx) {
 		return merrors.Forbidden(s.id, "no permission for CreateAccount")
 	}
@@ -449,6 +479,15 @@ func (s Service) rollbackCreateAccount(ctx context.Context, acc *proto.Account)
 // read only fields are ignored
 // TODO how can we unset specific values? using the update mask
 func (s Service) UpdateAccount(ctx context.Context, in *proto.UpdateAccountRequest, out *proto.Account) (err error) {
+	var span trace.Span
+
+	ctx, span = accTracing.TraceProvider.Tracer("accounts").Start(ctx, "Accounts.UpdateAccount")
+	defer span.End()
+
+	span.SetAttributes(
+		attribute.KeyValue{Key: "account", Value: attribute.StringValue(in.Account.String())},
+	)
+
 	hasSelf := s.hasSelfManagementPermissions(ctx)
 	hasManagement := s.hasAccountManagementPermissions(ctx)
 	if !hasSelf && !hasManagement {
@@ -586,7 +625,7 @@ func (s Service) UpdateAccount(ctx context.Context, in *proto.UpdateAccountReque
 	return
 }

-// whitelist of all paths/fields which can be updated by users themself
+// whitelist of all paths/fields which can be updated by users themselves
 var selfUpdatableAccountPaths = map[string]struct{}{
 	"DisplayName":              {},
 	"Description":              {},
@@ -615,6 +654,11 @@ var updatableAccountPaths = map[string]struct{}{

 // DeleteAccount implements the AccountsServiceHandler interface
 func (s Service) DeleteAccount(ctx context.Context, in *proto.DeleteAccountRequest, out *empty.Empty) (err error) {
+	var span trace.Span
+
+	ctx, span = accTracing.TraceProvider.Tracer("accounts").Start(ctx, "Accounts.DeleteAccount")
+	defer span.End()
+
 	if !s.hasAccountManagementPermissions(ctx) {
 		return merrors.Forbidden(s.id, "no permission for DeleteAccount")
 	}
@@ -697,7 +741,7 @@ func validateAccountEmail(serviceID string, a *proto.Account) error {
 	return nil
 }

-// We want to allow email addresses as usernames so they show up when using them in ACLs on storages that allow intergration with our glauth LDAP service
+// We want to allow email addresses as usernames so they show up when using them in ACLs on storages that allow integration with our glauth LDAP service
 // so we are adding a few restrictions from https://stackoverflow.com/questions/6949667/what-are-the-real-rules-for-linux-usernames-on-centos-6-and-rhel-6
 // names should not start with numbers
 var usernameRegex = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]*(@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)*$")
--- a/accounts/pkg/service/v0/groups.go
+++ b/accounts/pkg/service/v0/groups.go
@@ -270,7 +270,7 @@ func (s Service) AddMember(c context.Context, in *proto.AddMemberRequest, out *p
 			break
 		}
 	}
-	// only store the reference to prevent recurision when marshaling json
+	// only store the reference to prevent recursion when marshaling json
 	gref := &proto.Group{
 		Id: g.Id,
 	}
--- a/accounts/pkg/service/v0/service.go
+++ b/accounts/pkg/service/v0/service.go
@@ -73,11 +73,11 @@ func New(opts ...Option) (s *Service, err error) {
 		return nil, err
 	}

-	if err = s.createDefaultAccounts(); err != nil {
+	if err = s.createDefaultAccounts(cfg.Server.DemoUsersAndGroups); err != nil {
 		return nil, err
 	}

-	if err = s.createDefaultGroups(); err != nil {
+	if err = s.createDefaultGroups(cfg.Server.DemoUsersAndGroups); err != nil {
 		return nil, err
 	}
 	return
@@ -152,7 +152,7 @@ func configFromSvc(cfg *config.Config) (*idxcfg.Config, error) {
 	return c, nil
 }

-func (s Service) createDefaultAccounts() (err error) {
+func (s Service) createDefaultAccounts(withDemoAccounts bool) (err error) {
 	accounts := []proto.Account{
 		{
 			Id:                       "4c510ada-c86b-4815-8820-42cdf82c3d51",
@@ -278,8 +278,19 @@ func (s Service) createDefaultAccounts() (err error) {
 			},
 		},
 	}
+
+	mustHaveAccounts := map[string]bool{
+		"bc596f3c-c955-4328-80a0-60d018b4ad57": true, // Reva IOP
+		"820ba2a1-3f54-4538-80a4-2d73007e30bf": true, // Kopano IDP
+		"ddc2004c-0977-11eb-9d3f-a793888cd0f8": true, // admin
+	}
+
 	// this only deals with the metadata service.
 	for i := range accounts {
+		if !withDemoAccounts && !mustHaveAccounts[accounts[i].Id] {
+			continue
+		}
+
 		a := &proto.Account{}
 		err := s.repo.LoadAccount(context.Background(), accounts[i].Id, a)
 		if !storage.IsNotFoundErr(err) {
@@ -323,7 +334,7 @@ func (s Service) createDefaultAccounts() (err error) {
 	return nil
 }

-func (s Service) createDefaultGroups() (err error) {
+func (s Service) createDefaultGroups(withDemoGroups bool) (err error) {
 	groups := []proto.Group{
 		{Id: "34f38767-c937-4eb6-b847-1c175829a2a0", GidNumber: 15000, OnPremisesSamAccountName: "sysusers", DisplayName: "Technical users", Description: "A group for technical users. They should not show up in sharing dialogs.", Members: []*proto.Account{
 			{Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf"}, // idp
@@ -358,7 +369,17 @@ func (s Service) createDefaultGroups() (err error) {
 			{Id: "932b4540-8d16-481e-8ef4-588e4b6b151c"}, // feynman
 		}},
 	}
+
+	mustHaveGroups := map[string]bool{
+		"34f38767-c937-4eb6-b847-1c175829a2a0": true, // sysusers
+		"509a9dcd-bb37-4f4f-a01a-19dca27d9cfa": true, // users
+	}
+
 	for i := range groups {
+		if !withDemoGroups && !mustHaveGroups[groups[i].Id] {
+			continue
+		}
+
 		g := &proto.Group{}
 		err := s.repo.LoadGroup(context.Background(), groups[i].Id, g)
 		if !storage.IsNotFoundErr(err) {
--- a/accounts/pkg/service/v0/tracing.go
+++ b/accounts/pkg/service/v0/tracing.go
@@ -1,76 +0,0 @@
-package service
-
-import (
-	"context"
-
-	"github.com/golang/protobuf/ptypes/empty"
-	v0proto "github.com/owncloud/ocis/accounts/pkg/proto/v0"
-	"go.opencensus.io/trace"
-)
-
-// NewTracing returns a service that instruments traces.
-func NewTracing(next v0proto.AccountsServiceHandler) v0proto.AccountsServiceHandler {
-	return tracing{
-		next: next,
-	}
-}
-
-type tracing struct {
-	next v0proto.AccountsServiceHandler
-}
-
-func (t tracing) ListAccounts(ctx context.Context, req *v0proto.ListAccountsRequest, rsp *v0proto.ListAccountsResponse) error {
-	ctx, span := trace.StartSpan(ctx, "Accounts.ListAccounts")
-	defer span.End()
-
-	span.Annotate([]trace.Attribute{
-		trace.Int64Attribute("page_size", int64(req.PageSize)),
-		trace.StringAttribute("page_token", req.PageToken),
-		trace.StringAttribute("field_mask", req.FieldMask.String()),
-	}, "Execute Accounts.ListAccount handler")
-
-	return t.next.ListAccounts(ctx, req, rsp)
-}
-
-func (t tracing) GetAccount(ctx context.Context, req *v0proto.GetAccountRequest, acc *v0proto.Account) error {
-	ctx, span := trace.StartSpan(ctx, "Accounts.GetAccount")
-	defer span.End()
-
-	span.Annotate([]trace.Attribute{
-		trace.StringAttribute("id", req.Id),
-	}, "Execute Accounts.GetAccount handler")
-
-	return t.next.GetAccount(ctx, req, acc)
-}
-
-func (t tracing) CreateAccount(ctx context.Context, req *v0proto.CreateAccountRequest, acc *v0proto.Account) error {
-	ctx, span := trace.StartSpan(ctx, "Accounts.CreateAccount")
-	defer span.End()
-
-	span.Annotate([]trace.Attribute{
-		trace.StringAttribute("account", req.Account.String()),
-	}, "Execute Accounts.CreateAccount handler")
-
-	return t.next.CreateAccount(ctx, req, acc)
-}
-
-func (t tracing) UpdateAccount(ctx context.Context, req *v0proto.UpdateAccountRequest, acc *v0proto.Account) error {
-	ctx, span := trace.StartSpan(ctx, "Accounts.UpdateAccount")
-	defer span.End()
-
-	span.Annotate([]trace.Attribute{
-		trace.StringAttribute("account", req.Account.String()),
-	}, "Execute Accounts.UpdateAccount handler")
-
-	return t.next.UpdateAccount(ctx, req, acc)
-}
-
-func (t tracing) DeleteAccount(ctx context.Context, req *v0proto.DeleteAccountRequest, e *empty.Empty) error {
-	ctx, span := trace.StartSpan(ctx, "Accounts.DeleteAccount")
-	defer span.End()
-
-	span.Annotate([]trace.Attribute{
-		trace.StringAttribute("id", req.Id),
-	}, "Execute Accounts.DeleteAccout handler")
-	return t.next.DeleteAccount(ctx, req, e)
-}
--- a/accounts/pkg/tracing/tracing.go
+++ b/accounts/pkg/tracing/tracing.go
@@ -1,90 +1,23 @@
 package tracing

 import (
-	"time"
-
-	"contrib.go.opencensus.io/exporter/jaeger"
-	"contrib.go.opencensus.io/exporter/ocagent"
-	"contrib.go.opencensus.io/exporter/zipkin"
-	openzipkin "github.com/openzipkin/zipkin-go"
-	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
 	"github.com/owncloud/ocis/accounts/pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/log"
-	"go.opencensus.io/stats/view"
-	"go.opencensus.io/trace"
+	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
+	"go.opentelemetry.io/otel/trace"
 )

-func Configure(cfg *config.Config, logger log.Logger) error {
+var (
+	// TraceProvider is the global trace provider for the proxy service.
+	TraceProvider = trace.NewNoopTracerProvider()
+)
+
+func Configure(cfg *config.Config) error {
+	var err error
 	if cfg.Tracing.Enabled {
-		switch t := cfg.Tracing.Type; t {
-		case "agent":
-			exporter, err := ocagent.NewExporter(
-				ocagent.WithReconnectionPeriod(5*time.Second),
-				ocagent.WithAddress(cfg.Tracing.Endpoint),
-				ocagent.WithServiceName(cfg.Tracing.Service),
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create agent tracing")
-				return err
-			}
-			trace.RegisterExporter(exporter)
-			view.RegisterExporter(exporter)
-		case "jaeger":
-			exporter, err := jaeger.NewExporter(
-				jaeger.Options{
-					AgentEndpoint:     cfg.Tracing.Endpoint,
-					CollectorEndpoint: cfg.Tracing.Collector,
-					Process: jaeger.Process{
-						ServiceName: cfg.Tracing.Service,
-					},
-				},
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create jaeger tracing")
-				return err
-			}
-			trace.RegisterExporter(exporter)
-		case "zipkin":
-			endpoint, err := openzipkin.NewEndpoint(
-				cfg.Tracing.Service,
-				cfg.Tracing.Endpoint,
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create zipkin tracing")
-				return err
-			}
-			exporter := zipkin.NewExporter(
-				zipkinhttp.NewReporter(
-					cfg.Tracing.Collector,
-				),
-				endpoint,
-			)
-			trace.RegisterExporter(exporter)
-		default:
-			logger.Warn().
-				Str("type", t).
-				Msg("Unknown tracing backend")
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "accounts", cfg.Tracing.Type); err != nil {
+			return err
 		}
-		trace.ApplyConfig(
-			trace.Config{
-				DefaultSampler: trace.AlwaysSample(),
-			},
-		)
-	} else {
-		logger.Debug().
-			Msg("Tracing is not enabled")
 	}
+
 	return nil
 }
--- a/accounts/templates/CONFIGURATION.tmpl
+++ b/accounts/templates/CONFIGURATION.tmpl
@@ -45,9 +45,9 @@ If you prefer to configure the service with environment variables you can see th

 If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given.

-### Commandline flags
+### Command-line flags

-If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
+If you prefer to configure the service with command-line flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.

 {{ $options := .Options -}}
 {{ range $com := .Commands }}{{ with (list $options $com) -}}
--- a/accounts/ui/helpers/utils.js
+++ b/accounts/ui/helpers/utils.js
@@ -1,5 +1,5 @@
 /**
- * Asserts wheter the given object is empty
+ * Asserts whether the given object is empty
 * @param {Object} obj Object to be checked
 * @returns {Boolean}
 */
--- a/accounts/ui/tests/acceptance/stepDefinitions/accountsContext.js
+++ b/accounts/ui/tests/acceptance/stepDefinitions/accountsContext.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
 const { client } = require('nightwatch-api')
-const { Given, When, Then } = require('cucumber')
+const { Given, When, Then } = require('@cucumber/cucumber')

 When('the user browses to the accounts page', function () {
  return client.page.accountsPage().navigateAndWaitUntilMounted()
--- a/accounts/yarn.lock
+++ b/accounts/yarn.lock
--- a/changelog/1.11.0_2021-08-24/accounts-user-type.md
+++ b/changelog/1.11.0_2021-08-24/accounts-user-type.md
--- a/changelog/1.11.0_2021-08-24/docker-image-non-root-user.md
+++ b/changelog/1.11.0_2021-08-24/docker-image-non-root-user.md
--- a/changelog/1.11.0_2021-08-24/switch-jwt-lib.md
+++ b/changelog/1.11.0_2021-08-24/switch-jwt-lib.md
--- a/changelog/1.11.0_2021-08-24/update-bleve.md
+++ b/changelog/1.11.0_2021-08-24/update-bleve.md
--- a/changelog/1.11.0_2021-08-24/update-go-oidc.md
+++ b/changelog/1.11.0_2021-08-24/update-go-oidc.md
--- a/changelog/1.11.0_2021-08-24/update-reva.md
+++ b/changelog/1.11.0_2021-08-24/update-reva.md
@@ -0,0 +1,22 @@
+Enhancement: Update reva to v1.12
+
+* Enhancement cs3org/reva#1803: Introduce new webdav spaces endpoint
+* Bugfix cs3org/reva#1819: Disable notifications
+* Enhancement cs3org/reva#1861: Add support for runtime plugins
+* Bugfix cs3org/reva#1913: Logic to restore files to readonly nodes
+* Enhancement cs3org/reva#1946: Add share manager that connects to oc10 databases
+* Bugfix cs3org/reva#1954: Fix response format of the sharees API
+* Bugfix cs3org/reva#1956: Fix trashbin listing with depth 0
+* Bugfix cs3org/reva#1957: Fix etag propagation on deletes
+* Bugfix cs3org/reva#1960: Return the updated share after updating
+* Bugfix cs3org/reva#1965 cs3org/reva#1967: Fix the file target of user and group shares
+* Bugfix cs3org/reva#1980: Propagate the etag after restoring a file version
+* Enhancement cs3org/reva#1984: Replace OpenCensus with OpenTelemetry
+* Bugfix cs3org/reva#1985: Add quota stubs
+* Bugfix cs3org/reva#1987: Fix windows build
+* Bugfix cs3org/reva#1990: Increase oc10 compatibility of owncloudsql
+* Bugfix cs3org/reva#1992: Check if symlink exists instead of spamming the console
+* Bugfix cs3org/reva#1993: fix owncloudsql GetMD
+
+
+https://github.com/owncloud/ocis/pull/2423
--- a/changelog/1.11.0_2021-08-24/update-web-4.1.0.md
+++ b/changelog/1.11.0_2021-08-24/update-web-4.1.0.md
@@ -0,0 +1,8 @@
+Change: Update ownCloud Web to v4.1.0
+
+Tags: web
+
+We updated ownCloud Web to v4.1.0. Please refer to the changelog (linked) for details on the web release.
+
+https://github.com/owncloud/ocis/pull/2426
+https://github.com/owncloud/web/releases/tag/v4.1.0
--- a/changelog/1.11.0_2021-08-24/user-group-provider-naming.md
+++ b/changelog/1.11.0_2021-08-24/user-group-provider-naming.md
--- a/changelog/1.12.0_2021-09-14/app-provider.md
+++ b/changelog/1.12.0_2021-09-14/app-provider.md
@@ -0,0 +1,6 @@
+Enhancement: Add app provider and app provider registry
+
+We added the app provider and app provider registry. Now the CS3org WOPI server can be registered and OpenInApp requests can be done.
+
+https://github.com/owncloud/ocis/pull/2204
+https://github.com/cs3org/reva/pull/1785
--- a/changelog/1.12.0_2021-09-14/create-space-permission.md
+++ b/changelog/1.12.0_2021-09-14/create-space-permission.md
@@ -0,0 +1,5 @@
+Enhancement: add the create space permission
+
+In preparation for the upcoming spaces features a `Create Space` permission was added.
+
+https://github.com/owncloud/ocis/pull/2461
--- a/changelog/1.12.0_2021-09-14/remove-onlyoffice-extension
+++ b/changelog/1.12.0_2021-09-14/remove-onlyoffice-extension
@@ -0,0 +1,9 @@
+Change: Remove OnlyOffice extension
+
+Tags: OnlyOffice
+
+We've removed the OnlyOffice extension in oCIS. 
+OnlyOffice has their own web extension for OC10 backend now with [a dedicated guide](https://owncloud.dev/clients/web/deployments/oc10-app/#onlyoffice).
+In oCIS, we will follow up with a guide on how to start a WOPI server providing OnlyOffice soon.
+
+https://github.com/owncloud/ocis/pull/2433
--- a/changelog/1.12.0_2021-09-14/remove-onlyoffice-extension.md
+++ b/changelog/1.12.0_2021-09-14/remove-onlyoffice-extension.md
@@ -0,0 +1,9 @@
+Change: Remove OnlyOffice extension
+
+Tags: OnlyOffice
+
+We've removed the OnlyOffice extension in oCIS. 
+OnlyOffice has their own web extension for OC10 backend now with [a dedicated guide](https://owncloud.dev/clients/web/deployments/oc10-app/#onlyoffice).
+In oCIS, we will follow up with a guide on how to start a WOPI server providing OnlyOffice soon.
+
+https://github.com/owncloud/ocis/pull/2433
--- a/changelog/1.12.0_2021-09-14/remove-proxy-route-fix-cs3-example.md
+++ b/changelog/1.12.0_2021-09-14/remove-proxy-route-fix-cs3-example.md
@@ -0,0 +1,5 @@
+Bugfix: Remove non working proxy route and fix cs3 users example
+
+We removed a non working route from the proxy default configuration and fixed the cs3 users deployment example since it still used the accounts service. It now only uses the configured LDAP.
+
+https://github.com/owncloud/ocis/pull/2474
--- a/changelog/1.12.0_2021-09-14/set-english-default-dropdown.md
+++ b/changelog/1.12.0_2021-09-14/set-english-default-dropdown.md
@@ -0,0 +1,5 @@
+Bugfix: Set English as default language in the dropdown in the settings page
+
+The language dropdown didn't have a default language selected, and it was showing an empty value. Now it shows English instead.
+
+https://github.com/owncloud/ocis/pull/2465
--- a/changelog/1.12.0_2021-09-14/set-quota-permission.md
+++ b/changelog/1.12.0_2021-09-14/set-quota-permission.md
@@ -0,0 +1,5 @@
+Enhancement: add set space quota permission
+
+In preparation for the upcoming spaces features a `SetSpaceQuota` permission was added.
+
+https://github.com/owncloud/ocis/pull/2459
--- a/changelog/1.12.0_2021-09-14/spaces-post.md
+++ b/changelog/1.12.0_2021-09-14/spaces-post.md
@@ -0,0 +1,10 @@
+Enhancement: Create a Space using the Graph API
+
+Spaces can now be created on `POST /drives/{drive-name}`. Only users with the `create-space` permissions can perform this operation.
+
+Allowed body form values are:
+
+- `quota` (bytes) maximum amount of bytes stored in the space.
+- `maxQuotaFiles` (integer) maximum amount of files supported by the space.
+
+https://github.com/owncloud/ocis/pull/2471
--- a/changelog/1.12.0_2021-09-14/update-chi-v5.md
+++ b/changelog/1.12.0_2021-09-14/update-chi-v5.md
@@ -0,0 +1,5 @@
+Enhancement: Update go-chi/chi to version 5.0.3
+
+Updated go-chi/chi to the latest release
+
+https://github.com/owncloud/ocis/pull/2429
--- a/changelog/1.12.0_2021-09-14/update-go-micro.md
+++ b/changelog/1.12.0_2021-09-14/update-go-micro.md
@@ -0,0 +1,5 @@
+Enhancement: Upgrade go micro to v3.6.0
+
+Go micro and all go micro plugins are now on v3.6.0
+
+https://github.com/owncloud/ocis/pull/2451
--- a/changelog/1.12.0_2021-09-14/update-reva-to-1.13.0.md
+++ b/changelog/1.12.0_2021-09-14/update-reva-to-1.13.0.md
@@ -0,0 +1,16 @@
+Enhancement: Update reva to v1.13.0
+
+This update includes:
+
+* Bugfix [cs3org/reva#2054](https://github.com/cs3org/reva/pull/2054): Fix the response after deleting a share
+* Bugfix [cs3org/reva#2026](https://github.com/cs3org/reva/pull/2026): Fix moving of a shared file
+* Bugfix [cs3org/reva#1605](https://github.com/cs3org/reva/pull/1605): Allow to expose full paths in OCS API
+* Bugfix [cs3org/reva#2033](https://github.com/cs3org/reva/pull/2033): Fix the storage id of shares
+* Bugfix [cs3org/reva#1991](https://github.com/cs3org/reva/pull/1991): Remove share references when declining shares
+* Enhancement [cs3org/reva#1994](https://github.com/cs3org/reva/pull/1994): Add owncloudsql driver for the userprovider
+* Enhancement [cs3org/reva#2065](https://github.com/cs3org/reva/pull/2065): New sharing role Manager
+* Enhancement [cs3org/reva#2015](https://github.com/cs3org/reva/pull/2015): Add spaces to the list of capabilities
+* Enhancement [cs3org/reva#2041](https://github.com/cs3org/reva/pull/2041): Create operations for Spaces
+* Enhancement [cs3org/reva#2029](https://github.com/cs3org/reva/pull/2029): Tracing agent configuration
+
+https://github.com/owncloud/ocis/pull/2477
--- a/changelog/1.12.0_2021-09-14/update-web-4.2.0.md
+++ b/changelog/1.12.0_2021-09-14/update-web-4.2.0.md
@@ -0,0 +1,8 @@
+Change: Update ownCloud Web to v4.2.0
+
+Tags: web
+
+We updated ownCloud Web to v4.2.0. Please refer to the changelog (linked) for details on the web release.
+
+https://github.com/owncloud/ocis/pull/2501
+https://github.com/owncloud/web/releases/tag/v4.2.0
--- a/changelog/unreleased/archiver-capabilities-limits.md
+++ b/changelog/unreleased/archiver-capabilities-limits.md
@@ -0,0 +1,8 @@
+Enhancement: Add maximum files and size to archiver capabilities
+
+We added the maximum files count and maximum archive size of the archiver to the capabilities endpoint.
+Clients can use this to generate warnings before the actual archive creation fails.
+
+https://github.com/owncloud/ocis/pull/2544
+https://github.com/owncloud/ocis/issues/2537
+https://github.com/cs3org/reva/pull/2105
--- a/changelog/unreleased/create-spaces-odata.md
+++ b/changelog/unreleased/create-spaces-odata.md
@@ -0,0 +1,6 @@
+Change: Make the drives create method odata compliant
+
+When creating a space on the graph API we now use the POST Body to provide the parameters.
+
+https://github.com/owncloud/ocis/pull/2531
+https://www.odata.org/getting-started/basic-tutorial/#modifyData
--- a/changelog/unreleased/expose-reva-archiver.md
+++ b/changelog/unreleased/expose-reva-archiver.md
@@ -0,0 +1,5 @@
+Enhancement: Expose the reva archiver in OCIS
+
+The reva archiver can now be accessed through the storage frontend service
+
+https://github.com/owncloud/ocis/pull/2509
--- a/changelog/unreleased/fix-username-encoding.md
+++ b/changelog/unreleased/fix-username-encoding.md
@@ -0,0 +1,5 @@
+Bugfix: use proper url path decode on the username
+
+We now properly decode the username when reading it from a url parameter
+
+https://github.com/owncloud/ocis/pull/2511
--- a/changelog/unreleased/optional-skip-demo-users-creation.md
+++ b/changelog/unreleased/optional-skip-demo-users-creation.md
@@ -0,0 +1,8 @@
+Enhancement: Add option to skip generation of demo users and groups
+
+We've added a new environment variable to decide whether we should generate the demo users and groups or not. 
+This environment variable is set to `true` by default, so the demo users and groups will get generated by default as long as oCIS is in its "technical preview" stage.
+
+In any case, there are still some users and groups automatically generated: for users: Reva IOP, Kopano IDP, admin; for groups: sysusers and users.
+
+https://github.com/owncloud/ocis/pull/2495
--- a/changelog/unreleased/proxy-policy-claim-precedence.md
+++ b/changelog/unreleased/proxy-policy-claim-precedence.md
@@ -0,0 +1,5 @@
+Enhancement: allow overriding the cookie based route by claim
+
+When determining the routing policy we now let the claim override the cookie so that users are routed to the correct backend after login.
+
+https://github.com/owncloud/ocis/pull/2508
--- a/changelog/unreleased/redirect-invalid-links-to-oC-web.md
+++ b/changelog/unreleased/redirect-invalid-links-to-oC-web.md
@@ -0,0 +1,6 @@
+Enhancement: redirect invalid links to oC Web
+
+Invalid links (eg. https://foo.bar/index.php/apps/pdfviewer) will be redirect to ownCloud Web instead of displaying a blank page with a "not found" message.
+
+https://github.com/owncloud/ocis/pull/2493
+https://github.com/owncloud/ocis/pull/2512
--- a/changelog/unreleased/remove-notifications-placeholder.md
+++ b/changelog/unreleased/remove-notifications-placeholder.md
@@ -0,0 +1,7 @@
+Bugfix: Remove notifications placeholder
+
+Since Reva was communicating its notification capabilities incorrectly, oCIS relied on a hardcoded string to overwrite them.
+This has been fixed in [reva#1819](https://github.com/cs3org/reva/pull/1819) so we now removed the hardcoded string 
+and don't modify Reva's notification capabilities anymore in order to fix clients having to poll a (non-existent) notifications endpoint.
+
+https://github.com/owncloud/ocis/pull/2514
--- a/changelog/unreleased/reva-auth-tokens.md
+++ b/changelog/unreleased/reva-auth-tokens.md
@@ -0,0 +1,11 @@
+Enhancement: Use reva's Authenticate method instead of spawning token managers
+
+When using the CS3 proxy backend, we previously obtained the user from reva's
+userprovider service and minted the token ourselves. This required maintaining
+a shared JWT secret between ocis and reva, as well duplication of logic. This
+PR delegates this logic by using the `Authenticate` method provided by the reva
+gateway service to obtain this token, making it an arbitrary, indestructible
+entry. Currently, the changes have been made to the proxy service but will be
+extended to others as well.
+
+https://github.com/owncloud/ocis/pull/2528
--- a/changelog/unreleased/reva-ldap-tls.md
+++ b/changelog/unreleased/reva-ldap-tls.md
@@ -0,0 +1,10 @@
+Enhancement: TLS config options for ldap in reva
+
+We added the new config options "ldap-cacert" and "ldap-insecure" to the auth-,
+users- and groups-provider services to be able to do proper TLS configuration
+for the LDAP clients. "ldap-cacert" is by default configured to add the bundled
+glauth LDAP servers certificate to the trusted set for the LDAP clients.
+"ldap-insecure" is set to "false" by default and can be used to disable
+certificate checks (only advisable for development and test enviroments).
+
+https://github.com/owncloud/ocis/pull/2492
--- a/changelog/unreleased/reva-token-expiration.md
+++ b/changelog/unreleased/reva-token-expiration.md
@@ -0,0 +1,3 @@
+Enhancement: Set reva JWT token expiration time to 24 hours by default
+
+https://github.com/owncloud/ocis/pull/2527
--- a/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml
+++ b/deployments/continuous-deployment-config/cs3_users_ocis/latest.yml
@@ -17,6 +17,16 @@
    - "*.ocis-cs3-users.latest.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/cs3_users_ocis/released.yml
+++ b/deployments/continuous-deployment-config/cs3_users_ocis/released.yml
@@ -17,6 +17,16 @@
    - "*.ocis-cs3-users.released.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml
+++ b/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml
@@ -0,0 +1,52 @@
+---
+- name: continuous-deployment-oc10-ocis-parallel
+  server:
+    server_type: cx21
+    image: ubuntu-20.04
+    location: nbg1
+    initial_ssh_key_names:
+      - owncloud-ocis@drone.owncloud.com
+    labels:
+      owner: wkloucek
+      for: oCIS-continuous-deployment-examples
+    rebuild: $REBUILD
+    rebuild_carry_paths:
+      - /var/lib/docker/volumes/ocis_certs
+
+  domains:
+    - "*.oc10-ocis-parallel.latest.owncloud.works"
+
+  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
+    docker_compose_projects:
+      - name: ocis
+        git_url: https://github.com/owncloud/ocis.git
+        ref: master
+        docker_compose_path: deployments/examples/oc10_ocis_parallel
+        env:
+          INSECURE: "false"
+          TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
+          OCIS_DOCKER_TAG: latest
+          CLOUD_DOMAIN: cloud.oc10-ocis-parallel.latest.owncloud.works
+          KEYCLOAK_DOMAIN: keycloak.oc10-ocis-parallel.latest.owncloud.works
+          LDAP_MANAGER_DOMAIN: ldap.oc10-ocis-parallel.latest.owncloud.works
+          COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
+      - name: monitoring
+        git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
+        ref: master
+        env:
+          NETWORK_NAME: ocis-net
+          TELEMETRY_SERVE_DOMAIN: telemetry.oc10-ocis-parallel.latest.owncloud.works
+          JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
+          TELEGRAF_SPECIFIC_CONFIG: ocis_single_container
+          OCIS_URL: cloud.oc10-ocis-parallel.latest.owncloud.works
+          OCIS_DEPLOYMENT_ID: continuous-deployment-oc10-ocis-parallel-latest
--- a/deployments/continuous-deployment-config/ocis_hello/latest.yml
+++ b/deployments/continuous-deployment-config/ocis_hello/latest.yml
@@ -17,6 +17,16 @@
    - "*.ocis-s3.latest.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/ocis_keycloak/latest.yml
+++ b/deployments/continuous-deployment-config/ocis_keycloak/latest.yml
@@ -17,6 +17,16 @@
    - "*.ocis-keycloak.latest.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/ocis_keycloak/released.yml
+++ b/deployments/continuous-deployment-config/ocis_keycloak/released.yml
@@ -17,6 +17,16 @@
    - "*.ocis-keycloak.released.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/ocis_s3/latest.yml
+++ b/deployments/continuous-deployment-config/ocis_s3/latest.yml
@@ -17,6 +17,16 @@
    - "*.ocis-hello.latest.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/ocis_traefik/latest.yml
+++ b/deployments/continuous-deployment-config/ocis_traefik/latest.yml
@@ -17,6 +17,16 @@
    - "*.ocis-traefik.latest.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/ocis_traefik/released.yml
+++ b/deployments/continuous-deployment-config/ocis_traefik/released.yml
@@ -17,6 +17,16 @@
    - "*.ocis-traefik.released.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/ocis_wopi/latest.yml
+++ b/deployments/continuous-deployment-config/ocis_wopi/latest.yml
@@ -17,6 +17,16 @@
    - "*.ocis-wopi.latest.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/continuous-deployment-config/ocis_wopi/released.yml
+++ b/deployments/continuous-deployment-config/ocis_wopi/released.yml
@@ -17,6 +17,16 @@
    - "*.ocis-wopi.released.owncloud.works"

  vars:
+    ssh_authorized_keys:
+      - https://github.com/butonic.keys
+      - https://github.com/C0rby.keys
+      - https://github.com/fschade.keys
+      - https://github.com/kulmann.keys
+      - https://github.com/micbar.keys
+      - https://github.com/pascalwengerter.keys
+      - https://github.com/paulcod3.keys
+      - https://github.com/refs.keys
+      - https://github.com/wkloucek.keys
    docker_compose_projects:
      - name: ocis
        git_url: https://github.com/owncloud/ocis.git
--- a/deployments/examples/cs3_users_ocis/.env
+++ b/deployments/examples/cs3_users_ocis/.env
@@ -20,7 +20,7 @@ OCIS_DOMAIN=
 # JWT secret which is used for the storage provider. Must be changed in order to have a secure oCIS. Defaults to "Pive-Fumkiu4"
 OCIS_JWT_SECRET=
 # JWT secret which is used for uploads to create transfer tokens. Must be changed in order to have a secure oCIS. Defaults to "replace-me-with-a-transfer-secret"
-OCIS_TRANSFER_SECRET=
+STORAGE_TRANSFER_SECRET=


 ### LDAP server settings ###
--- a/Show More
+++ b/Show More