From 216ff283934ce2a251ea1eba78356983068a858f Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 26 Aug 2019 11:48:47 +0300 Subject: [PATCH 1/2] Add and prioritize the new "_matrix/integrations/v1" widget urls As per MSC1961, add to the whitelisted integrations_widget_urls the new paths. This allows us to switch Scalar over to use the new path as default. Note, the legacy "scalar-staging.riot.im" is these days just a redirect to scalar-staging.vector.im, so there is no addition for that. It still needs Riot side whitelisting though for existing widgets. Refs: https://github.com/matrix-org/matrix-doc/pull/1961 Signed-off-by: Jason Robinson --- CHANGES.rst | 1 + Riot/Assets/Riot-Defaults.plist | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5da0df8661..f05a8d4b7a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,6 +3,7 @@ Changes in 0.9.3 (2019-08-) Improvements: * Prompt to accept integration manager policies on use (#2600). + * Widgets: Whitelist {MSC1961](https://github.com/matrix-org/matrix-doc/pull/1961) widget urls Changes in 0.9.2 (2019-08-08) =============================================== diff --git a/Riot/Assets/Riot-Defaults.plist b/Riot/Assets/Riot-Defaults.plist index 9cab288c25..ebef1344ad 100644 --- a/Riot/Assets/Riot-Defaults.plist +++ b/Riot/Assets/Riot-Defaults.plist @@ -32,9 +32,11 @@ https://jitsi.riot.im integrationsWidgetsUrls - https://scalar-staging.riot.im/scalar/api - 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 piwik From eb9989f780ae6931f1c04d4d2be94b988c11f485 Mon Sep 17 00:00:00 2001 From: Jason Robinson Date: Mon, 26 Aug 2019 11:56:15 +0300 Subject: [PATCH 2/2] Fix markdown link fail in changelog Signed-off-by: Jason Robinson --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index f05a8d4b7a..48ed31c041 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,7 +3,7 @@ Changes in 0.9.3 (2019-08-) Improvements: * Prompt to accept integration manager policies on use (#2600). - * Widgets: Whitelist {MSC1961](https://github.com/matrix-org/matrix-doc/pull/1961) widget urls + * Widgets: Whitelist [MSC1961](https://github.com/matrix-org/matrix-doc/pull/1961) widget urls Changes in 0.9.2 (2019-08-08) ===============================================