v1.7.18

Prepare changelog for v1.7.18
v1.7.17
2026-01-05 14:10:28 -05:00 · 2021-01-26 12:31:13 +00:00 · 2021-01-26 12:31:13 +00:00 · 2021-01-18 15:26:16 +00:00 · 2021-01-18 15:26:16 +00:00 · 2021-01-18 10:57:40 +00:00
8 changed files with 70 additions and 19 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,52 @@
+Changes in [1.7.18](https://github.com/vector-im/element-desktop/releases/tag/v1.7.18) (2021-01-26)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.17...v1.7.18)
+
+ * No changes since 1.7.17
+
+Changes in [1.7.17](https://github.com/vector-im/element-desktop/releases/tag/v1.7.17) (2021-01-18)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.17-rc.1...v1.7.17)
+
+ * [Release] package: Bump our seshat version
+   [\#165](https://github.com/vector-im/element-desktop/pull/165)
+
+Changes in [1.7.17-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.17-rc.1) (2021-01-13)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.16...v1.7.17-rc.1)
+
+ * package: Bump our Seshat version
+   [\#162](https://github.com/vector-im/element-desktop/pull/162)
+ * Upgrade to Electron 10.2.0
+   [\#159](https://github.com/vector-im/element-desktop/pull/159)
+
+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)
--- 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": {
--- 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,
--- a/package.json
+++ b/package.json
@@ -2,12 +2,12 @@
  "name": "element-desktop",
  "productName": "Element",
  "main": "src/electron-main.js",
-  "version": "1.7.14",
+  "version": "1.7.18",
  "description": "A feature-rich client for Matrix.org",
  "author": "Element",
  "repository": {
    "type": "git",
-    "url": "https://github.com/vector-im/riot-desktop"
+    "url": "https://github.com/vector-im/element-desktop"
  },
  "license": "Apache-2.0",
  "files": [],
@@ -21,7 +21,7 @@
    "build32": "electron-builder --ia32",
    "build64": "electron-builder --x64",
    "build": "electron-builder",
-    "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild",
+    "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
    "docker:build:native": "scripts/in-docker.sh yarn run hak",
    "docker:build": "scripts/in-docker.sh yarn run build",
    "docker:install": "scripts/in-docker.sh yarn install",
@@ -57,12 +57,12 @@
    "tar": "^6.0.1"
  },
  "hakDependencies": {
-    "matrix-seshat": "^2.2.1",
+    "matrix-seshat": "^2.2.3",
    "keytar": "^5.6.0"
  },
  "build": {
    "appId": "im.riot.app",
-    "electronVersion": "10.1.3",
+    "electronVersion": "10.2.0",
    "files": [
      "package.json",
      {
--- a/scripts/fetch-package.js
+++ b/scripts/fetch-package.js
@@ -11,7 +11,7 @@ const needle = require('needle');

 const riotDesktopPackageJson = require('../package.json');

-const PUB_KEY_URL = "https://packages.riot.im/riot-release-key.asc";
+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';

@@ -55,7 +55,7 @@ async function getLatestDevelopUrl(bkToken) {
    let dlUrl;
    let dlFilename;
    for (const artifact of artifactsResult.body) {
-        if (artifact.filename && /^riot-.*\.tar.gz$/.test(artifact.filename)) {
+        if (artifact.filename && /^element-.*\.tar.gz$/.test(artifact.filename)) {
            dlUrl = artifact.download_url;
            dlFilename = artifact.filename;
            break;
@@ -149,7 +149,7 @@ async function main() {

    if (targetVersion === undefined) {
        targetVersion = 'v' + riotDesktopPackageJson.version;
-        filename = 'riot-' + targetVersion + '.tar.gz';
+        filename = 'element-' + targetVersion + '.tar.gz';
        url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
    } else if (targetVersion === 'develop') {
        const buildKiteApiKey = process.env.BUILDKITE_API_KEY;
@@ -164,7 +164,7 @@ async function main() {
        [filename, url] = await getLatestDevelopUrl(buildKiteApiKey);
        verify = false; // develop builds aren't signed
    } else {
-        filename = 'riot-' + targetVersion + '.tar.gz';
+        filename = 'element-' + targetVersion + '.tar.gz';
        url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
        setVersion = true;
    }
--- a/scripts/in-docker.sh
+++ b/scripts/in-docker.sh
@@ -1,8 +1,8 @@
 #!/bin/bash

-docker inspect riot-desktop-dockerbuild 2> /dev/null > /dev/null
+docker inspect element-desktop-dockerbuild 2> /dev/null > /dev/null
 if [ $? != 0 ]; then
-    echo "Docker image riot-desktop-dockerbuild not found. Have you run yarn run docker:setup?"
+    echo "Docker image element-desktop-dockerbuild not found. Have you run yarn run docker:setup?"
    exit 1
 fi

@@ -17,4 +17,4 @@ docker run --rm -ti \
 -v ${PWD}/docker/.gnupg:/root/.gnupg \
 -v ~/.cache/electron:/root/.cache/electron \
 -v ~/.cache/electron-builder:/root/.cache/electron-builder \
- riot-desktop-dockerbuild "$@"
+ element-desktop-dockerbuild "$@"
--- a/scripts/mkrepo.sh
+++ b/scripts/mkrepo.sh
@@ -22,10 +22,10 @@ cp $confdir/conf_distributions $repodir/conf/distributions
 pushd $repodir
 for i in `cat conf/distributions | grep Codename | cut -d ' ' -f 2`
 do
-    reprepro includedeb $i $distdir/riot-desktop_${ver}_amd64.deb
+    reprepro includedeb $i $distdir/element-desktop_${ver}_amd64.deb
 done

-tar cvzf $distdir/riot-desktop_repo_$ver.tar.gz .
+tar cvzf $distdir/element-desktop_repo_$ver.tar.gz .

 popd

--- 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"
Author	SHA1	Message	Date
RiotRobot	70c3446339	v1.7.18	2021-01-26 12:31:13 +00:00
RiotRobot	de0e7483a9	Prepare changelog for v1.7.18	2021-01-26 12:31:13 +00:00
RiotRobot	1cd2ce9d34	v1.7.17	2021-01-18 15:26:16 +00:00
RiotRobot	542e2c6891	Prepare changelog for v1.7.17	2021-01-18 15:26:16 +00:00
J. Ryan Stinnett	03ce222464	Merge pull request #165 from vector-im/bump-seshat-release [Release] package: Bump our seshat version	2021-01-18 10:57:40 +00:00
Damir Jelić	00fd261dc1	package: Bump our seshat version	2021-01-15 13:07:33 +00:00
RiotRobot	cda9f3f190	v1.7.17-rc.1	2021-01-13 13:20:56 +00:00
RiotRobot	2c2addb282	Prepare changelog for v1.7.17-rc.1	2021-01-13 13:20:56 +00:00
J. Ryan Stinnett	19515b614f	Merge pull request #162 from vector-im/bump-seshat package: Bump our Seshat version	2021-01-12 11:48:08 +00:00
Damir Jelić	b646f78897	package: Bump our Seshat version	2021-01-12 12:45:30 +01:00
RiotRobot	8ae1a518fa	Merge branch 'master' into develop	2020-12-21 17:50:26 +00:00
RiotRobot	edea42e30e	v1.7.16	2020-12-21 17:50:09 +00:00
RiotRobot	fafd8fb206	Prepare changelog for v1.7.16	2020-12-21 17:50:09 +00:00
J. Ryan Stinnett	f9e61d09c9	Merge pull request #159 from vector-im/jryans/electron-10.2.0 Upgrade to Electron 10.2.0	2020-12-17 18:53:12 +00:00
J. Ryan Stinnett	974514e2e6	Upgrade to Electron 10.2.0	2020-12-17 12:18:51 +00:00
RiotRobot	b8d0d990bb	v1.7.16-rc.1	2020-12-16 16:47:35 +00:00
RiotRobot	ed1b9247c1	Prepare changelog for v1.7.16-rc.1	2020-12-16 16:47:35 +00:00
J. Ryan Stinnett	d3adfe3777	Merge pull request #158 from vector-im/dependabot/npm_and_yarn/ini-1.3.8 Bump ini from 1.3.5 to 1.3.8	2020-12-14 12:17:45 +00:00
dependabot[bot]	d45007cd1b	Bump ini from 1.3.5 to 1.3.8 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8) Signed-off-by: dependabot[bot] <support@github.com>	2020-12-12 03:11:34 +00:00
RiotRobot	ed00cfada3	Merge branch 'master' into develop	2020-12-07 13:05:07 +00:00
RiotRobot	3a660b2461	v1.7.15	2020-12-07 13:04:50 +00:00
RiotRobot	c6bbff5ffe	Prepare changelog for v1.7.15	2020-12-07 13:04:50 +00:00
J. Ryan Stinnett	fa8aef94af	Merge pull request #157 from vector-im/jryans/add-gitter Add gitter.im to room directory	2020-12-04 11:06:23 +00:00
J. Ryan Stinnett	b7c31f17b5	Add gitter.im to room directory	2020-12-04 11:01:33 +00:00
RiotRobot	d69f2a6d44	v1.7.15-rc.1	2020-12-02 15:07:44 +00:00
J. Ryan Stinnett	c1ed8ab377	Merge pull request #156 from vector-im/jryans/electron-10.x-rollback Revert back to the 10.x series	2020-12-02 12:22:08 +00:00
J. Ryan Stinnett	df1c7f2498	Revert back to the 10.x series The latest 11.x still exhibits https://github.com/vector-im/element-web/issues/15869, so let's try the latest 10.x version instead.	2020-12-02 12:17:03 +00:00
J. Ryan Stinnett	99c13923ea	Merge pull request #155 from vector-im/jryans/electron-11.0.3 Upgrade to Electron 11.0.3	2020-12-01 12:42:52 +00:00
J. Ryan Stinnett	80cb503c48	Upgrade to Electron 11.0.3 We're hoping this may help with frozen window issues in https://github.com/vector-im/element-web/issues/15869.	2020-12-01 12:40:04 +00:00
J. Ryan Stinnett	239bab38ca	Merge pull request #153 from vector-im/jryans/rebrand-packaged-artifact Update branding of packaging artifacts	2020-11-25 11:16:57 +00:00
J. Ryan Stinnett	e952b479ac	Update branding of packaging artifacts This updates the names of various packaging and build artifacts to match current branding. Part of https://github.com/vector-im/element-web/issues/14896	2020-11-24 12:48:37 +00:00
J. Ryan Stinnett	231ac2bbb9	Merge pull request #152 from vector-im/jryans/electron-11.0.1 Upgrade to Electron 11.0.1	2020-11-23 19:00:25 +00:00
J. Ryan Stinnett	0e919f9992	Upgrade to Electron 11.0.1 No breaking changes we need to adjust for as far as I can tell. Tested on macOS only so far, appears to be working.	2020-11-18 16:56:35 +00:00