Skip to content

Commit

Permalink
Merge pull request #2669 from vector-im/jaywink/integrations-widgets-…
Browse files Browse the repository at this point in the history
…urls

Add and prioritize the new "_matrix/integrations/v1" widget urls
  • Loading branch information
manuroe authored Aug 26, 2019
2 parents 6885bb8 + eb9989f commit b5818cd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
===============================================
Expand Down
6 changes: 4 additions & 2 deletions Riot/Assets/Riot-Defaults.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit b5818cd

Please sign in to comment.