diff --git a/config.sample.json b/config.sample.json index 1a26289f..6d9ebe03 100644 --- a/config.sample.json +++ b/config.sample.json @@ -15,6 +15,13 @@ "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", + "integrations_widgets_urls": [ + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", + "https://scalar-staging.vector.im/api", + "https://scalar-staging.riot.im/scalar/api" + ], "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "defaultCountryCode": "GB", diff --git a/docs/labs.md b/docs/labs.md index 4399d362..8250bf91 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -50,3 +50,7 @@ That's it. Now should see your new counter under the header. An experimental, faster, message composer which should be more reliable and less prone to problems when using your chosen input method. + +## Multiple integration managers (`feature_many_integration_managers`) + +Exposes a way to access all the integration managers known to Riot. This is an implementation of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957). diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index a995a4e9..a2df3da0 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -6,9 +6,11 @@ "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "integrations_widgets_urls": [ + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", "https://scalar-staging.vector.im/api", - "https://scalar-staging.riot.im/scalar/api", - "https://scalar.vector.im/api" + "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", diff --git a/riot.im/app/config.json b/riot.im/app/config.json index fc677205..164b81c1 100644 --- a/riot.im/app/config.json +++ b/riot.im/app/config.json @@ -5,8 +5,10 @@ "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "integrations_widgets_urls": [ - "https://scalar-staging.vector.im/api", + "https://scalar.vector.im/_matrix/integrations/v1", "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", + "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 69f42dd6..982d796f 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -5,9 +5,11 @@ "integrations_ui_url": "https://scalar-staging.vector.im/", "integrations_rest_url": "https://scalar-staging.vector.im/api", "integrations_widgets_urls": [ - "https://scalar-staging.riot.im/scalar/api", + "https://scalar.vector.im/_matrix/integrations/v1", + "https://scalar.vector.im/api", + "https://scalar-staging.vector.im/_matrix/integrations/v1", "https://scalar-staging.vector.im/api", - "https://scalar.vector.im/api" + "https://scalar-staging.riot.im/scalar/api" ], "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "bug_report_endpoint_url": "https://riot.im/bugreports/submit", @@ -26,7 +28,8 @@ "feature_sas": "labs", "feature_room_breadcrumbs": "labs", "feature_state_counters": "labs", - "feature_cider_composer": "labs" + "feature_cider_composer": "labs", + "feature_many_integration_managers": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": {