Merge branch 'release-v0.17.2'

bwindels · bwindels · commit f81d3bc90335 · 2018-10-19T17:00:44.000+02:00
diff --git 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)
diff --git 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": {
diff --git a/package-lock.json b/package-lock.json
diff --git 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": {
@@ -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",
diff --git 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();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,6 @@ export default class ElectronPlatform extends VectorBasePlatform {`
`143`	`143`	`{`
`144`	`144`	`body: msg,`
`145`	`145`	`icon: avatarUrl,`
`146`		`- tag: 'vector',`
`147`	`146`	`silent: true, // we play our own sounds`
`148`	`147`	`},`
`149`	`148`	`);`
`@@ -169,11 +168,6 @@ export default class ElectronPlatform extends VectorBasePlatform {`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`clearNotification(notif: Notification) {`
`172`		`- // This crashes on windows under certain circumstances: can't find any`
`173`		`- // workaround other than not closing notifs.`
`174`		`- // https://github.com/electron/electron/issues/15251`
`175`		`- // https://github.com/vector-im/riot-web/issues/7512`
`176`		`- if (window.process.platform === 'win32') return;`
`177`	`171`	`notif.close();`
`178`	`172`	`}`
`179`	`173`