v1.7.1

Prepare changelog for v1.7.1
Upgrade matrix-js-sdk to 7.1.0
2026-01-03 21:18:12 -05:00 · 2020-07-16 16:12:44 +01:00 · 2020-07-16 16:12:44 +01:00 · 2020-07-16 16:12:07 +01:00 · 2020-07-16 14:07:42 +01:00 · 2020-07-16 08:55:42 +00:00
42 changed files with 385 additions and 285 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+Changes in [1.7.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.7.1) (2020-07-16)
+==============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.7.0...v1.7.1)
+
+ * Bump lodash from 4.17.15 to 4.17.19
+   [\#121](https://github.com/vector-im/riot-desktop/pull/121)
+ * Don't forget nightly when computing userData path
+   [\#120](https://github.com/vector-im/riot-desktop/pull/120)
+ * Fix hosting link
+   [\#119](https://github.com/vector-im/riot-desktop/pull/119)
+ * New macOS icon
+   [\#117](https://github.com/vector-im/riot-desktop/pull/117)
+ * Update README.md
+   [\#118](https://github.com/vector-im/riot-desktop/pull/118)
+ * More icon updates
+   [\#115](https://github.com/vector-im/riot-desktop/pull/115)
+ * Don't forget to yarn install
+   [\#114](https://github.com/vector-im/riot-desktop/pull/114)
+
+Changes in [1.7.0](https://github.com/vector-im/riot-desktop/releases/tag/v1.7.0) (2020-07-15)
+==============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.8...v1.7.0)
+
+ * Fix lint error
+   [\#113](https://github.com/vector-im/riot-desktop/pull/113)
+ * Delabs font-scaling
+   [\#112](https://github.com/vector-im/riot-desktop/pull/112)
+ * Remove room list labs flag from config
+   [\#109](https://github.com/vector-im/riot-desktop/pull/109)
+ * Remove the irc layout setting from labs
+   [\#111](https://github.com/vector-im/riot-desktop/pull/111)
+ * Update npm to ^6.14.6
+   [\#108](https://github.com/vector-im/riot-desktop/pull/108)
+
 Changes in [1.6.8](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.8) (2020-07-03)
 ==============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.8-rc.1...v1.6.8)
--- a/README.md
+++ b/README.md
@@ -1,23 +1,31 @@
-Riot Desktop
-============
+Element Desktop
+===============

-This is Riot desktop app as of release 1.6.
+Element Desktop is a Matrix client for desktop platforms with Element Web at its core.

-Fetching Riot
-=============
-Since this package is just the Electron wrapper for Riot, it doesn't contain any of the Riot code,
-so the first step is to get a working copy of Riot. There are a few ways of doing this:
+First Steps
+===========
+Before you do anything else, fetch the dependencies:

 ```
-# Fetch the prebuilt release Riot package from the riot.im GitHub releases page. The version
-# fetched will be the same as the local riot-desktop package.
-# We're explicitly asking for no config, so the package Riot will have no config.json.
+yarn install
+```
+
+Fetching Element
+================
+Since this package is just the Electron wrapper for Element Web, it doesn't contain any of the Element Web code,
+so the first step is to get a working copy of Element Web. There are a few ways of doing this:
+
+```
+# Fetch the prebuilt release Element package from the riot.im GitHub releases page. The version
+# fetched will be the same as the local element-desktop package.
+# We're explicitly asking for no config, so the packaged Element will have no config.json.
 yarn run fetch --noverify --cfgdir ''
 ```

 ...or if you'd like to use GPG to verify the downloaded package:
 ```
-# Fetch the Riot public key from the riot.im web server over a secure connection and import
+# Fetch the Element public key from the element.io web server over a secure connection and import
 # it into your local GPG keychain (you'll need GPG installed). You only need to to do this
 # once.
 yarn run fetch --importkey
@@ -25,10 +33,10 @@ yarn run fetch --importkey
 yarn run fetch --cfgdir ''
 ```

-...or either of the above, but fetching a specific version of Riot:
+...or either of the above, but fetching a specific version of Element:
 ```
-# Fetch the prebuilt release Riot package from the riot.im GitHub releases page. The version
-# fetched will be the same as the local riot-desktop package.
+# Fetch the prebuilt release Element package from the riot.im GitHub releases page. The version
+# fetched will be the same as the local element-desktop package.
 yarn run fetch --noverify --cfgdir '' v1.5.6
 ```

@@ -44,15 +52,15 @@ ln -s ../riot-web/webapp ./

 Building
 ========
-Now you have a copy of Riot, you're ready to build packages. If you'd just like to
-run Riot locally, skip to the next section.
+Now you have a copy of Element, you're ready to build packages. If you'd just like to
+run Element locally, skip to the next section.

 ```
 yarn run build
 ```
 This will do a couple of things:
 * Run the `setversion` script to set the local package version to match whatever
-   version of Riot you installed above.
+   version of Element you installed above.
 * Run electron-builder to build a package. The package built will match the operating system
   you're running the build process on.

@@ -102,7 +110,7 @@ yarn start

 Config
 ======
-If you'd like the packaged Riot to have a configuration file, you can create a
+If you'd like the packaged Element to have a configuration file, you can create a
 config directory and place `config.json` in there, then specify this directory
 with the `--cfgdir` option to `yarn run fetch`, eg:
 ```
@@ -110,15 +118,15 @@ mkdir myconfig
 cp /path/to/my/config.json myconfig/
 yarn run fetch --cfgdir myconfig
 ```
-The config dir for the official Riot.im app is in `riot.im`. If you use this,
-your app will auto-update itself using builds from Riot.im.
+The config dir for the official Element.im app is in `riot.im`. If you use this,
+your app will auto-update itself using builds from element.io.

 Profiles
 ========

 To run multiple instances of the desktop app for different accounts, you can
 launch the executable with the `--profile` argument followed by a unique
-identifier, e.g `riot-desktop --profile Work` for it to run a separate profile and
+identifier, e.g `element-desktop --profile Work` for it to run a separate profile and
 not interfere with the default one.

 Alternatively, a custom location for the profile data can be specified using the
@@ -131,5 +139,14 @@ User-specified config.json
 + `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
 + `~/Library/Application Support/$NAME/config.json` on macOS

-In the paths above, `$NAME` is typically `Riot`, unless you use `--profile
-$PROFILE` in which case it becomes `Riot-$PROFILE`.
+In the paths above, `$NAME` is typically `Element`, unless you use `--profile
+$PROFILE` in which case it becomes `Element-$PROFILE`, or it is using one of
+the above created by a pre-1.7 install, in which case it will be `Riot` or
+`Riot-$PROFILE`.
+
+Report bugs & give feedback
+==========================
+
+If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.
+
+To help avoid duplicate issues, please [view existing issues](https://github.com/vector-im/riot-web/issues?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc) first (and add a +1) or [create a new issue](https://github.com/vector-im/riot-web/issues/new) if you can't find it.  Please note that this issue tracker is associated with the [Riot-Web](https://github.com/vector-im/riot-web) repo, but is also applied to the code in this repo as well.
--- a/build/icon.icns
+++ b/build/icon.icns
--- a/build/icon.ico
+++ b/build/icon.ico
--- a/build/icons/128x128.png
+++ b/build/icons/128x128.png
--- a/build/icons/16x16.png
+++ b/build/icons/16x16.png
--- a/build/icons/24x24.png
+++ b/build/icons/24x24.png
--- a/build/icons/256x256.png
+++ b/build/icons/256x256.png
--- a/build/icons/48x48.png
+++ b/build/icons/48x48.png
--- a/build/icons/512x512.png
+++ b/build/icons/512x512.png
--- a/build/icons/64x64.png
+++ b/build/icons/64x64.png
--- a/build/icons/96x96.png
+++ b/build/icons/96x96.png
--- a/build/install-spinner.gif
+++ b/build/install-spinner.gif
--- a/build/rebrand_stub/rebrand_stub.c
+++ b/build/rebrand_stub/rebrand_stub.c
@@ -0,0 +1,51 @@
+#include <windows.h>
+#include <stdio.h>
+#include <string.h>
+#include <tchar.h>
+
+/*
+ * This just runs 'Element (Riot).exe' with the same args as
+ * this process was invoked with. This gets around the fact that
+ * squirrel always tries to run an executable with the same name,
+ * so fails to restart if the app's name has changed.
+ */
+void _tmain( int argc, TCHAR *argv[] )
+{
+    LPSTR myCmdLine = GetCommandLineA();
+    char cmdLine[32767];
+
+    LPSTR cmdLinePos = cmdLine;
+    LPSTR toRun = "\"Element (Riot).exe\" ";
+    strncpy(cmdLinePos, toRun, strlen(toRun));
+    cmdLinePos += strlen(toRun);
+
+    if (myCmdLine[0] == '"') ++myCmdLine;
+    myCmdLine += strlen(argv[0]);
+    if (myCmdLine[0] == '"') ++myCmdLine;
+    if (myCmdLine[0] == ' ') ++myCmdLine;
+
+    strncpy(cmdLinePos, myCmdLine, (cmdLine + 32767) - cmdLinePos);
+
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    ZeroMemory(&pi, sizeof(pi));
+
+    if (!CreateProcess(NULL,
+        cmdLine,        // Command line
+        NULL,           // Process handle not inheritable
+        NULL,           // Thread handle not inheritable
+        FALSE,          // Set handle inheritance to FALSE
+        0,              // No creation flags
+        NULL,           // Use parent's environment block
+        NULL,           // Use parent's starting directory 
+        &si,            // Pointer to STARTUPINFO structure
+        &pi )           // Pointer to PROCESS_INFORMATION structure
+    ) 
+    {
+        printf("CreateProcess failed (%d).\n", GetLastError());
+        return;
+    }
+}
--- a/build/rebrand_stub/rebrand_stub.exe
+++ b/build/rebrand_stub/rebrand_stub.exe
--- a/element.io/New_Vector_Ltd.pem
+++ b/element.io/New_Vector_Ltd.pem
--- a/element.io/README
+++ b/element.io/README
@@ -0,0 +1,6 @@
+This directory contains the config file for the official element.io distribution
+of Element Desktop.
+
+You probably do not want to build with this config unless you're building the
+official element.io distribution, or you'll find your builds will replace
+themselves with the element.io build.
--- a/element.io/nightly/config.json
+++ b/element.io/nightly/config.json
@@ -1,7 +1,7 @@
 {
    "update_base_url": "https://packages.riot.im/nightly/update/",
    "default_server_name": "matrix.org",
-    "brand": "Riot Nightly",
+    "brand": "Element Nightly",
    "integrations_ui_url": "https://scalar-staging.vector.im/",
    "integrations_rest_url": "https://scalar-staging.vector.im/api",
    "integrations_widgets_urls": [
@@ -11,7 +11,7 @@
        "https://scalar-staging.vector.im/api",
        "https://scalar-staging.riot.im/scalar/api"
    ],
-    "hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "features": {
        "feature_new_spinner": "labs",
@@ -24,10 +24,7 @@
        "feature_dm_verification": "labs",
        "feature_bridge_state": "labs",
        "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs",
-        "feature_new_room_list": "labs",
-        "feature_irc_ui": "labs",
-        "feature_font_scaling": "labs"
+        "feature_custom_themes": "labs"
    },
    "piwik": {
        "url": "https://piwik.riot.im/",
--- a/element.io/nightly/control.template
+++ b/element.io/nightly/control.template
@@ -1,11 +1,11 @@
-Package: riot-nightly
+Package: element-nightly
 License: Apache-2.0
-Vendor: support@riot.im
+Vendor: support@element.io
 Architecture: amd64
-Maintainer: support@riot.im
+Maintainer: support@element.io
 Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, libsqlcipher0
 Section: net
 Priority: extra
-Homepage: https://riot.im/
+Homepage: https://element.io/
 Description: 
-  A feature-rich client for Matrix.org (nightly unstable build).
+ riot.im A feature-rich client for Matrix.org (nightly unstable build).
--- a/element.io/nightly/riot-nightly_2020071502_all/DEBIAN/control
+++ b/element.io/nightly/riot-nightly_2020071502_all/DEBIAN/control
@@ -0,0 +1,9 @@
+Package: riot-nightly
+Version: 2020071502
+Depends: element-nightly
+Maintainer: packages@element.io
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
--- a/element.io/release/conf_distributions
+++ b/element.io/release/conf_distributions
--- a/element.io/release/config.json
+++ b/element.io/release/config.json
@@ -1,7 +1,7 @@
 {
    "update_base_url": "https://packages.riot.im/desktop/update/",
    "default_server_name": "matrix.org",
-    "brand": "Riot",
+    "brand": "Element",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
    "integrations_widgets_urls": [
@@ -11,7 +11,7 @@
        "https://scalar-staging.vector.im/api",
        "https://scalar-staging.riot.im/scalar/api"
    ],
-    "hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "roomDirectory": {
        "servers": [
--- a/element.io/release/control.template
+++ b/element.io/release/control.template
@@ -1,13 +1,13 @@
-Package: riot-desktop
+Package: element-desktop
 License: Apache-2.0
-Vendor: support@riot.im
+Vendor: support@element.io
 Architecture: amd64
-Maintainer: support@riot.im
+Maintainer: support@element.io
 Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, libsqlcipher0
-Provides: riot-web
-Replaces: riot-web
+Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
+Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
 Section: net
 Priority: extra
-Homepage: https://riot.im/
+Homepage: https://element.io/
 Description: 
  A feature-rich client for Matrix.org
--- a/element.io/release/riot-desktop_1.7.0_all/DEBIAN/control
+++ b/element.io/release/riot-desktop_1.7.0_all/DEBIAN/control
@@ -0,0 +1,9 @@
+Package: riot-desktop
+Version: 1.7.0
+Depends: element-desktop
+Maintainer: packages@element.io
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "riot-desktop",
-  "productName": "Riot",
+  "name": "element-desktop",
+  "productName": "Element (Riot)",
  "main": "src/electron-main.js",
-  "version": "1.6.8",
+  "version": "1.7.1",
  "description": "A feature-rich client for Matrix.org",
-  "author": "New Vector Ltd.",
+  "author": "Element",
  "repository": {
    "type": "git",
    "url": "https://github.com/vector-im/riot-desktop"
@@ -52,7 +52,7 @@
    "mkdirp": "^1.0.3",
    "needle": "^2.5.0",
    "node-pre-gyp": "^0.15.0",
-    "npm": "^6.13.7",
+    "npm": "^6.14.6",
    "rimraf": "^3.0.2",
    "semver": "^7.1.3",
    "tar": "^6.0.1"
@@ -82,9 +82,9 @@
    "linux": {
      "target": "deb",
      "category": "Network;InstantMessaging;Chat",
-      "maintainer": "support@riot.im",
+      "maintainer": "support@element.io",
      "desktop": {
-        "StartupWMClass": "riot"
+        "StartupWMClass": "element"
      }
    },
    "mac": {
@@ -100,12 +100,13 @@
    "directories": {
      "output": "dist"
    },
+    "afterPack": "scripts/electron_afterPack",
    "afterSign": "scripts/electron_afterSign",
    "protocols": [
      {
-        "name": "riot",
+        "name": "element",
        "schemes": [
-          "riot"
+          "element"
        ]
      }
    ]
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Script to perform a release of riot-desktop.
+# Script to perform a release of element-desktop.
 #
 # Requires githib-changelog-generator; to install, do 
 #   pip install git+https://github.com/matrix-org/github-changelog-generator.git
--- a/res/img/element.ico
+++ b/res/img/element.ico
--- a/res/img/element.png
+++ b/res/img/element.png
--- a/res/img/riot.ico
+++ b/res/img/riot.ico
--- a/res/img/riot.png
+++ b/res/img/riot.png
--- a/riot.im/README
+++ b/riot.im/README
@@ -1,6 +0,0 @@
-This directory contains the config file for the official riot.im distribution
-of Riot Desktop.
-
-You probably do not want to build with this config unless you're building the
-official riot.im distribution, or you'll find your builds will replace
-themselves with the riot.im build.
--- a/scripts/electron-package.sh
+++ b/scripts/electron-package.sh
@@ -1,170 +0,0 @@
-#!/bin/bash
-
-usage() {
-    echo "Usage: $0 -v <version> -d <config directory> [-n]"
-    echo
-    echo "version: commit-ish to check out and build"
-    echo "config directory: a path to a directory containing"
-    echo "config.json, a json config file to ship with the build"
-    echo "and env.sh, a file to source environment variables"
-    echo "from."
-    echo "-n: build with no config file."
-    echo
-    echo "The update_base_url value from config.json is used to set up auto-update."
-    echo
-    echo "Environment variables:"
-    echo "   OSSLSIGNCODE_SIGNARGS: Arguments to pass to osslsigncode when signing"
-    echo "   NOTARIZE_APPLE_ID: Apple ID to use for notarisation. The password for"
-    echo "   this account must be set in NOTARIZE_CREDS in the keychain."
-}
-
-confdir=
-version=
-skipcfg=0
-while getopts "d:v:n" opt; do
-    case $opt in
-        d)
-            confdir=$OPTARG
-            ;;
-        v)
-            version=$OPTARG
-            ;;
-        n)
-            skipcfg=1
-            ;;
-        \?)
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            exit
-            ;;
-    esac
-done
-
-if [ -z "$version" ]; then
-    echo "No version supplied"
-    usage
-    exit
-fi
-
-conffile="$confdir/config.json"
-
-if [ -z "$conffile" ] && [ "$skipcfg" = 0 ]; then
-    echo "No config file given. Use -c to supply a config file or"
-    echo "-n to build with no config file (and no auto update)."
-    exit
-fi
-
-if [ -n "$conffile" ]; then
-    update_base_url=`jq -r .update_base_url $conffile`
-
-    if [ -z "$update_base_url" ]; then
-        echo "No update URL supplied. Use update_base_url: null if you really"
-        echo "want a build with no auto-update."
-        usage
-        exit
-    fi
-    # Make sure the base URL ends in a slash if it doesn't already
-    update_base_url=`echo $update_base_url | sed -e 's#\([^\/]\)$#\1\/#'`
-fi
-
-if [ ! -f package.json ]; then
-    echo "No package.json found. This script must be run from"
-    echo "the riot-web directory."
-    exit
-fi
-
-[ -f "$confdir/env.sh" ] && . "$confdir/env.sh"
-
-if [ -z "$NOTARIZE_APPLE_ID" ]; then
-    echo "NOTARIZE_APPLE_ID is not set"
-    exit
-fi
-
-osslsigncode -h 2> /dev/null
-if [ $? -ne 255 ]; then # osslsigncode exits with 255 after printing usage...
-    echo "osslsigncode not found"
-    exit
-fi
-
-# Test that altool can get its credentials for notarising the mac app
-xcrun altool -u "$NOTARIZE_APPLE_ID" -p '@keychain:NOTARIZE_CREDS' --list-apps || exit
-
-# Get the token password: we'll need it later, but get it now so we fail early if it's not there
-token_password=`security find-generic-password -s riot_signing_token -w`
-if [ $? -ne 0 ]; then
-    echo "riot_signing_token not found in keychain"
-    exit
-fi
-
-set -e
-
-echo "Building $version using Update base URL $update_base_url"
-
-projdir=`pwd`
-builddir=`mktemp -d 2>/dev/null || mktemp -d -t 'buildtmp'`
-pushd "$builddir"
-
-git clone "$projdir" .
-git checkout "$version"
-
-# Figure out what version we're building
-vername=`jq -r .version package.json`
-
-if [ -n "$conffile" ]; then
-    popd
-    cp "$conffile" "$builddir/"
-    pushd "$builddir"
-fi
-
-# We use Git branch / commit dependencies for some packages, and Yarn seems
-# to have a hard time getting that right. See also
-# https://github.com/yarnpkg/yarn/issues/4734. As a workaround, we clean the
-# global cache here to ensure we get the right thing.
-yarn cache clean
-yarn install
-yarn build:electron
-
-popd
-
-distdir="$builddir/electron_app/dist"
-pubdir="$projdir/electron_app/pub"
-rm -r "$pubdir" || true
-mkdir -p "$pubdir"
-rm -r "$projdir/electron_app/dist" || true
-mkdir -p "$projdir/electron_app/dist"
-
-# Install packages: what the user downloads the first time,
-# (DMGs for mac, exe installer for windows)
-mkdir -p "$pubdir/install/macos"
-cp $distdir/*.dmg "$pubdir/install/macos/"
-
-mkdir -p "$pubdir/install/win32/ia32/"
-cp $distdir/squirrel-windows-ia32/*.exe "$pubdir/install/win32/ia32/"
-
-mkdir -p "$pubdir/install/win32/x64/"
-cp $distdir/squirrel-windows/*.exe "$pubdir/install/win32/x64/"
-
-# Packages for auto-update
-mkdir -p "$pubdir/update/macos"
-cp $distdir/*-mac.zip "$pubdir/update/macos/"
-echo "$vername" > "$pubdir/update/macos/latest"
-
-mkdir -p "$pubdir/update/win32/ia32/"
-cp $distdir/squirrel-windows-ia32/*.nupkg "$pubdir/update/win32/ia32/"
-cp $distdir/squirrel-windows-ia32/RELEASES "$pubdir/update/win32/ia32/"
-
-mkdir -p "$pubdir/update/win32/x64/"
-cp $distdir/squirrel-windows/*.nupkg "$pubdir/update/win32/x64/"
-cp $distdir/squirrel-windows/RELEASES "$pubdir/update/win32/x64/"
-
-# Move the deb to the main project dir's dist folder
-# (just the 64 bit one - the 32 bit one still gets built because
-# it's one arch argument for all platforms and we still want 32 bit
-# windows, but 32 bit linux is unsupported as of electron 4 and no
-# longer appears to work).
-cp $distdir/*_amd64.deb "$projdir/electron_app/dist/"
-
-rm -rf "$builddir"
-
-echo "$pubdir can now be hosted on your web server."
-echo "deb archives are in electron_app/dist/ - these should be added into your debian repository"
--- a/scripts/electron_afterPack.js
+++ b/scripts/electron_afterPack.js
@@ -0,0 +1,15 @@
+const fsProm = require('fs').promises;
+const path = require('path');
+
+exports.default = async function(context) {
+    const { electronPlatformName, appOutDir } = context;
+
+    // Squirrel windows will try to relaunch the app using an executable of the same name as
+    // before in the new version, so will fail if the executable is now called something else.
+    // We add a fake Riot.exe that it can run which runs the real one.
+    // This also gets signed automatically, presumably because electron-build just looks for all
+    // exe files and signs them all...
+    if (electronPlatformName === 'win32') {
+        await fsProm.copyFile('build/rebrand_stub/rebrand_stub.exe', path.join(appOutDir, "Riot.exe"));
+    }
+};
--- a/scripts/electron_winSign.js
+++ b/scripts/electron_winSign.js
@@ -24,7 +24,7 @@ function computeSignToolArgs(options, keyContainer) {
    // so we don't have to hard-code this here
    // fwiw https://stackoverflow.com/questions/17927895/automate-extended-validation-ev-code-signing
    // is about the most useful resource on automating code signing...
-    args.push('/f', 'riot.im\\New_Vector_Ltd.pem');
+    args.push('/f', 'element.io\\New_Vector_Ltd.pem');

    if (options.hash !== "sha1") {
        args.push("/fd", options.hash);
--- a/scripts/hak/README.md
+++ b/scripts/hak/README.md
@@ -1,7 +1,7 @@
 hak
 ===

-This tool builds native dependencies for riot-desktop. Here follows some very minimal
+This tool builds native dependencies for element-desktop. Here follows some very minimal
 documentation for it.

 Goals:
--- a/src/electron-main.js
+++ b/src/electron-main.js
@@ -99,15 +99,45 @@ if (argv["help"]) {
    app.exit();
 }

+// Electron creates the user data directory (with just an empty 'Dictionaries' directory...)
+// as soon as the app path is set, so pick a random path in it that must exist if it's a
+// real user data directory.
+function isRealUserDataDir(d) {
+    return fs.existsSync(path.join(d, 'IndexedDB'));
+}
+
 // check if we are passed a profile in the SSO callback url
+let userDataPath;
+
 const userDataPathInProtocol = getProfileFromDeeplink(argv["_"]);
 if (userDataPathInProtocol) {
-    app.setPath('userData', userDataPathInProtocol);
+    userDataPath = userDataPathInProtocol;
 } else if (argv['profile-dir']) {
-    app.setPath('userData', argv['profile-dir']);
-} else if (argv['profile']) {
-    app.setPath('userData', `${app.getPath('userData')}-${argv['profile']}`);
+    userDataPath = argv['profile-dir'];
+} else {
+    // strip the bracketed riot suffix from the app name, if any: we don't want to
+    // store user data in a dir with that transitional suffix.
+    const appName = app.getName().replace(' (Riot)', '');
+
+    // always override the user data path because electron uses the ${appData}/productName
+    // but we want our productName to be "Element (Riot)" for a transition period after the rename.
+    let newUserDataPath = path.join(app.getPath('appData'), appName);
+    if (argv['profile']) {
+        newUserDataPath += '-' + argv['profile'];
+    }
+    const newUserDataPathExists = isRealUserDataDir(newUserDataPath);
+    const oldUserDataPath = path.join(app.getPath('appData'), appName.replace('Element', 'Riot'));
+    const oldUserDataPathExists = isRealUserDataDir(oldUserDataPath);
+    console.log(newUserDataPath + " exists: " + (newUserDataPathExists ? 'yes' : 'no'));
+    console.log(oldUserDataPath + " exists: " + (oldUserDataPathExists ? 'yes' : 'no'));
+    if (!newUserDataPathExists && oldUserDataPathExists) {
+        console.log("Using legacy user data path: " + oldUserDataPath);
+        userDataPath = oldUserDataPath;
+    } else {
+        userDataPath = newUserDataPath;
+    }
 }
+app.setPath('userData', userDataPath);

 async function tryPaths(name, root, rawPaths) {
    // Make everything relative to root
@@ -182,16 +212,16 @@ async function setupGlobals() {

    // The tray icon
    // It's important to call `path.join` so we don't end up with the packaged asar in the final path.
-    const iconFile = `riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
+    const iconFile = `element.${process.platform === 'win32' ? 'ico' : 'png'}`;
    iconPath = path.join(resPath, "img", iconFile);
    trayConfig = {
        icon_path: iconPath,
-        brand: vectorConfig.brand || 'Riot',
+        brand: vectorConfig.brand || 'Element',
    };

    // launcher
    launcher = new AutoLaunch({
-        name: vectorConfig.brand || 'Riot',
+        name: vectorConfig.brand || 'Element',
        isHidden: true,
        mac: {
            useLaunchAgent: true,
@@ -199,6 +229,25 @@ async function setupGlobals() {
    });
 }

+async function moveAutoLauncher() {
+    // Look for an auto-launcher under 'Riot' and if we find one, port it's
+    // enabled/disbaledp-ness over to the new 'Element' launcher
+    if (!vectorConfig.brand || vectorConfig.brand === 'Element') {
+        const oldLauncher = new AutoLaunch({
+            name: 'Riot',
+            isHidden: true,
+            mac: {
+                useLaunchAgent: true,
+            },
+        });
+        const wasEnabled = await oldLauncher.isEnabled();
+        if (wasEnabled) {
+            await oldLauncher.disable();
+            await launcher.enable();
+        }
+    }
+}
+
 const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
 const store = new Store({ name: "electron-config" });

@@ -377,7 +426,12 @@ ipcMain.on('ipcCall', async function(ev, payload) {

        case 'getPickleKey':
            try {
-                ret = await keytar.getPassword("riot.im", `${args[0]}|${args[1]}`);
+                ret = await keytar.getPassword("element.io", `${args[0]}|${args[1]}`);
+                // migrate from riot.im (remove once we think there will no longer be
+                // logins from the time of riot.im)
+                if (ret === null) {
+                    ret = await keytar.getPassword("riot.im", `${args[0]}|${args[1]}`);
+                }
            } catch (e) {
                // if an error is thrown (e.g. keytar can't connect to the keychain),
                // then return null, which means the default pickle key will be used
@@ -397,7 +451,7 @@ ipcMain.on('ipcCall', async function(ev, payload) {
                    });
                });
                const pickleKey = randomArray.toString("base64").replace(/=+$/g, '');
-                await keytar.setPassword("riot.im", `${args[0]}|${args[1]}`, pickleKey);
+                await keytar.setPassword("element.io", `${args[0]}|${args[1]}`, pickleKey);
                ret = pickleKey;
            } catch (e) {
                ret = null;
@@ -406,6 +460,9 @@ ipcMain.on('ipcCall', async function(ev, payload) {

        case 'destroyPickleKey':
            try {
+                await keytar.deletePassword("element.io", `${args[0]}|${args[1]}`);
+                // migrate from riot.im (remove once we think there will no longer be
+                // logins from the time of riot.im)
                await keytar.deletePassword("riot.im", `${args[0]}|${args[1]}`);
            } catch (e) {}
            break;
@@ -711,6 +768,7 @@ app.enableSandbox();
 app.on('ready', async () => {
    try {
        await setupGlobals();
+        await moveAutoLauncher();
    } catch (e) {
        console.log("App setup failed: exiting", e);
        process.exit(1);
@@ -909,4 +967,4 @@ app.on('second-instance', (ev, commandLine, workingDirectory) => {
 // installer uses for the shortcut icon.
 // This makes notifications work on windows 8.1 (and is
 // a noop on other platforms).
-app.setAppUserModelId('com.squirrel.riot-web.Riot');
+app.setAppUserModelId('com.squirrel.element-desktop.Element');
--- a/src/protocol.js
+++ b/src/protocol.js
@@ -18,8 +18,8 @@ const {app} = require("electron");
 const path = require("path");
 const fs = require("fs");

-const PROTOCOL = "riot://";
-const SEARCH_PARAM = "riot-desktop-ssoid";
+const PROTOCOL = "element://";
+const SEARCH_PARAM = "element-desktop-ssoid";
 const STORE_FILE_NAME = "sso-sessions.json";

 // we getPath userData before electron-main changes it, so this is the default value
@@ -61,10 +61,10 @@ module.exports = {
    },
    getProfileFromDeeplink: (args) => {
        // check if we are passed a profile in the SSO callback url
-        const deeplinkUrl = args.find(arg => arg.startsWith('riot://'));
+        const deeplinkUrl = args.find(arg => arg.startsWith('element://'));
        if (deeplinkUrl && deeplinkUrl.includes(SEARCH_PARAM)) {
            const parsedUrl = new URL(deeplinkUrl);
-            if (parsedUrl.protocol === 'riot:') {
+            if (parsedUrl.protocol === 'element:') {
                const ssoID = parsedUrl.searchParams.get(SEARCH_PARAM);
                const store = readStore();
                console.log("Forwarding to profile: ", store[ssoID]);
@@ -78,10 +78,10 @@ module.exports = {
        // --profile/--profile-dir are passed via the SEARCH_PARAM var in the callback url
        const args = process.argv.slice(1).filter(arg => arg !== "--hidden" && arg !== "-hidden");
        if (app.isPackaged) {
-            app.setAsDefaultProtocolClient('riot', process.execPath, args);
+            app.setAsDefaultProtocolClient('element', process.execPath, args);
        } else if (process.platform === 'win32') { // on Mac/Linux this would just cause the electron binary to open
            // special handler for running without being packaged, e.g `electron .` by passing our app path to electron
-            app.setAsDefaultProtocolClient('riot', process.execPath, [app.getAppPath(), ...args]);
+            app.setAsDefaultProtocolClient('element', process.execPath, [app.getAppPath(), ...args]);
        }

        if (process.platform === 'darwin') {
--- a/src/squirrelhooks.js
+++ b/src/squirrelhooks.js
@@ -17,17 +17,20 @@ limitations under the License.
 const path = require('path');
 const spawn = require('child_process').spawn;
 const {app} = require('electron');
+const fsProm = require('fs').promises;

-function runUpdateExe(args, done) {
+function runUpdateExe(args) {
    // Invokes Squirrel's Update.exe which will do things for us like create shortcuts
    // Note that there's an Update.exe in the app-x.x.x directory and one in the parent
    // directory: we need to run the one in the parent directory, because it discovers
    // information about the app by inspecting the directory it's run from.
    const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');
    console.log(`Spawning '${updateExe}' with args '${args}'`);
-    spawn(updateExe, args, {
-      detached: true,
-    }).on('close', done);
+    return new Promise(resolve => {
+        spawn(updateExe, args, {
+          detached: true,
+        }).on('close', resolve);
+    });
 }

 function checkSquirrelHooks() {
@@ -36,10 +39,29 @@ function checkSquirrelHooks() {
    const cmd = process.argv[1];
    const target = path.basename(process.execPath);
    if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
-        runUpdateExe(['--createShortcut=' + target + ''], app.quit);
+        Promise.resolve().then(() => {
+            return runUpdateExe(['--createShortcut=' + target]);
+        }).then(() => {
+            // remove the old 'Riot' shortcuts, if they exist (update.exe --removeShortcut doesn't work
+            // because it always uses the name of the product as the name of the shortcut: the only variable
+            // is what executable you're linking to)
+            const appDataDir = process.env.APPDATA;
+            if (!appDataDir) return;
+            const startMenuDir = path.join(
+                appDataDir, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'New Vector Ltd',
+            );
+            return fsProm.rmdir(startMenuDir, { recursive: true });
+        }).then(() => {
+            const oldDesktopShortcut = path.join(app.getPath('desktop'), 'Riot.lnk');
+            return fsProm.unlink(oldDesktopShortcut).catch(() => {});
+        }).then(() => {
+            app.quit();
+        });
        return true;
    } else if (cmd === '--squirrel-uninstall') {
-        runUpdateExe(['--removeShortcut=' + target + ''], app.quit);
+        runUpdateExe(['--removeShortcut=' + target]).then(() => {
+            app.quit();
+        });
        return true;
    } else if (cmd === '--squirrel-obsolete') {
        app.quit();
--- a/src/tray.js
+++ b/src/tray.js
@@ -88,7 +88,7 @@ exports.create = function(config) {
        // Windows likes ico's too much.
        if (process.platform === 'win32') {
            try {
-                const icoPath = path.join(app.getPath('temp'), 'win32_riot_icon.ico');
+                const icoPath = path.join(app.getPath('temp'), 'win32_element_icon.ico');
                fs.writeFileSync(icoPath, await pngToIco(newFavicon.toPNG()));
                newFavicon = nativeImage.createFromPath(icoPath);
            } catch (e) {
--- a/src/vectormenu.js
+++ b/src/vectormenu.js
@@ -62,8 +62,8 @@ const template = [
        role: 'help',
        submenu: [
            {
-                label: 'Riot Help',
-                click() { shell.openExternal('https://about.riot.im/help'); },
+                label: 'Element Help',
+                click() { shell.openExternal('https://element.io/help'); },
            },
        ],
    },
--- a/src/webcontents-handler.js
+++ b/src/webcontents-handler.js
@@ -57,7 +57,7 @@ function onLinkContextMenu(ev, params) {
        // Avoid showing a context menu for app icons
        if (params.hasImageContents) return;
        // Rewrite URL so that it can be used outside of the app
-        url = "https://riot.im/app/" + url.substring(23);
+        url = "https://app.element.io/" + url.substring(23);
    }

    const popupMenu = new Menu();
--- a/yarn.lock
+++ b/yarn.lock
@@ -703,7 +703,7 @@ chardet@^0.7.0:
  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==

-chownr@^1.1.1, chownr@^1.1.2:
+chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.4:
  version "1.1.4"
  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -1956,11 +1956,16 @@ got@^9.6.0:
    to-readable-stream "^1.0.0"
    url-parse-lax "^3.0.0"

-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2:
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==

+graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
 har-schema@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -2006,11 +2011,16 @@ has@^1.0.1, has@^1.0.3:
  dependencies:
    function-bind "^1.1.1"

-hosted-git-info@^2.1.4, hosted-git-info@^2.7.1, hosted-git-info@^2.8.5:
+hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
  version "2.8.5"
  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==

+hosted-git-info@^2.8.8:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
 hosted-git-info@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz#be4973eb1fd2737b11c9c7c19380739bb249f60d"
@@ -2834,9 +2844,9 @@ lodash.without@~4.4.0:
  integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=

 lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
+  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==

 loglevel@^1.6.4:
  version "1.6.6"
@@ -3054,14 +3064,14 @@ mississippi@^3.0.0:
    stream-each "^1.1.0"
    through2 "^2.0.0"

-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
  dependencies:
    minimist "0.0.8"

-mkdirp@^0.5.3:
+mkdirp@^0.5.3, mkdirp@^0.5.5:
  version "0.5.5"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -3133,7 +3143,7 @@ node-fetch-npm@^2.0.2:
    json-parse-better-errors "^1.0.0"
    safe-buffer "^5.1.1"

-node-gyp@^5.0.2, node-gyp@^5.0.7:
+node-gyp@^5.0.2:
  version "5.1.0"
  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.0.tgz#8e31260a7af4a2e2f994b0673d4e0b3866156332"
  integrity sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==
@@ -3150,6 +3160,23 @@ node-gyp@^5.0.2, node-gyp@^5.0.7:
    tar "^4.4.12"
    which "^1.3.1"

+node-gyp@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
+  integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.2"
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.1.2"
+    request "^2.88.0"
+    rimraf "^2.6.3"
+    semver "^5.7.1"
+    tar "^4.4.12"
+    which "^1.3.1"
+
 node-pre-gyp@^0.15.0:
  version "0.15.0"
  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087"
@@ -3166,7 +3193,7 @@ node-pre-gyp@^0.15.0:
    semver "^5.3.0"
    tar "^4.4.2"

-nopt@^4.0.1, nopt@~4.0.1:
+nopt@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
@@ -3174,6 +3201,14 @@ nopt@^4.0.1, nopt@~4.0.1:
    abbrev "1"
    osenv "^0.1.4"

+nopt@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
  version "2.5.0"
  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -3255,7 +3290,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
    semver "^5.6.0"
    validate-npm-package-name "^3.0.0"

-npm-packlist@^1.1.12, npm-packlist@^1.1.6, npm-packlist@^1.4.7:
+npm-packlist@^1.1.12, npm-packlist@^1.1.6, npm-packlist@^1.4.8:
  version "1.4.8"
  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
@@ -3282,7 +3317,16 @@ npm-profile@^4.0.2:
    figgy-pudding "^3.4.1"
    npm-registry-fetch "^4.0.0"

-npm-registry-fetch@^4.0.0, npm-registry-fetch@^4.0.2:
+npm-profile@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.4.tgz#28ee94390e936df6d084263ee2061336a6a1581b"
+  integrity sha512-Ta8xq8TLMpqssF0H60BXS1A90iMoM6GeKwsmravJ6wYjWwSzcYBTdyWa3DZCYqPutacBMEm7cxiOkiIeCUAHDQ==
+  dependencies:
+    aproba "^1.1.2 || 2"
+    figgy-pudding "^3.4.1"
+    npm-registry-fetch "^4.0.0"
+
+npm-registry-fetch@^4.0.0:
  version "4.0.2"
  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz#2b1434f93ccbe6b6385f8e45f45db93e16921d7a"
  integrity sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==
@@ -3295,6 +3339,19 @@ npm-registry-fetch@^4.0.0, npm-registry-fetch@^4.0.2:
    npm-package-arg "^6.1.0"
    safe-buffer "^5.2.0"

+npm-registry-fetch@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz#cb87cf7f25bfb048d6c3ee19d115bebf93ea5bfa"
+  integrity sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    npm-package-arg "^6.1.0"
+    safe-buffer "^5.2.0"
+
 npm-run-path@^2.0.0:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -3307,10 +3364,10 @@ npm-user-validate@~1.0.0:
  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
  integrity sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=

-npm@^6.13.7:
-  version "6.13.7"
-  resolved "https://registry.yarnpkg.com/npm/-/npm-6.13.7.tgz#9533a3ddc57f9792db8a8b303efabaf878047841"
-  integrity sha512-X967EKTT407CvgrWFjXusnPh0VLERcmR9hZFSVgkEquOomZkvpwLJ5zrQ3qrG9SpPLKJE4bPLUu76exKQ4a3Cg==
+npm@^6.14.6:
+  version "6.14.6"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-6.14.6.tgz#1a81ce1fac2bf5457dbf6342ceed503627ff228f"
+  integrity sha512-axnz6iHFK6WPE0js/+mRp+4IOwpHn5tJEw5KB6FiCU764zmffrhsYHbSHi2kKqNkRBt53XasXjngZfBD3FQzrQ==
  dependencies:
    JSONStream "^1.3.5"
    abbrev "~1.1.1"
@@ -3323,7 +3380,7 @@ npm@^6.13.7:
    byte-size "^5.0.1"
    cacache "^12.0.3"
    call-limit "^1.1.1"
-    chownr "^1.1.3"
+    chownr "^1.1.4"
    ci-info "^2.0.0"
    cli-columns "^3.1.2"
    cli-table3 "^0.5.1"
@@ -3339,10 +3396,10 @@ npm@^6.13.7:
    fs-vacuum "~1.2.10"
    fs-write-stream-atomic "~1.0.10"
    gentle-fs "^2.3.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.3"
+    glob "^7.1.6"
+    graceful-fs "^4.2.4"
    has-unicode "~2.0.1"
-    hosted-git-info "^2.8.5"
+    hosted-git-info "^2.8.8"
    iferr "^1.0.2"
    infer-owner "^1.0.4"
    inflight "~1.0.6"
@@ -3370,20 +3427,20 @@ npm@^6.13.7:
    lru-cache "^5.1.1"
    meant "~1.0.1"
    mississippi "^3.0.0"
-    mkdirp "~0.5.1"
+    mkdirp "^0.5.5"
    move-concurrently "^1.0.1"
-    node-gyp "^5.0.7"
-    nopt "~4.0.1"
+    node-gyp "^5.1.0"
+    nopt "^4.0.3"
    normalize-package-data "^2.5.0"
    npm-audit-report "^1.3.2"
    npm-cache-filename "~1.0.2"
    npm-install-checks "^3.0.2"
    npm-lifecycle "^3.1.4"
    npm-package-arg "^6.1.1"
-    npm-packlist "^1.4.7"
+    npm-packlist "^1.4.8"
    npm-pick-manifest "^3.0.2"
-    npm-profile "^4.0.2"
-    npm-registry-fetch "^4.0.2"
+    npm-profile "^4.0.4"
+    npm-registry-fetch "^4.0.5"
    npm-user-validate "~1.0.0"
    npmlog "~4.1.2"
    once "~1.4.0"
@@ -3400,11 +3457,11 @@ npm@^6.13.7:
    read-installed "~4.0.3"
    read-package-json "^2.1.1"
    read-package-tree "^5.3.1"
-    readable-stream "^3.4.0"
+    readable-stream "^3.6.0"
    readdir-scoped-modules "^1.1.0"
    request "^2.88.0"
    retry "^0.12.0"
-    rimraf "^2.6.3"
+    rimraf "^2.7.1"
    safe-buffer "^5.1.2"
    semver "^5.7.1"
    sha "^3.0.0"
@@ -4238,7 +4295,7 @@ rimraf@2.6.3:
  dependencies:
    glob "^7.1.3"

-rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
  version "2.7.1"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
Author	SHA1	Message	Date
RiotRobot	a6c86b131d	v1.7.1	2020-07-16 16:12:44 +01:00
RiotRobot	777003d9a3	Prepare changelog for v1.7.1	2020-07-16 16:12:44 +01:00
RiotRobot	72334b8cd4	Upgrade matrix-js-sdk to 7.1.0	2020-07-16 16:12:07 +01:00
J. Ryan Stinnett	5ae86cd728	Merge pull request #121 from vector-im/dependabot/npm_and_yarn/lodash-4.17.19 Bump lodash from 4.17.15 to 4.17.19	2020-07-16 14:07:42 +01:00
dependabot[bot]	adf4453903	Bump lodash from 4.17.15 to 4.17.19 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-16 08:55:42 +00:00
David Baker	180710f54c	Merge pull request #120 from vector-im/dbkr/userdata_support_nightly Don't forget nightly when computing userData path	2020-07-16 09:55:09 +01:00
David Baker	afa40de885	Merge pull request #119 from vector-im/dbkr/hostinglink Fix hosting link	2020-07-16 09:30:38 +01:00
J. Ryan Stinnett	96c9b85e11	Merge pull request #117 from vector-im/neilalexander/icns New macOS icon	2020-07-15 22:34:58 +01:00
David Baker	9d15c1bbd0	Don't forget nightly when computing userData path We were assuming we were always 'Element'	2020-07-15 20:21:06 +01:00
David Baker	9004ce4fa5	Merge remote-tracking branch 'origin/develop' into dbkr/hostinglink	2020-07-15 20:16:57 +01:00
David Baker	174aaa684e	Apparently this has been changed and should be changed here too	2020-07-15 20:05:43 +01:00
David Baker	583caa0aaa	Fix hosting link Fixes https://github.com/vector-im/riot-web/issues/14500	2020-07-15 20:03:02 +01:00
J. Ryan Stinnett	62736b86f1	Merge pull request #118 from theoryshaw/patch-1 Update README.md	2020-07-15 17:39:50 +01:00
Ryan Schultz	16c6f9839b	Update README.md	2020-07-15 11:25:02 -05:00
Neil Alexander	e3e79fdfe1	New macOS icon	2020-07-15 15:52:31 +01:00
David Baker	764835a43c	Merge pull request #115 from vector-im/dbkr/update_more_icons More icon updates	2020-07-15 13:57:56 +01:00
David Baker	769d4cf647	Merge remote-tracking branch 'old-origin/develop' into dbkr/update_more_icons	2020-07-15 13:53:04 +01:00
David Baker	b06bba2c69	More icon updates	2020-07-15 13:50:00 +01:00
David Baker	80746c1f22	Merge pull request #114 from vector-im/dbkr/yarn_install Don't forget to yarn install	2020-07-15 13:28:51 +01:00
David Baker	c2a39a4a8e	Merge remote-tracking branch 'old-origin/develop' into dbkr/yarn_install	2020-07-15 12:55:58 +01:00
David Baker	e7190e3168	Don't forget to yarn install	2020-07-15 12:53:50 +01:00
RiotRobot	78a601fbeb	Reset matrix-js-sdk back to develop branch	2020-07-15 12:12:12 +01:00
RiotRobot	6c3edb9a13	v1.7.0	2020-07-15 12:11:21 +01:00
RiotRobot	def85eef19	Prepare changelog for v1.7.0	2020-07-15 12:11:20 +01:00
RiotRobot	b25479093b	Upgrade matrix-js-sdk to 7.1.0	2020-07-15 12:08:07 +01:00
David Baker	b839264d9f	Merge pull request #113 from vector-im/dbkr/move_function_for_linter Fix lint error	2020-07-15 11:43:54 +01:00
David Baker	5f01bbd9e0	Fix lint error	2020-07-15 11:41:30 +01:00
J. Ryan Stinnett	71c8ea417d	Merge remote-tracking branch 'origin/develop' into element-develop	2020-07-15 10:44:25 +01:00
J. Ryan Stinnett	c2cfed72df	Merge branch 'jryans/update-packages' into 'develop' Update nightly transitional package See merge request new-vector/element/element-desktop!8	2020-07-15 08:32:28 +00:00
J. Ryan Stinnett	da58f1d3d1	Update nightly transitional package	2020-07-15 09:25:00 +01:00
Jorik Schellekens	735ba9ce75	Merge pull request #112 from vector-im/joriks/delabs-font-scaling Delabs font-scaling	2020-07-14 22:01:17 +01:00
David Baker	ed9a0a60de	Merge branch 'dbkr/windows_rebrand' into 'develop' Some terribleness to make updating work on windows See merge request new-vector/element/element-desktop!7	2020-07-14 18:20:01 +00:00
David Baker	3a253fe742	Some terribleness to make updating work on windows Squirrel doesn't handle the executable changing name, as hopefully explained in comments	2020-07-14 19:05:28 +01:00
J. Ryan Stinnett	a00d98a95a	Merge branch 'jryans/update-brand' into 'develop' Update brand name in config See merge request new-vector/element/element-desktop!6	2020-07-13 20:44:27 +00:00
Jorik Schellekens	2cc25f699b	Delabs font-scaling	2020-07-13 19:10:59 +01:00
J. Ryan Stinnett	0978a5042c	Update brand name in config	2020-07-13 18:40:21 +01:00
David Baker	3e80cdedd8	Merge branch 'dbkr/rebrand_icons' into 'develop' New icons (expect install spinner) See merge request new-vector/element/element-desktop!5	2020-07-13 16:12:59 +00:00
David Baker	358fe6f878	New install spinner	2020-07-13 17:10:31 +01:00
David Baker	8c9352dff0	colour profile on 512x512 icon	2020-07-13 16:59:04 +01:00
David Baker	483860fb00	add back the 512x512 icon	2020-07-13 15:57:14 +01:00
David Baker	7f6a2c6a50	Change mac icons to display p3 colourspace so the logo is the right colour (on wide gamut displays)	2020-07-13 15:15:23 +01:00
Travis Ralston	94b2ac703a	Merge pull request #109 from vector-im/travis/room-list/enable Remove room list labs flag from config	2020-07-13 06:56:19 -06:00
David Baker	332d52cfdc	New icons (expect install spinner)	2020-07-13 13:21:21 +01:00
Travis Ralston	e88ef97b87	Merge branch 'develop' into travis/room-list/enable	2020-07-10 21:35:47 -06:00
Jorik Schellekens	c7683d70b4	Merge pull request #111 from vector-im/joriks/delabs-irc-layout Remove the irc layout setting from labs	2020-07-09 16:20:41 +01:00
Jorik Schellekens	53950e69ad	Remove the irc layout setting from labs	2020-07-09 15:59:16 +01:00
David Baker	9d650eacbb	Merge branch 'dbkr/add_brackets' into 'develop' Add old app name in brackets See merge request new-vector/element/element-desktop!4	2020-07-08 11:01:25 +00:00
Travis Ralston	d9047d7960	Merge pull request #108 from vector-im/travis/update-npm Update npm to ^6.14.6	2020-07-07 14:49:35 -06:00
Travis Ralston	5e2876649d	Update npm to ^6.14.6	2020-07-07 14:48:36 -06:00
Travis Ralston	bed2eb2c41	Remove labs flag from config	2020-07-07 13:58:33 -06:00
David Baker	4a488c9ab2	Add old app name in brackets And fix user data path to be non-bracketed version always.	2020-07-07 18:57:29 +01:00
David Baker	6cc225059a	Merge branch 'dbkr/debian_package_rename' into 'develop' Rename riot package See merge request new-vector/element/element-desktop!3	2020-07-03 16:29:14 +00:00
David Baker	2862870bb5	Remove transitional packages from the main control file because this generated a broken package	2020-07-03 16:14:41 +01:00
RiotRobot	4f844d9a64	Reset matrix-js-sdk back to develop branch	2020-07-03 13:23:36 +01:00
David Baker	197f1dc451	Rename riot package Add a transitional package which hopefully does the upgrade in the right way (following https://wiki.debian.org/RenamingPackages except that adding the transitional package to the new package's control file make a package that reprepro rejects...) The transitional packages can be built with: ``` dpkg -b riot-desktop_1.7.0_all ``` The nightly transitional package is named / versioned assuming a release on Monday the 13th and will need to be edited & renamed as approriate (it just needs to be greater than whatever the latest nightly is at that point).	2020-07-03 12:30:01 +01:00
David Baker	fdb02b93e5	Merge branch 'dbkr/rebrand_step_2' into 'develop' Rebrand step 2 See merge request new-vector/element/element-desktop!2	2020-07-02 14:01:17 +00:00
David Baker	c048dff4de	Apply 1 suggestion(s) to 1 file(s)	2020-07-02 13:42:45 +00:00
David Baker	85dd2504db	Rebrand step 2 * Continue to use Riot user data directory if it exists and the new one doesn't, so users stay logged in. * Move the auto-launcher over to new name. * Look for keytar password under both names.	2020-07-02 13:30:11 +01:00
David Baker	6d5ada7e3f	Merge branch 'dbkr/rebrand_step_1' into 'develop' Rebrand step 1: s/riot/element/ in the places where it's reasonably simple See merge request new-vector/element/element-desktop!1	2020-07-01 16:49:46 +00:00
David Baker	72c88c8c87	change domain for fetching key	2020-07-01 17:46:17 +01:00
David Baker	ff84841b52	Apply suggestion to README.md	2020-07-01 16:42:50 +00:00
David Baker	3a2176443c	Apply suggestion to README.md	2020-07-01 16:42:39 +00:00
David Baker	5b2139a048	Apply suggestion to README.md	2020-07-01 16:42:24 +00:00
David Baker	386e0be08d	This one's easy too	2020-07-01 15:40:23 +01:00
David Baker	466a871094	Rebrand step 1: s/riot/element/ in the places where it's reasonably simple	2020-07-01 15:30:53 +01:00