mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-09 22:55:12 +00:00
Merge branch 'release-v0.17.2'
This commit is contained in:
commit
f81d3bc903
5 changed files with 12 additions and 10 deletions
|
@ -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)
|
||||
|
|
|
@ -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": {
|
||||
|
|
2
package-lock.json
generated
2
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "riot-web",
|
||||
"version": "0.16.5",
|
||||
"version": "0.17.2",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue