Compare commits

...

9 Commits

Author SHA1 Message Date
RiotRobot
323c42bb72 v1.7.22 2021-03-01 13:28:11 +00:00
RiotRobot
8e51f6299c Prepare changelog for v1.7.22 2021-03-01 13:28:10 +00:00
RiotRobot
888ce434ff v1.7.22-rc.1 2021-02-24 17:44:10 +00:00
RiotRobot
a223489511 Prepare changelog for v1.7.22-rc.1 2021-02-24 17:44:10 +00:00
RiotRobot
343215925a Merge branch 'master' into develop 2021-02-16 11:24:49 +00:00
J. Ryan Stinnett
5dc9ba94ca Merge pull request #169 from vector-im/jryans/disable-countly
Disable Countly
2021-02-11 15:26:55 +00:00
J. Ryan Stinnett
3d519f571f Disable Countly
The Countly experiment has ended, so this removes the configuration to enable
it.
2021-02-11 15:18:45 +00:00
J. Ryan Stinnett
d9702e2f92 Merge pull request #168 from vector-im/jryans/electron-11.2.3
Upgrade to Electron 11.2.3
2021-02-10 20:40:30 +00:00
J. Ryan Stinnett
ecbcafe9ea Upgrade to Electron 11.2.3
No breaking changes, so let's see how this works for a wider audience. In
particular, we'll want to check
https://github.com/vector-im/element-web/issues/15869 again.
2021-02-10 16:52:47 +00:00
3 changed files with 17 additions and 6 deletions

View File

@@ -1,3 +1,18 @@
Changes in [1.7.22](https://github.com/vector-im/element-desktop/releases/tag/v1.7.22) (2021-03-01)
===================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.22-rc.1...v1.7.22)
* No changes since rc.1
Changes in [1.7.22-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.22-rc.1) (2021-02-24)
=============================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.21...v1.7.22-rc.1)
* Disable Countly
[\#169](https://github.com/vector-im/element-desktop/pull/169)
* Upgrade to Electron 11.2.3
[\#168](https://github.com/vector-im/element-desktop/pull/168)
Changes in [1.7.21](https://github.com/vector-im/element-desktop/releases/tag/v1.7.21) (2021-02-16)
===================================================================================================
[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.21-rc.1...v1.7.21)

View File

@@ -19,10 +19,6 @@
"siteId": 1,
"policyUrl": "https://element.io/cookie-policy"
},
"countly": {
"url": "https://try.count.ly",
"appKey": "8abf1ee15646bc884556b82e5053857904264b66"
},
"roomDirectory": {
"servers": [
"matrix.org",

View File

@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.21",
"version": "1.7.22",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "10.2.0",
"electronVersion": "11.2.3",
"files": [
"package.json",
{