Compare commits

...

6 Commits

Author SHA1 Message Date
RiotRobot
58543cacc8 v1.7.14 2020-11-23 16:54:03 +00:00
RiotRobot
8582e360b5 Prepare changelog for v1.7.14 2020-11-23 16:54:03 +00:00
RiotRobot
b0a5003eaa v1.7.14-rc.1 2020-11-18 16:38:21 +00:00
RiotRobot
6c0d8d5bda Prepare changelog for v1.7.14-rc.1 2020-11-18 16:38:21 +00:00
J. Ryan Stinnett
302f25054a Merge pull request #151 from EdwardBetts/spelling
Correct spelling mistakes
2020-11-16 13:27:47 +00:00
Edward Betts
82c88ca654 Correct spelling mistakes 2020-11-14 21:54:07 +00:00
3 changed files with 16 additions and 3 deletions

View File

@@ -1,3 +1,16 @@
Changes in [1.7.14](https://github.com/vector-im/element-desktop/releases/tag/v1.7.14) (2020-11-23)
===================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.14-rc.1...v1.7.14)
* No changes since rc.1
Changes in [1.7.14-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.14-rc.1) (2020-11-18)
=============================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.13...v1.7.14-rc.1)
* Correct spelling mistakes
[\#151](https://github.com/vector-im/element-desktop/pull/151)
Changes in [1.7.13](https://github.com/vector-im/element-desktop/releases/tag/v1.7.13) (2020-11-09)
===================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.13-rc.1...v1.7.13)
@@ -396,7 +409,7 @@ Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v
[\#57](https://github.com/vector-im/riot-desktop/pull/57)
* Remove welcome user from config
[\#56](https://github.com/vector-im/riot-desktop/pull/56)
* electron-main: Immediatelly set the eventIndex variable to null when
* electron-main: Immediately set the eventIndex variable to null when
closing.
[\#55](https://github.com/vector-im/riot-desktop/pull/55)
* Enable Seshat on Nightly

View File

@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.13",
"version": "1.7.14",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {

View File

@@ -182,7 +182,7 @@ async function setupGlobals() {
vectorConfig = require(asarPath + 'config.json');
} catch (e) {
// it would be nice to check the error code here and bail if the config
// is unparseable, but we get MODULE_NOT_FOUND in the case of a missing
// is unparsable, but we get MODULE_NOT_FOUND in the case of a missing
// file or invalid json, so node is just very unhelpful.
// Continue with the defaults (ie. an empty config)
vectorConfig = {};