OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release-v0.17.2'

pull/7598/head
Bruno Windels 2018-10-19 17:00:44 +02:00
parent ecfafc613f 88132067ad
commit f81d3bc903
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -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) 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) [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0...v0.17.1)

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "0.17.1", "version": "0.17.2",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.", "author": "Vector Creations Ltd.",
"dependencies": { "dependencies": {

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "riot-web", "name": "riot-web",
"version": "0.16.5", "version": "0.17.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

4
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "electron_app/src/electron-main.js", "main": "electron_app/src/electron-main.js",
"version": "0.17.1", "version": "0.17.2",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {
@ -71,7 +71,7 @@
"gfm.css": "^1.1.2", "gfm.css": "^1.1.2",
"highlight.js": "^9.0.0", "highlight.js": "^9.0.0",
"matrix-js-sdk": "0.12.0", "matrix-js-sdk": "0.12.0",
"matrix-react-sdk": "0.14.0", "matrix-react-sdk": "0.14.1",
"modernizr": "^3.6.0", "modernizr": "^3.6.0",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^15.6.0", "react": "^15.6.0",

6
src/vector/platform/ElectronPlatform.js
View File

@ -143,7 +143,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
{ {
body: msg, body: msg,
icon: avatarUrl, icon: avatarUrl,
tag: 'vector',
silent: true, // we play our own sounds silent: true, // we play our own sounds
}, },
); );
@ -169,11 +168,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
} }
clearNotification(notif: Notification) { 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(); notif.close();
} }