diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c9d05a..41fe79d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +Changes in [1.7.16](https://github.com/vector-im/element-desktop/releases/tag/v1.7.16) (2020-12-21) +=================================================================================================== +[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.16-rc.1...v1.7.16) + + * No changes since rc.1 + +Changes in [1.7.16-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.16-rc.1) (2020-12-16) +============================================================================================================= +[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.15...v1.7.16-rc.1) + + * Bump ini from 1.3.5 to 1.3.8 + [\#158](https://github.com/vector-im/element-desktop/pull/158) + * Add gitter.im to room directory + [\#157](https://github.com/vector-im/element-desktop/pull/157) + +Changes in [1.7.15](https://github.com/vector-im/element-desktop/releases/tag/v1.7.15) (2020-12-07) +=================================================================================================== +[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.15-rc.1...v1.7.15) + + * No changes since rc.1 + +Changes in [1.7.15-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.15-rc.1) (2020-12-02) +=================================================================================================== +[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.14...v1.7.15-rc.1) + + * No changes since 1.7.14 + 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) diff --git a/element.io/nightly/config.json b/element.io/nightly/config.json index 2cf4ec8..71cc053 100644 --- a/element.io/nightly/config.json +++ b/element.io/nightly/config.json @@ -25,7 +25,8 @@ }, "roomDirectory": { "servers": [ - "matrix.org" + "matrix.org", + "gitter.im" ] }, "enable_presence_by_hs_url": { diff --git a/element.io/release/config.json b/element.io/release/config.json index a46e4c5..5f45c64 100644 --- a/element.io/release/config.json +++ b/element.io/release/config.json @@ -15,7 +15,8 @@ "bug_report_endpoint_url": "https://element.io/bugreports/submit", "roomDirectory": { "servers": [ - "matrix.org" + "matrix.org", + "gitter.im" ] }, "showLabsSettings": false, diff --git a/package.json b/package.json index e2d45ef..31f9409 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.14", + "version": "1.7.16", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -62,7 +62,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "10.1.6", + "electronVersion": "10.2.0", "files": [ "package.json", { diff --git a/yarn.lock b/yarn.lock index 24e9bd5..ce4f4d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2941,9 +2941,9 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== init-package-json@^1.10.3: version "1.10.3"