Merge branch 'privacy' into riot_2662

element-hq · Aug 27, 2019 · 293b278 · 293b278
2 parents b2bae55 + b5818cd
commit 293b278
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,8 +3,9 @@ Changes in 0.9.3 (2019-08-)
 
 Improvements:
  * Upgrade MatrixKit version ([v0.11.0](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.11.0)).
- * Prompt to accept integration manager policies on use (#2600).
- * Make clear that device names are publicly readable (#2662).
+ * Privacy: Prompt to accept integration manager policies on use (#2600).
+ * Privacy: Make clear that device names are publicly readable (#2662).
+ * 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
@@ -32,9 +32,11 @@
 	<string>https://jitsi.riot.im</string>
 	<key>integrationsWidgetsUrls</key>
 	<array>
-		<string>https://scalar-staging.riot.im/scalar/api</string>
-		<string>https://scalar-staging.vector.im/api</string>
+		<string>https://scalar.vector.im/_matrix/integrations/v1</string>
 		<string>https://scalar.vector.im/api</string>
+		<string>https://scalar-staging.vector.im/_matrix/integrations/v1</string>
+		<string>https://scalar-staging.vector.im/api</string>
+		<string>https://scalar-staging.riot.im/scalar/api</string>
 	</array>
 	<key>piwik</key>
 	<dict>