v1.7.26

Prepare changelog for v1.7.26
v1.7.26-rc.1
2026-01-06 06:28:46 -05:00 · 2021-04-26 18:12:16 +01:00 · 2021-04-26 18:12:15 +01:00 · 2021-04-21 17:48:52 +01:00 · 2021-04-21 17:48:52 +01:00 · 2021-04-19 14:06:19 -04:00
7 changed files with 30 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+Changes in [1.7.26](https://github.com/vector-im/element-desktop/releases/tag/v1.7.26) (2021-04-26)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.26-rc.1...v1.7.26)
+
+ * No changes since rc.1
+
+Changes in [1.7.26-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.26-rc.1) (2021-04-21)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.25...v1.7.26-rc.1)
+
+ * Remove Debian dependency libappindicator3-1
+   [\#170](https://github.com/vector-im/element-desktop/pull/170)
+ * Fix exit shortcuts for non QWERTY keyboards
+   [\#185](https://github.com/vector-im/element-desktop/pull/185)
+ * Fix using yarn run fetch with a specific version
+   [\#182](https://github.com/vector-im/element-desktop/pull/182)
+ * Switch nightly to not-staging Scalar by default
+   [\#181](https://github.com/vector-im/element-desktop/pull/181)
+
 Changes in [1.7.25](https://github.com/vector-im/element-desktop/releases/tag/v1.7.25) (2021-04-12)
 ===================================================================================================
 [Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.25-rc.1...v1.7.25)
--- a/element.io/nightly/config.json
+++ b/element.io/nightly/config.json
@@ -2,8 +2,8 @@
    "update_base_url": "https://packages.riot.im/nightly/update/",
    "default_server_name": "matrix.org",
    "brand": "Element Nightly",
-    "integrations_ui_url": "https://scalar-staging.vector.im/",
-    "integrations_rest_url": "https://scalar-staging.vector.im/api",
+    "integrations_ui_url": "https://scalar.vector.im/",
+    "integrations_rest_url": "https://scalar.vector.im/api",
    "integrations_widgets_urls": [
        "https://scalar.vector.im/_matrix/integrations/v1",
        "https://scalar.vector.im/api",
--- a/element.io/nightly/control.template
+++ b/element.io/nightly/control.template
@@ -3,7 +3,8 @@ License: Apache-2.0
 Vendor: support@element.io
 Architecture: amd64
 Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, libsqlcipher0
+Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libsqlcipher0
+Recommends: libappindicator3-1
 Section: net
 Priority: extra
 Homepage: https://element.io/
--- a/element.io/release/control.template
+++ b/element.io/release/control.template
@@ -3,7 +3,8 @@ License: Apache-2.0
 Vendor: support@element.io
 Architecture: amd64
 Maintainer: support@element.io
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, libsqlcipher0
+Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libsqlcipher0
+Recommends: libappindicator3-1
 Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
 Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
 Section: net
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "element-desktop",
  "productName": "Element",
  "main": "src/electron-main.js",
-  "version": "1.7.25",
+  "version": "1.7.26",
  "description": "A feature-rich client for Matrix.org",
  "author": "Element",
  "repository": {
--- a/scripts/fetch-package.js
+++ b/scripts/fetch-package.js
@@ -15,7 +15,7 @@ const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
 const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
 const ASAR_PATH = 'webapp.asar';

-const {setPackageVersion, setDebVersion} = require('./set-version.js');
+const {setPackageVersion} = require('./set-version.js');

 async function getLatestDevelopUrl(bkToken) {
    const buildsResult = await needle('get',
@@ -283,7 +283,6 @@ async function main() {
        const semVer = targetVersion.slice(1);
        console.log("Updating version to " + semVer);
        await setPackageVersion(semVer);
-        await setDebVersion(semVer);
    }

    console.log("Done!");
--- a/src/electron-main.js
+++ b/src/electron-main.js
@@ -256,9 +256,9 @@ let mainWindow = null;
 global.appQuitting = false;

 const exitShortcuts = [
-    (input, platform) => platform !== 'darwin' && input.alt && input.code === 'F4',
-    (input, platform) => platform !== 'darwin' && input.control && input.code === 'KeyQ',
-    (input, platform) => platform === 'darwin' && input.meta && input.code === 'KeyQ',
+    (input, platform) => platform !== 'darwin' && input.alt && input.key.toUpperCase() === 'F4',
+    (input, platform) => platform !== 'darwin' && input.control && input.key.toUpperCase() === 'Q',
+    (input, platform) => platform === 'darwin' && input.meta && input.key.toUpperCase() === 'Q',
 ];

 const warnBeforeExit = (event, input) => {
Author	SHA1	Message	Date
RiotRobot	c19baadcd3	v1.7.26	2021-04-26 18:12:16 +01:00
RiotRobot	ada58f826a	Prepare changelog for v1.7.26	2021-04-26 18:12:15 +01:00
RiotRobot	6526127998	v1.7.26-rc.1	2021-04-21 17:48:52 +01:00
RiotRobot	b640d5e7e4	Prepare changelog for v1.7.26-rc.1	2021-04-21 17:48:52 +01:00
Hubert Chathi	1ff5387f1d	Merge pull request #170 from hiqua/develop Remove Debian dependency libappindicator3-1	2021-04-19 14:06:19 -04:00
Germain	5ae736e861	Merge pull request #185 from vector-im/gsouquet-exit-shortcut Fix exit shortcuts for non QWERTY keyboards	2021-04-15 17:25:44 +01:00
Germain Souquet	29d22aefd7	Fix exit shortcuts for non QWERTY keyboards	2021-04-15 16:50:35 +01:00
Germain	11602bb578	Merge pull request #182 from tsnowlan/remove-missing-setDebVersion	2021-04-14 11:40:38 +01:00
Tor Solli-Nowlan	46ee80837a	Update scripts/fetch-package.js Co-authored-by: Germain <germain@souquet.com>	2021-04-14 12:34:53 +02:00
Tor Solli-Nowlan	97178f4297	setDebVersion function no longer exists Signed-off-by: Tor Solli-Nowlan <tor.solli-nowlan@medisin.uio.no>	2021-04-13 12:22:32 +02:00
RiotRobot	cd93f29691	Merge branch 'master' into develop	2021-04-12 15:35:40 +01:00
Quentin Hibon	955be8417b	Use libappindicator3-1 as Recommends dep	2021-04-10 22:48:37 +02:00
Quentin Hibon	c136f2cafc	Remove Debian dependency libappindicator3-1 libappindicator has been deprecated by Debian[0] and will not be shipped from Debian Bullseye on. [0]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895037	2021-04-10 22:48:37 +02:00
Travis Ralston	adfa845d9c	Merge pull request #181 from vector-im/travis/no-staging Switch nightly to not-staging Scalar by default	2021-04-07 10:31:18 -06:00
Travis Ralston	017cfd70f4	Switch nightly to not-staging Scalar by default	2021-04-07 10:21:33 -06:00