v1.7.22

Prepare changelog for v1.7.22
v1.7.22-rc.1
2026-01-17 11:58:04 -05:00 · 2021-03-01 13:28:11 +00:00 · 2021-03-01 13:28:10 +00:00 · 2021-02-24 17:44:10 +00:00 · 2021-02-24 17:44:10 +00:00 · 2021-02-16 11:24:49 +00:00
4 changed files with 51 additions and 7 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+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)
+
+ * No changes since rc.1
+
+Changes in [1.7.21-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.21-rc.1) (2021-02-10)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.20...v1.7.21-rc.1)
+
+ * Fix desktop Matrix screen sharing
+   [\#161](https://github.com/vector-im/element-desktop/pull/161)
+
+Changes in [1.7.20](https://github.com/vector-im/element-desktop/releases/tag/v1.7.20) (2021-02-04)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.19...v1.7.20)
+
+ * No changes since 1.7.19
+
 Changes in [1.7.19](https://github.com/vector-im/element-desktop/releases/tag/v1.7.19) (2021-02-03)
 ===================================================================================================
 [Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.19-rc.1...v1.7.19)
--- a/element.io/nightly/config.json
+++ b/element.io/nightly/config.json
@@ -19,10 +19,6 @@
        "siteId": 1,
        "policyUrl": "https://element.io/cookie-policy"
    },
-    "countly": {
-        "url": "https://try.count.ly",
-        "appKey": "8abf1ee15646bc884556b82e5053857904264b66"
-    },
    "roomDirectory": {
        "servers": [
            "matrix.org",
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "element-desktop",
  "productName": "Element",
  "main": "src/electron-main.js",
-  "version": "1.7.19",
+  "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",
      {
--- a/src/preload.js
+++ b/src/preload.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const { contextBridge, ipcRenderer } = require("electron");
+const { ipcRenderer, desktopCapturer, contextBridge } = require('electron');

 // Expose only expected IPC wrapper APIs to the renderer process to avoid
 // handing out generalised messaging access.
@@ -53,5 +53,19 @@ contextBridge.exposeInMainWorld(
            }
            ipcRenderer.send(channel, ...args);
        },
+        async getDesktopCapturerSources(options) {
+            const sources = await desktopCapturer.getSources(options);
+            const desktopCapturerSources = [];
+
+            for (const source of sources) {
+                desktopCapturerSources.push({
+                    id: source.id,
+                    name: source.name,
+                    thumbnailURL: source.thumbnail.toDataURL(),
+                });
+            }
+
+            return desktopCapturerSources;
+        },
    },
 );
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
RiotRobot	a535efc1cc	v1.7.21	2021-02-16 11:24:31 +00:00
RiotRobot	57496d89e5	Prepare changelog for v1.7.21	2021-02-16 11:24:31 +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
RiotRobot	23ecc8573d	v1.7.21-rc.1	2021-02-10 17:07:33 +00:00
RiotRobot	7199a697f4	Prepare changelog for v1.7.21-rc.1	2021-02-10 17:07:33 +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
David Baker	8828838e8a	Merge pull request #161 from SimonBrandner/fix-screen-sharing Fix desktop Matrix screen sharing	2021-02-08 13:54:57 +00:00
RiotRobot	c7c56f2f97	v1.7.20	2021-02-04 12:42:04 +00:00
RiotRobot	2c619a3a3f	Prepare changelog for v1.7.20	2021-02-04 12:42:04 +00:00
Šimon Brandner	44c8f2c30f	Merge 'upstream/develop' and use contextBridge Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-14 08:31:52 +01:00
Šimon Brandner	3b496c362b	Don't wait for loaded Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-05 19:45:34 +01:00
Šimon Brandner	c4b7e856db	Expose desktopCapturer instead of the awfullness Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-26 08:28:35 +01:00
Šimon Brandner	cb1626cb9f	Merge branch 'develop' into fix-screen-sharing	2020-12-25 16:28:16 +01:00
Šimon Brandner	a36321b697	Some improvements Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-25 16:24:21 +01:00
Šimon Brandner	353f5b35df	Fix screen-sharing Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-25 15:54:13 +01:00