From 62f664c5924e786beaa50ce80093c67d2faab66a Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 19 Oct 2018 16:45:39 +0200 Subject: [PATCH 1/6] update matrix-react-sdk to 0.14.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 637c60a7fd..6dcf8e897c 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.0.0", "matrix-js-sdk": "0.12.0", - "matrix-react-sdk": "0.14.0", + "matrix-react-sdk": "0.14.1", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From d0fcf3c9520350472fa8f80e0578d6d968c275d7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 18 Oct 2018 19:07:59 +0100 Subject: [PATCH 2/6] Don't set tags on notifications They are to suppress notifications that don't want to be shown in addition to each other. This makes no sense for our notifications: they're each for independent messages. Also settings tags on notifications makes electron crash on windows when you close the notif, as per https://github.com/vector-im/riot-web/issues/7512 --- src/vector/platform/ElectronPlatform.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 9275a4a8ad..5ced2a2ad0 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -143,7 +143,6 @@ export default class ElectronPlatform extends VectorBasePlatform { { body: msg, icon: avatarUrl, - tag: 'vector', silent: true, // we play our own sounds }, ); @@ -169,11 +168,6 @@ export default class ElectronPlatform extends VectorBasePlatform { } clearNotification(notif: Notification) { - // This crashes on windows under certain circumstances: can't find any - // workaround other than not closing notifs. - // https://github.com/electron/electron/issues/15251 - // https://github.com/vector-im/riot-web/issues/7512 - if (window.process.platform === 'win32') return; notif.close(); } From 221f75542ad1fdb95f21eaa3b2616fb91b0d5c51 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 19 Oct 2018 16:51:26 +0200 Subject: [PATCH 3/6] v0.17.2 --- 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 8adcebad9e..0600216b43 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.17.1", + "version": "0.17.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 5f35b9903ddea0d3f386d205aa50e98574f46072 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 19 Oct 2018 16:54:26 +0200 Subject: [PATCH 4/6] Prepare changelog for v0.17.2 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b29a5c793..2c09aefce8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [0.17.2](https://github.com/vector-im/riot-web/releases/tag/v0.17.2) (2018-10-19) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.1...v0.17.2) + + * Update react-sdk version to "Apply the user's tint once the MatrixClientPeg is moderately ready" + * Electron: don't set tags on notifications + [\#7518](https://github.com/vector-im/riot-web/pull/7518) + Changes in [0.17.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.1) (2018-10-18) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0...v0.17.1) From f5eff7d3491ae93d99a81d4e0c8560fbb3e5b170 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 19 Oct 2018 16:54:27 +0200 Subject: [PATCH 5/6] v0.17.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6dcf8e897c..4d77c7ab4f 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.17.1", + "version": "0.17.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 88132067ad444e68362f48247072c97e653d7d97 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 19 Oct 2018 17:00:13 +0200 Subject: [PATCH 6/6] update version in package lock file --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index a5f23a57ab..7463dd1733 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "0.16.5", + "version": "0.17.2", "lockfileVersion": 1, "requires": true, "dependencies": {