sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into search

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2022-04-14 11:56:26 +00:00
parent 2de90423b7 a332ba8c00
commit 37f64eb0e8
972 changed files with 2895 additions and 2949 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis-pkg/config/config.go
+18 -18
View File
@@ -3,24 +3,24 @@ package config
import (
"github.com/owncloud/ocis/ocis-pkg/shared"
accounts "github.com/owncloud/ocis/accounts/pkg/config"
audit "github.com/owncloud/ocis/audit/pkg/config"
glauth "github.com/owncloud/ocis/glauth/pkg/config"
graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config"
graph "github.com/owncloud/ocis/graph/pkg/config"
idm "github.com/owncloud/ocis/idm/pkg/config"
idp "github.com/owncloud/ocis/idp/pkg/config"
nats "github.com/owncloud/ocis/nats/pkg/config"
notifications "github.com/owncloud/ocis/notifications/pkg/config"
ocs "github.com/owncloud/ocis/ocs/pkg/config"
proxy "github.com/owncloud/ocis/proxy/pkg/config"
search "github.com/owncloud/ocis/search/pkg/config"
settings "github.com/owncloud/ocis/settings/pkg/config"
storage "github.com/owncloud/ocis/storage/pkg/config"
store "github.com/owncloud/ocis/store/pkg/config"
thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config"
web "github.com/owncloud/ocis/web/pkg/config"
webdav "github.com/owncloud/ocis/webdav/pkg/config"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config"
idm "github.com/owncloud/ocis/extensions/idm/pkg/config"
idp "github.com/owncloud/ocis/extensions/idp/pkg/config"
nats "github.com/owncloud/ocis/extensions/nats/pkg/config"
notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config"
ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config"
proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config"
search "github.com/owncloud/ocis/extensions/search/pkg/config"
settings "github.com/owncloud/ocis/extensions/settings/pkg/config"
storage "github.com/owncloud/ocis/extensions/storage/pkg/config"
store "github.com/owncloud/ocis/extensions/store/pkg/config"
thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
web "github.com/owncloud/ocis/extensions/web/pkg/config"
webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config"
)
// TokenManager is the config for using the reva token manager
ocis-pkg/config/defaultconfig.go
+18 -18
View File
@@ -1,24 +1,24 @@
package config
import (
accounts "github.com/owncloud/ocis/accounts/pkg/config/defaults"
audit "github.com/owncloud/ocis/audit/pkg/config/defaults"
glauth "github.com/owncloud/ocis/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/graph/pkg/config/defaults"
idm "github.com/owncloud/ocis/idm/pkg/config/defaults"
idp "github.com/owncloud/ocis/idp/pkg/config/defaults"
nats "github.com/owncloud/ocis/nats/pkg/config/defaults"
notifications "github.com/owncloud/ocis/notifications/pkg/config/defaults"
ocs "github.com/owncloud/ocis/ocs/pkg/config/defaults"
proxy "github.com/owncloud/ocis/proxy/pkg/config/defaults"
search "github.com/owncloud/ocis/search/pkg/config/defaults"
settings "github.com/owncloud/ocis/settings/pkg/config/defaults"
storage "github.com/owncloud/ocis/storage/pkg/config/defaults"
store "github.com/owncloud/ocis/store/pkg/config/defaults"
thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults"
web "github.com/owncloud/ocis/web/pkg/config/defaults"
webdav "github.com/owncloud/ocis/webdav/pkg/config/defaults"
accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults"
graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
notifications "github.com/owncloud/ocis/extensions/notifications/pkg/config/defaults"
ocs "github.com/owncloud/ocis/extensions/ocs/pkg/config/defaults"
proxy "github.com/owncloud/ocis/extensions/proxy/pkg/config/defaults"
search "github.com/owncloud/ocis/extensions/search/pkg/config/defaults"
settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults"
store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults"
thumbnails "github.com/owncloud/ocis/extensions/thumbnails/pkg/config/defaults"
web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
)
func DefaultConfig() *Config {
ocis-pkg/indexer/config/config.go
+1 -1
View File
@@ -2,7 +2,7 @@
package config
import (
"github.com/owncloud/ocis/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
)
// Repo defines which storage implementation is to be used.
ocis-pkg/indexer/index/cs3/autoincrement.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"strconv"
"strings"
"github.com/owncloud/ocis/accounts/pkg/storage"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
idxerrs "github.com/owncloud/ocis/ocis-pkg/indexer/errors"
ocis-pkg/indexer/index/cs3/config.go
+1 -1
View File
@@ -1,7 +1,7 @@
package cs3
import (
acccfg "github.com/owncloud/ocis/accounts/pkg/config"
acccfg "github.com/owncloud/ocis/extensions/accounts/pkg/config"
)
// Config represents cs3conf. Should be deprecated in favor of config.Config.
ocis-pkg/indexer/index/cs3/non_unique.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/owncloud/ocis/accounts/pkg/storage"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
ocis-pkg/indexer/index/cs3/unique.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"
"github.com/owncloud/ocis/accounts/pkg/storage"
"github.com/owncloud/ocis/extensions/accounts/pkg/storage"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
ocis-pkg/indexer/index/disk/unique_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"path"
"testing"
"github.com/owncloud/ocis/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/indexer/errors"
"github.com/owncloud/ocis/ocis-pkg/indexer/index"
"github.com/owncloud/ocis/ocis-pkg/indexer/option"
ocis-pkg/indexer/option/option.go
+1 -1
View File
@@ -1,6 +1,6 @@
package option
import "github.com/owncloud/ocis/accounts/pkg/config"
import "github.com/owncloud/ocis/extensions/accounts/pkg/config"
// Option defines a single option function.
type Option func(o *Options)
ocis-pkg/metadata_storage/metadata_storage.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
"github.com/cs3org/reva/v2/pkg/errtypes"
"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
"github.com/cs3org/reva/v2/pkg/utils"
"github.com/owncloud/ocis/accounts/pkg/config"
"github.com/owncloud/ocis/extensions/accounts/pkg/config"
"google.golang.org/grpc/metadata"
)