From d71af40967a0a490f167f4696f12418129c6abca Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 19 Dec 2017 12:03:48 +0000 Subject: [PATCH 1/4] add missing config.json entry such that scalar-staging widgets work Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron_app/riot.im/config.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 5b48cf671f..5b2fe37ba0 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -5,6 +5,10 @@ "brand": "Riot", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", + "integrations_widgets_urls": [ + "https://scalar-staging.riot.im/scalar/api", + "https://scalar.vector.im/api" + ], "bug_report_endpoint_url": "https://riot.im/bugreports/submit", "welcomeUserId": "@riot-bot:matrix.org", "roomDirectory": { From 2eb433157aad8cb43ad95c72a55f28841b677ea1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 3 Jan 2018 16:08:38 +0000 Subject: [PATCH 2/4] v0.13.4 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index ad237ebe8a..b33da34fe6 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.13.3", + "version": "0.13.4", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 1bb861f6cfe500ba7c92fcc001cac9ed3c679895 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 3 Jan 2018 16:13:24 +0000 Subject: [PATCH 3/4] Prepare changelog for v0.13.4 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c72ea8da07..d93444c416 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [0.13.4](https://github.com/vector-im/riot-web/releases/tag/v0.13.4) (2018-01-03) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.3...v0.13.4) + + * Change config of riot.im electron build to fix some widgets not working. This only affects + electron builds using the riot.im config - for all other builds, this is identical to + v0.13.3. + Changes in [0.13.3](https://github.com/vector-im/riot-web/releases/tag/v0.13.3) (2017-12-04) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.13.2...v0.13.3) From 5635614549dfabe805ba1235408c0a94ce1e6136 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 3 Jan 2018 16:13:24 +0000 Subject: [PATCH 4/4] v0.13.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 050c9f32a1..ac25f8e0ce 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.13.3", + "version": "0.13.4", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": {