Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

default to Collabora #9280

Merged
merged 1 commit into from
May 31, 2024
Merged

default to Collabora #9280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/unreleased/add-providerinfo-secure-view-flag.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ Enhancement: add secureview flag when listing apps via http

To allow clients to see which application supports secure view we add a flag to the http response when the app name matches a configured secure view app. The app can be configured by setting `FRONTEND_APP_HANDLER_SECURE_VIEW_APP` to the name of the app registered as a CS3 app provider.

https://github.com/owncloud/ocis/pull/9280
https://github.com/owncloud/ocis/pull/9277
4 changes: 2 additions & 2 deletions services/collaboration/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ func DefaultConfig() *config.Config {
Name: "collaboration",
},
App: config.App{
Name: "Collabora Online",
Description: "Open office documents with Collabora Online",
Name: "Collabora",
Description: "Open office documents with Collabora",
Icon: "image-edit",
LockName: "com.github.owncloud.collaboration",
},
Expand Down
2 changes: 1 addition & 1 deletion services/frontend/pkg/config/defaults/defaultconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func DefaultConfig() *config.Config {
},
AppHandler: config.AppHandler{
Prefix: "app",
SecureViewApp: "Collabora Online",
SecureViewApp: "Collabora",
},
Archiver: config.Archiver{
Insecure: false,
Expand Down