v1.4.0

Prepare changelog for v1.4.0
v1.4.0
2019-09-27 12:36:45 +01:00 · 2019-09-27 12:36:45 +01:00 · 2019-09-27 12:32:52 +01:00 · 2019-09-27 12:09:11 +01:00 · 2019-09-26 12:21:17 +01:00 · 2019-09-26 12:21:17 +01:00
64 changed files with 2478 additions and 1599 deletions
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -44,3 +44,14 @@ steps:
    plugins:
      - docker#v3.0.1:
          image: "node:10"
+
+  - label: "🌐 i18n"
+    command:
+      - "echo '--- Fetching Dependencies'"
+      - "./scripts/fetch-develop.deps.sh --depth 1"
+      - "yarn install"
+      - "echo '+++ Testing i18n output'"
+      - "yarn diff-i18n"
+    plugins:
+      - docker#v3.0.1:
+          image: "node:10"
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,9 +31,10 @@ Describe here the problem that you are experiencing, or the feature you are requ

 Describe how what happens differs from what you expected.

-Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
-link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
-file a bug here too! -->
+<!-- Please send us logs for your bug report. They're very important for bugs
+which are hard to reproduce. To do this, create this issue then go to your
+account settings and click 'Submit Debug Logs' from the Help & About tab -->
+Logs being sent: yes/no

 <!-- Include screenshots if possible: you can drag and drop images below. -->

--- a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
@@ -33,9 +33,10 @@ Describe here the problem that you are experiencing, or the feature you are requ

 Describe how what happens differs from what you expected.

-Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
-link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
-file a bug here too! -->
+<!-- Please send us logs for your bug report. They're very important for bugs
+which are hard to reproduce. To do this, create this issue then go to your
+account settings and click 'Submit Debug Logs' from the Help & About tab -->
+Logs being sent: yes/no

 <!-- Include screenshots if possible: you can drag and drop images below. -->

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,237 @@
+Changes in [1.4.0](https://github.com/vector-im/riot-web/releases/tag/v1.4.0) (2019-09-27)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.0-rc.2...v1.4.0)
+
+* Many improvements related to privacy and user control of identity services and integration managers
+* Upgrade to React SDK 1.6.0 and JS SDK 2.4.0
+
+Changes in [1.4.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.4.0-rc.2) (2019-09-26)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.0-rc.1...v1.4.0-rc.2)
+
+ * Upgrade to React SDK 1.6.0-rc.2
+ * Work around Yarn confusion with `react-gemini-scrollbar` package
+
+Changes in [1.4.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.4.0-rc.1) (2019-09-25)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.6...v1.4.0-rc.1)
+
+ * Upgrade to React SDK 1.6.0-rc.1 and JS SDK 2.4.0-rc.1
+ * Update from Weblate
+   [\#10961](https://github.com/vector-im/riot-web/pull/10961)
+ * Don't log query parameters as they may contain secrets
+   [\#10929](https://github.com/vector-im/riot-web/pull/10929)
+ * Document more shortcuts
+   [\#10906](https://github.com/vector-im/riot-web/pull/10906)
+ * Point to #develop and use the same gemini-scrollbar version as the react-sdk
+   [\#10893](https://github.com/vector-im/riot-web/pull/10893)
+ * Tweak lock file to pull in only one React version
+   [\#10874](https://github.com/vector-im/riot-web/pull/10874)
+ * document disable_custom_urls
+   [\#10844](https://github.com/vector-im/riot-web/pull/10844)
+ * Install guide tweaks
+   [\#10838](https://github.com/vector-im/riot-web/pull/10838)
+ * Switch to React 16
+   [\#10480](https://github.com/vector-im/riot-web/pull/10480)
+ * Update install guide
+   [\#10810](https://github.com/vector-im/riot-web/pull/10810)
+ * Clarify that HTTPS is not just needed for VoIP
+   [\#6146](https://github.com/vector-im/riot-web/pull/6146)
+ * Bump eslint-utils from 1.4.0 to 1.4.2
+   [\#10692](https://github.com/vector-im/riot-web/pull/10692)
+ * Add docs for tabbed integration managers labs flag
+   [\#10641](https://github.com/vector-im/riot-web/pull/10641)
+ * Change integrations_widgets_urls default configuration
+   [\#10656](https://github.com/vector-im/riot-web/pull/10656)
+ * Add docs for the CIDER composer flag
+   [\#10638](https://github.com/vector-im/riot-web/pull/10638)
+ * add cider composer labs flag
+   [\#10626](https://github.com/vector-im/riot-web/pull/10626)
+ * Upgrade to Electron 6.0.3
+   [\#10601](https://github.com/vector-im/riot-web/pull/10601)
+ * Upgrade to Electron 6
+   [\#10596](https://github.com/vector-im/riot-web/pull/10596)
+ * Update from Weblate
+   [\#10591](https://github.com/vector-im/riot-web/pull/10591)
+ * Upgrade electron-builder to 21.2.0
+   [\#10579](https://github.com/vector-im/riot-web/pull/10579)
+ * Set SUID bit on chrome-sandbox for Debian
+   [\#10580](https://github.com/vector-im/riot-web/pull/10580)
+ * Load config.json before loading language so default can apply
+   [\#10551](https://github.com/vector-im/riot-web/pull/10551)
+ * Bump matrix-react-test-utils for React 16 compatibility
+   [\#10543](https://github.com/vector-im/riot-web/pull/10543)
+ * Add --help to electron app
+   [\#10530](https://github.com/vector-im/riot-web/pull/10530)
+ * Allow setting electron autoHideMenuBar and persist it
+   [\#10503](https://github.com/vector-im/riot-web/pull/10503)
+ * Upgrade dependencies
+   [\#10475](https://github.com/vector-im/riot-web/pull/10475)
+
+Changes in [1.3.6](https://github.com/vector-im/riot-web/releases/tag/v1.3.6) (2019-09-19)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.5...v1.3.6)
+
+ * Fix origin migrator for SSO logins
+   [\#10920](https://github.com/vector-im/riot-web/pull/10920)
+
+Changes in [1.3.5](https://github.com/vector-im/riot-web/releases/tag/v1.3.5) (2019-09-16)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.5-rc.3...v1.3.5)
+
+ * Updated js-sdk and react-sdk for some more minor bugfixes
+
+Changes in [1.3.5-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.5-rc.3) (2019-09-13)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.5-rc.2...v1.3.5-rc.3)
+
+ * js-sdk rc.1 to include report API
+
+Changes in [1.3.5-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.5-rc.2) (2019-09-13)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.5-rc.1...v1.3.5-rc.2)
+
+ * Pull in more fixes from react-sdk rc.2
+
+Changes in [1.3.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.5-rc.1) (2019-09-12)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.4...v1.3.5-rc.1)
+
+ * Cosmetic fixes from react-sdk rc.1
+
+Changes in [1.3.4](https://github.com/vector-im/riot-web/releases/tag/v1.3.4) (2019-09-12)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.4-rc.1...v1.3.4)
+
+ * Updated react-sdk and tweaks to mobile install guide
+
+Changes in [1.3.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.4-rc.1) (2019-09-11)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.3...v1.3.4-rc.1)
+
+ * Update install guide
+   [\#10831](https://github.com/vector-im/riot-web/pull/10831)
+
+Changes in [1.3.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.3) (2019-08-16)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.2...v1.3.3)
+
+ * Linux-only release to fix sandboxing with Electron 5 on Debian
+   [\#10580](https://github.com/vector-im/riot-web/pull/10580)
+
+Changes in [1.3.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.2) (2019-08-05)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.1...v1.3.2)
+
+ * Updated react-sdk for deactivated account error message on login
+
+Changes in [1.3.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.1) (2019-08-05)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.1-rc.1...v1.3.1)
+
+ * Updated js-sdk for notifications fix and react-sdk for registration fix
+
+Changes in [1.3.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.1-rc.1) (2019-07-31)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0...v1.3.1-rc.1)
+
+ * Upgrade to JS SDK 2.3.0-rc.1 and React SDK 1.5.0-rc.1
+ * Update from Weblate
+   [\#10436](https://github.com/vector-im/riot-web/pull/10436)
+ * Describe our existing features better in documentation
+   [\#10418](https://github.com/vector-im/riot-web/pull/10418)
+ * Upgrade to Electron 5
+   [\#10392](https://github.com/vector-im/riot-web/pull/10392)
+ * Remove edits and reactions feature flags from docs and config
+   [\#10363](https://github.com/vector-im/riot-web/pull/10363)
+ * Cachebust config file requests
+   [\#10349](https://github.com/vector-im/riot-web/pull/10349)
+ * Convert install-app-deps to subcommand
+   [\#10334](https://github.com/vector-im/riot-web/pull/10334)
+ * Add riot.im configuration files
+   [\#10327](https://github.com/vector-im/riot-web/pull/10327)
+ * Require descriptions in mxSendRageshake and remove infinite loop in issue
+   templates
+   [\#10321](https://github.com/vector-im/riot-web/pull/10321)
+ * Remove unused disable_identity_server config flag
+   [\#10322](https://github.com/vector-im/riot-web/pull/10322)
+ * Verify i18n in CI
+   [\#10320](https://github.com/vector-im/riot-web/pull/10320)
+
+Changes in [1.3.0](https://github.com/vector-im/riot-web/releases/tag/v1.3.0) (2019-07-18)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.3...v1.3.0)
+
+ * Upgrade to React SDK 1.4.0 and JS SDK 2.2.0
+ * Message editing and reactions features enabled
+ * Remove edits and reactions feature flags from docs and config
+   [\#10365](https://github.com/vector-im/riot-web/pull/10365)
+
+Changes in [1.3.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.3) (2019-07-15)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.2...v1.3.0-rc.3)
+
+ * Update to react-sdk rc.3 to fix a bug where a room admin could generate a room
+   that would cause Riot to error, and some stuck notifications.
+
+Changes in [1.3.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.2) (2019-07-12)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.1...v1.3.0-rc.2)
+
+ * Upgrade to React SDK 1.4.0-rc.2 and JS SDK 2.2.0-rc.2
+ * Fix regression from Riot 1.3.0-rc.1 when listing devices in user settings
+
+Changes in [1.3.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.1) (2019-07-12)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.4...v1.3.0-rc.1)
+
+ * Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1
+ * Update from Weblate
+   [\#10328](https://github.com/vector-im/riot-web/pull/10328)
+ * Upgrade dependencies
+   [\#10308](https://github.com/vector-im/riot-web/pull/10308)
+ * Upgrade dependencies
+   [\#10260](https://github.com/vector-im/riot-web/pull/10260)
+
+Changes in [1.2.4](https://github.com/vector-im/riot-web/releases/tag/v1.2.4) (2019-07-11)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.3...v1.2.4)
+
+ * Upgrade to React SDK 1.3.1 and JS SDK 2.1.1
+ * Upgrade lodash dependencies
+ * JS SDK 2.1.1 includes a fix for ephemeral event processing
+ * React SDK 1.3.1 includes a fix for account deactivation
+
+Changes in [1.2.3](https://github.com/vector-im/riot-web/releases/tag/v1.2.3) (2019-07-08)
+==========================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.3-rc.1...v1.2.3)
+
+ * Upgrade to React SDK 1.3.0 and JS SDK 2.1.0
+ * JS SDK 2.1.0 includes a fix for an exception whilst syncing
+
+Changes in [1.2.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.3-rc.1) (2019-07-03)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2...v1.2.3-rc.1)
+
+ * Change update URL to match new host
+   [\#10247](https://github.com/vector-im/riot-web/pull/10247)
+ * Update from Weblate
+   [\#10219](https://github.com/vector-im/riot-web/pull/10219)
+ * Extract configuration docs to separate file
+   [\#10195](https://github.com/vector-im/riot-web/pull/10195)
+ * Add e2e/warning.svg to preload
+   [\#10197](https://github.com/vector-im/riot-web/pull/10197)
+ * Fix Electron vector: links
+   [\#10196](https://github.com/vector-im/riot-web/pull/10196)
+ * Display a red box of anger for config syntax errors
+   [\#10193](https://github.com/vector-im/riot-web/pull/10193)
+ * Move config-getting to VectorBasePlatform
+   [\#10181](https://github.com/vector-im/riot-web/pull/10181)
+ * Update from Weblate
+   [\#10124](https://github.com/vector-im/riot-web/pull/10124)
+ * Fix default Electron window and tray icons
+   [\#10097](https://github.com/vector-im/riot-web/pull/10097)
+
 Changes in [1.2.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2) (2019-06-19)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.2...v1.2.2)
--- a/README.md
+++ b/README.md
@@ -21,15 +21,18 @@ released version of Riot:
 1. Untar the tarball on your web server
 1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name
 1. If desired, copy `config.sample.json` to `config.json` and edit it
-   as desired. See below for details.
+   as desired. See the [configuration docs](docs/config.md) for details.
 1. Enter the URL into your browser and log into Riot!

 Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located
 at https://packages.riot.im/riot-release-key.asc.

-Note that Chrome does not allow microphone or webcam access for sites served
-over http (except localhost), so for working VoIP you will need to serve Riot
-over https.
+Note that for the security of your chats will need to serve Riot
+over HTTPS. Major browsers also do not allow you to use VoIP/video
+chats over HTTP, as WebRTC is only usable over HTTPS.
+There are some exceptions like when using localhost, which is
+considered a [secure context](https://developer.mozilla.org/docs/Web/Security/Secure_Contexts)
+and thus allowed.

 To install Riot as a desktop application, see [Running as a desktop
 app](#running-as-a-desktop-app) below.
@@ -52,9 +55,9 @@ on the client, Riot needs a way to supply the decrypted content from a separate
 origin to the one Riot is hosted on. This currently done with a 'cross origin
 renderer' which is a small piece of javascript hosted on a different domain.
 To avoid all Riot installs needing one of these to be set up, riot.im hosts
-one on usercontent.riot.im which is used by default. See 'config.json' if you'd
-like to host your own. https://github.com/vector-im/riot-web/issues/6173 tracks
-progress on replacing this with something better.
+one on usercontent.riot.im which is used by default.
+https://github.com/vector-im/riot-web/issues/6173 tracks progress on replacing
+this with something better.

 Building From Source
 ====================
@@ -91,7 +94,7 @@ guide](https://yarnpkg.com/docs/install/) if you do not have it already.
   develop branch. (Note that we don't reference the develop versions in git directly
   due to https://github.com/npm/npm/issues/3055.)
 1. Configure the app by copying `config.sample.json` to `config.json` and
-   modifying it (see below for details).
+   modifying it. See the [configuration docs](docs/config.md) for details.
 1. `yarn dist` to build a tarball to deploy. Untaring this file will give
   a version-specific directory containing all the files that need to go on your
   web server.
@@ -101,101 +104,6 @@ which will build all the necessary files into the `webapp` directory. The versio
 will not appear in Settings without using the dist script. You can then mount the
 `webapp` directory on your webserver to actually serve up the app, which is entirely static content.

-config.json
-===========
-
-You can configure the app by copying `config.sample.json` to
-`config.json` and customising it:
-
-For a good example, see https://riot.im/develop/config.json.
-
-1. `default_server_config` sets the default homeserver and identity server URL for
-   Riot to use. The object is the same as returned by [https://<server_name>/.well-known/matrix/client](https://matrix.org/docs/spec/client_server/latest.html#get-well-known-matrix-client),
-   with added support for a `server_name` under the `m.homeserver` section to display
-   a custom homeserver name. Alternatively, the config can contain a `default_server_name`
-   instead which is where Riot will go to get that same object, although this option is
-   deprecated - see the `.well-known` link above for more information on using this option. 
-   Note that the `default_server_name` is used to get a complete server configuration 
-   whereas the `server_name` in the `default_server_config` is for display purposes only.
-   * *Note*: The URLs can also be individually specified as `default_hs_url` and 
-     `default_is_url`, however these are deprecated. They are maintained for backwards
-     compatibility with older configurations. `default_is_url` is respected only
-     if `default_hs_url` is used.
-   * The identity server is used for verifying third party identifiers like emails
-     and phone numbers. It is not used to store your password or account information.
-     If not provided, the identity server defaults to vector.im unless `disable_identity_server`
-     is set to true in the config. Currently the only two public identity servers
-     are https://matrix.org and https://vector.im, however in future identity servers
-     will be decentralised.
-   * Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or
-     `default_hs_url` is specified. When multiple sources are specified, it is unclear
-     which should take priority and therefore the application cannot continue.
-1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user
-   in the `labs` section of settings.  The available optional experimental features vary from
-   release to release. Some of the available features are described in the Labs Feature section
-   of this README.
-1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled
-   or present. Useful for getting at settings which may be otherwise hidden.
-1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
-   homeserver know what email template to use when talking to you.
-1. `branding`: Configures various branding and logo details, such as:
-    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
-       during authentication flows
-    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
-       authentication flows
-    1. `authFooterLinks`: a list of links to show in the authentication page footer:
-      `[{"text": "Link text", "url": "https://link.target"}, {"text": "Other link", ...}]`
-1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
-   server is not Riot and normally not your homeserver either. The integration server settings
-   may be left blank to disable integrations.
-1. `integrations_rest_url`: URL to the REST interface for the integrations server.
-1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
-1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
-   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
-   "Send Logs" within the application. Bug reports can be disabled by leaving the
-   `bug_report_endpoint_url` out of your config file.
-1. `roomDirectory`: config for the public room directory. This section is optional.
-1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
-   down list. Optional.
-1. `default_theme`: name of theme to use by default (e.g. 'light')
-1. `update_base_url` (electron app only): HTTPS URL to a web server to download
-   updates from. This should be the path to the directory containing `macos`
-   and `win32` (for update packages, not installer packages).
-1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
-   encrypted file attachments. This MUST be hosted on a completely separate domain to
-   anything else since it is used to isolate the privileges of file attachments to this
-   domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
-   https://github.com/matrix-org/usercontent/blob/master/v1.html
-1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
-   option out of your config file. If you want to enable analytics, set `piwik` to be an object
-   containing the following properties:
-    1. `url`: The URL of the Piwik instance to use for collecting analytics
-    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
-    1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
-    1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
-1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
-1. `embeddedPages`: Configures the pages displayed in portions of Riot that
-   embed static files, such as:
-    1. `welcomeUrl`: Initial content shown on the outside of the app when not
-       logged in. Defaults to `welcome.html` supplied with Riot.
-    1. `homeUrl`: Content shown on the inside of the app when a specific room is
-       not selected. By default, no home page is configured. If one is set, a
-       button to access it will be shown in the top left menu.
-1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
-   country selectors, like the phone number input on the registration page.
-   Defaults to `GB` if the given code is unknown or not provided.
-
-
-Note that `index.html` also has an og:image meta tag that is set to an image
-hosted on riot.im. This is the image used if links to your copy of Riot
-appear in some websites like Facebook, and indeed Riot itself. This has to be
-static in the HTML and an absolute URL (and HTTP rather than HTTPS), so it's
-not possible for this to be an option in config.json. If you'd like to change
-it, you can build Riot as above, but run
-`RIOT_OG_IMAGE_URL="http://example.com/logo.png" yarn build`.
-Alternatively, you can edit the `og:image` meta tag in `index.html` directly
-each time you download a new version of Riot.
-
 Running as a Desktop app
 ========================

@@ -248,19 +156,8 @@ yarn global add nativefier
 nativefier https://riot.im/app/
 ```

-Desktop app configuration
-=========================
-
-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-web --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 `--profile-dir` flag followed by the desired path.
-
-To change the config.json for the desktop app, create a config file which will be used to override values in the config which ships in the package:
-+ `%APPDATA%\$NAME\config.json` on Windows
-+ `$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`.
+The [configuration docs](docs/config.md#desktop-app-configuration) show how to
+override the desktop app's default settings if desired.

 Running from Docker
 ===================
@@ -298,6 +195,12 @@ docker build -t vectorim/riot-web:develop \
    .
 ```

+config.json
+===========
+
+Riot supports a variety of settings to configure default servers, behaviour, themes, etc.
+See the [configuration docs](docs/config.md) for more details.
+
 Labs Features
 =============

--- a/config.sample.json
+++ b/config.sample.json
@@ -8,7 +8,6 @@
            "base_url": "https://vector.im"
        }
    },
-    "disable_identity_server": false,
    "disable_custom_urls": false,
    "disable_guests": false,
    "disable_login_language_selector": false,
@@ -16,15 +15,22 @@
    "brand": "Riot",
    "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",
+        "https://scalar-staging.vector.im/_matrix/integrations/v1",
+        "https://scalar-staging.vector.im/api",
+        "https://scalar-staging.riot.im/scalar/api"
+    ],
    "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "defaultCountryCode": "GB",
    "showLabsSettings": false,
    "features": {
-        "feature_groups": "labs",
        "feature_pinning": "labs",
-        "feature_reactions": "labs",
-        "feature_message_editing": "labs"
+        "feature_custom_status": "labs",
+        "feature_custom_tags": "labs",
+        "feature_state_counters": "labs"
    },
    "default_federate": true,
    "default_theme": "light",
--- a/docs/config.md
+++ b/docs/config.md
@@ -0,0 +1,112 @@
+Configuration
+=============
+
+You can configure the app by copying `config.sample.json` to
+`config.json` and customising it:
+
+For a good example, see https://riot.im/develop/config.json.
+
+1. `default_server_config` sets the default homeserver and identity server URL for
+   Riot to use. The object is the same as returned by [https://<server_name>/.well-known/matrix/client](https://matrix.org/docs/spec/client_server/latest.html#get-well-known-matrix-client),
+   with added support for a `server_name` under the `m.homeserver` section to display
+   a custom homeserver name. Alternatively, the config can contain a `default_server_name`
+   instead which is where Riot will go to get that same object, although this option is
+   deprecated - see the `.well-known` link above for more information on using this option.
+   Note that the `default_server_name` is used to get a complete server configuration
+   whereas the `server_name` in the `default_server_config` is for display purposes only.
+   * *Note*: The URLs can also be individually specified as `default_hs_url` and
+     `default_is_url`, however these are deprecated. They are maintained for backwards
+     compatibility with older configurations. `default_is_url` is respected only
+     if `default_hs_url` is used.
+   * The identity server is used for verifying third party identifiers like emails
+     and phone numbers. It is not used to store your password or account information.
+     If not provided, the identity server defaults to vector.im. Currently the only
+     two public identity servers are https://matrix.org and https://vector.im, however
+     in future identity servers will be decentralised. In the future it will be possible
+     to disable the identity server functionality.
+   * Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or
+     `default_hs_url` is specified. When multiple sources are specified, it is unclear
+     which should take priority and therefore the application cannot continue.
+1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or exposed to the user
+   in the `labs` section of settings.  The available optional experimental features vary from
+   release to release. The available features are described in [labs.md](labs.md).
+1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled
+   or present. Useful for getting at settings which may be otherwise hidden.
+1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
+   homeserver know what email template to use when talking to you.
+1. `branding`: Configures various branding and logo details, such as:
+    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
+       during authentication flows
+    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
+       authentication flows
+    1. `authFooterLinks`: a list of links to show in the authentication page footer:
+      `[{"text": "Link text", "url": "https://link.target"}, {"text": "Other link", ...}]`
+1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
+   server is not Riot and normally not your homeserver either. The integration server settings
+   may be left blank to disable integrations.
+1. `integrations_rest_url`: URL to the REST interface for the integrations server.
+1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
+1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
+   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
+   "Send Logs" within the application. Bug reports can be disabled by leaving the
+   `bug_report_endpoint_url` out of your config file.
+1. `roomDirectory`: config for the public room directory. This section is optional.
+1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
+   down list. Optional.
+1. `default_theme`: name of theme to use by default (e.g. 'light')
+1. `update_base_url` (electron app only): HTTPS URL to a web server to download
+   updates from. This should be the path to the directory containing `macos`
+   and `win32` (for update packages, not installer packages).
+1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
+   encrypted file attachments. This MUST be hosted on a completely separate domain to
+   anything else since it is used to isolate the privileges of file attachments to this
+   domain. Default: `https://usercontent.riot.im/v1.html`. This needs to contain v1.html from
+   https://github.com/matrix-org/usercontent/blob/master/v1.html
+1. `piwik`: Analytics can be disabled by setting `piwik: false` or by leaving the piwik config
+   option out of your config file. If you want to enable analytics, set `piwik` to be an object
+   containing the following properties:
+    1. `url`: The URL of the Piwik instance to use for collecting analytics
+    1. `whitelistedHSUrls`: a list of HS URLs to not redact from the analytics
+    1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
+    1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
+1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
+1. `embeddedPages`: Configures the pages displayed in portions of Riot that
+   embed static files, such as:
+    1. `welcomeUrl`: Initial content shown on the outside of the app when not
+       logged in. Defaults to `welcome.html` supplied with Riot.
+    1. `homeUrl`: Content shown on the inside of the app when a specific room is
+       not selected. By default, no home page is configured. If one is set, a
+       button to access it will be shown in the top left menu.
+1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
+   country selectors, like the phone number input on the registration page.
+   Defaults to `GB` if the given code is unknown or not provided.
+1. `disable_custom_urls`: disallow the user to change the
+   default homeserver when signing up or logging in.
+
+Note that `index.html` also has an og:image meta tag that is set to an image
+hosted on riot.im. This is the image used if links to your copy of Riot
+appear in some websites like Facebook, and indeed Riot itself. This has to be
+static in the HTML and an absolute URL (and HTTP rather than HTTPS), so it's
+not possible for this to be an option in config.json. If you'd like to change
+it, you can build Riot, but run
+`RIOT_OG_IMAGE_URL="http://example.com/logo.png" yarn build`.
+Alternatively, you can edit the `og:image` meta tag in `index.html` directly
+each time you download a new version of Riot.
+
+Desktop app configuration
+=========================
+
+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-web --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
+`--profile-dir` flag followed by the desired path.
+
+ `%APPDATA%\$NAME\config.json` on Windows
+ `$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`.
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -1,12 +1,29 @@
 # Labs features

 Some notes on the features you can enable by going to `Settings->Labs`. Not exhaustive, chat in
-[#riot-web:matrix.org] for more information.
+[#riot-web:matrix.org](https://matrix.to/#/#riot-web:matrix.org) for more information.

 **Be warned! Labs features are not finalised, they may be fragile, they may change, they may be
 dropped. Ask in the room if you are unclear about any details here.**

-## Render simple counters in room header
+## Message pinning (`feature_pinning`)
+
+Allows you to pin messages in the room. To pin a message, use the 3 dots to the right of the message
+and select "Pin".
+
+## Custom status (`feature_custom_status`)
+
+An experimental approach for supporting custom status messages across DMs. To set a status, click on
+your avatar next to the message composer.
+
+## Custom tags (`feature_custom_tags`)
+
+An experimental approach for dealing with custom tags. Custom tags will appear in the bottom portion
+of the community filter panel.
+
+Setting custom tags is not supported by Riot.
+
+## Render simple counters in room header (`feature_state_counters`)

 Allows rendering of labelled counters above the message list.

@@ -29,17 +46,11 @@ Once enabled, send a custom state event to a room to set values:

 That's it. Now should see your new counter under the header.

-## Reactions
+## New simple composer (`feature_cider_composer`)

-`feature_reactions` allows reacting to messages with emoji and displaying
-reactions from other people. This feature is currently under active development,
-and only portions have been implemented so far.
+An experimental, faster, message composer which should be more reliable and less prone to problems when 
+using your chosen input method.

-## Message editing
+## Multiple integration managers (`feature_many_integration_managers`)

-`feature_message_editing` allows editing messages after they have been sent,
-accessible from the reaction/context bar when hovering a message.
-This feature is currently under active development,
-and only portions have been implemented so far.
-
-[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org
+Exposes a way to access all the integration managers known to Riot. This is an implementation of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957).
--- a/docs/shortcuts.md
+++ b/docs/shortcuts.md
@@ -6,6 +6,8 @@ The modifier is <kbd>Ctrl</kbd> on Windows & Linux and <kbd>⌘</kbd> on Mac.
 - <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>d</kbd> - toggle mic mute
 - <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>e</kbd> - toggle video on/off
 - <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>k</kbd> - jump to named room
- <kbd>↑</kbd>/<kbd>↓</kbd> - navigate within room list
+- <kbd>↑</kbd>/<kbd>↓</kbd> - navigate old messages to edit when the composer is in focus
+- <kbd>↑</kbd>/<kbd>↓</kbd> - next/prev room when focus in room list
+- <kbd>Alt</kbd>+<kbd>↑</kbd>/<kbd>↓</kbd> - resend previous messages when the composer is in focus
 - <kbd>PageUp</kbd>/<kbd>PageDown</kbd> - scroll timeline up/down
 - <kbd>Ctrl</kbd>/<kbd>⌘</kbd>+<kbd>Home</kbd>/<kbd>End</kbd> - jump to timeline start/end
--- a/electron_app/build/linux/after-install.tpl
+++ b/electron_app/build/linux/after-install.tpl
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Link to the binary
+ln -sf '/opt/${productFilename}/${executable}' '/usr/bin/${executable}'
+
+# SUID chrome-sandbox for Electron 5+
+# Remove this entire file (after-install.tpl) and remove the reference in
+# package.json once this change has been upstreamed so we go back to the copy
+# from upstream.
+# https://github.com/electron-userland/electron-builder/pull/4163
+chmod 4755 '/opt/${productFilename}/chrome-sandbox' || true
+
+update-mime-database /usr/share/mime || true
+update-desktop-database /usr/share/applications || true
--- a/electron_app/img/riot.png
+++ b/electron_app/img/riot.png
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "1.2.2",
+  "version": "1.4.0",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "dependencies": {
--- a/electron_app/riot.im/README
+++ b/electron_app/riot.im/README
@@ -1,4 +1,6 @@
 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.
+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/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -1,14 +1,16 @@
 {
-    "update_base_url": "https://riot.im/download/desktop/update/",
+    "update_base_url": "https://packages.riot.im/desktop/update/",
    "default_hs_url": "https://matrix.org",
    "default_is_url": "https://vector.im",
    "brand": "Riot",
    "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",
+        "https://scalar-staging.vector.im/_matrix/integrations/v1",
        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api",
-        "https://scalar.vector.im/api"
+        "https://scalar-staging.riot.im/scalar/api"
    ],
    "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -1,8 +1,8 @@
 /*
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
-Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
+Copyright 2017, 2019 Michael Telatynski <7t3chguy@gmail.com>

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,10 @@ limitations under the License.
 const checkSquirrelHooks = require('./squirrelhooks');
 if (checkSquirrelHooks()) return;

-const argv = require('minimist')(process.argv);
+const argv = require('minimist')(process.argv, {
+    alias: {help: "h"},
+});
+
 const {app, ipcMain, powerSaveBlocker, BrowserWindow, Menu, autoUpdater, protocol} = require('electron');
 const AutoLaunch = require('auto-launch');
 const path = require('path');
@@ -37,6 +40,19 @@ const { migrateFromOldOrigin } = require('./originMigrator');
 const windowStateKeeper = require('electron-window-state');
 const Store = require('electron-store');

+if (argv["help"]) {
+    console.log("Options:");
+    console.log("  --profile-dir {path}: Path to where to store the profile.");
+    console.log("  --profile {name}:     Name of alternate profile to use, allows for running multiple accounts.");
+    console.log("  --devtools:           Install and use react-devtools and react-perf.");
+    console.log("  --no-update:          Disable automatic updating.");
+    console.log("  --hidden:             Start the application hidden in the system tray.");
+    console.log("  --help:               Displays this help message.");
+    console.log("And more such as --proxy, see:" +
+        "https://github.com/electron/electron/blob/master/docs/api/chrome-command-line-switches.md");
+    app.exit();
+}
+
 // boolean flag set whilst we are doing one-time origin migration
 // We only serve the origin migration script while we're actually
 // migrating to mitigate any risk of it being used maliciously.
@@ -156,6 +172,14 @@ ipcMain.on('ipcCall', async function(ev, payload) {
        case 'setMinimizeToTrayEnabled':
            store.set('minimizeToTray', global.minimizeToTray = args[0]);
            break;
+        case 'getAutoHideMenuBarEnabled':
+            ret = global.mainWindow.isMenuBarAutoHide();
+            break;
+        case 'setAutoHideMenuBarEnabled':
+            store.set('autoHideMenuBar', args[0]);
+            global.mainWindow.setAutoHideMenuBar(args[0]);
+            global.mainWindow.setMenuBarVisibility(!args[0]);
+            break;
        case 'getAppVersion':
            ret = app.getVersion();
            break;
@@ -173,6 +197,9 @@ ipcMain.on('ipcCall', async function(ev, payload) {
            await migrateFromOldOrigin();
            migratingOrigin = false;
            break;
+        case 'getConfig':
+            ret = vectorConfig;
+            break;
        default:
            mainWindow.webContents.send('ipcReply', {
                id: payload.id,
@@ -208,7 +235,14 @@ const launcher = new AutoLaunch({
 // work.
 // Also mark it as secure (ie. accessing resources from this
 // protocol and HTTPS won't trigger mixed content warnings).
-protocol.registerStandardSchemes(['vector'], {secure: true});
+protocol.registerSchemesAsPrivileged([{
+    scheme: 'vector',
+    privileges: {
+        standard: true,
+        secure: true,
+        supportFetchAPI: true,
+    },
+}]);

 app.on('ready', () => {
    if (argv['devtools']) {
@@ -295,7 +329,10 @@ app.on('ready', () => {
        console.log('No update_base_url is defined: auto update is disabled');
    }

-    const iconPath = `${__dirname}/../img/riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
+    // 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 iconPath = path.join(__dirname, "..", "..", "img", iconFile);

    // Load the previous window state with fallback to defaults
    const mainWindowState = windowStateKeeper({
@@ -307,7 +344,7 @@ app.on('ready', () => {
    mainWindow = global.mainWindow = new BrowserWindow({
        icon: iconPath,
        show: false,
-        autoHideMenuBar: true,
+        autoHideMenuBar: store.get('autoHideMenuBar', true),

        x: mainWindowState.x,
        y: mainWindowState.y,
--- a/electron_app/src/originMigrator.js
+++ b/electron_app/src/originMigrator.js
@@ -33,7 +33,11 @@ async function migrateFromOldOrigin() {
                webgl: false,
            },
        });
-        ipcMain.on('origin_migration_complete', (e, success, sentSummary, storedSummary) => {
+        const onOriginMigrationComplete = (e, success, sentSummary, storedSummary) => {
+            // we use once but we'll only get one of these events,
+            // so remove the listener for the other one
+            ipcMain.removeListener('origin_migration_nodata', onOriginMigrationNoData);
+
            if (success) {
                console.log("Origin migration completed successfully!");
            } else {
@@ -43,12 +47,18 @@ async function migrateFromOldOrigin() {
            console.error("Data stored", storedSummary);
            migrateWindow.close();
            resolve();
-        });
-        ipcMain.on('origin_migration_nodata', (e) => {
+        };
+        const onOriginMigrationNoData = (e, success, sentSummary, storedSummary) => {
+            ipcMain.removeListener('origin_migration_complete', onOriginMigrationComplete);
+
            console.log("No session to migrate from old origin");
            migrateWindow.close();
            resolve();
-        });
+        };
+
+        ipcMain.once('origin_migration_complete', onOriginMigrationComplete);
+        ipcMain.once('origin_migration_nodata', onOriginMigrationNoData);
+
        // Normalise the path because in the distribution, __dirname will be inside the
        // electron asar.
        const sourcePagePath = path.normalize(__dirname + '/../../origin_migrator/source.html');
--- a/electron_app/src/preload.js
+++ b/electron_app/src/preload.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,16 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const { ipcRenderer, webFrame } = require('electron');
+const { ipcRenderer } = require('electron');

 // expose ipcRenderer to the renderer process
 window.ipcRenderer = ipcRenderer;
-
-// Allow the fetch API to load resources from this
-// protocol: this is necessary to load olm.wasm.
-// (Also mark it a secure although we've already
-// done this in the main process).
-webFrame.registerURLSchemeAsPrivileged('vector', {
-    secure: true,
-    supportFetchAPI: true,
-});
--- a/electron_app/src/tray.js
+++ b/electron_app/src/tray.js
@@ -65,7 +65,7 @@ exports.create = function(config) {
    global.mainWindow.webContents.on('page-favicon-updated', async function(ev, favicons) {
        if (!favicons || favicons.length <= 0 || !favicons[0].startsWith('data:')) {
            if (lastFavicon !== null) {
-                win.setIcon(defaultIcon);
+                global.mainWindow.setIcon(defaultIcon);
                trayIcon.setImage(defaultIcon);
                lastFavicon = null;
            }
--- a/electron_app/src/webcontents-handler.js
+++ b/electron_app/src/webcontents-handler.js
@@ -36,7 +36,11 @@ function onWindowOrNavigate(ev, target) {
 }

 function onLinkContextMenu(ev, params) {
-    const url = params.linkURL || params.srcURL;
+    let url = params.linkURL || params.srcURL;
+
+    if (url.startsWith('vector://vector/webapp')) {
+        url = "https://riot.im/app/" + url.substring(23);
+    }

    const popupMenu = new Menu();
    // No point trying to open blob: URLs in an external browser: it ain't gonna work.
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron_app/src/electron-main.js",
-  "version": "1.2.2",
+  "version": "1.4.0",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -30,21 +30,22 @@
    "reskindex:watch": "reskindex -h src/header -w",
    "i18n": "matrix-gen-i18n",
    "prunei18n": "matrix-prune-i18n",
+    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
    "build:res": "node scripts/copy-res.js",
    "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
    "build:compile": "yarn reskindex && babel --source-maps -d lib src",
    "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production",
    "build:bundle:dev": "webpack --progress --bail --mode development",
-    "build:electron": "yarn clean && yarn build && yarn install:electron && build -wml --ia32 --x64",
-    "build:electron:linux": "yarn build && build -l --x64",
-    "build:electron:macos": "yarn build && build -m --x64",
-    "build:electron:windows": "yarn build && build -w --ia32 --x64",
+    "build:electron": "yarn clean && yarn build && yarn install:electron && electron-builder -wml --ia32 --x64",
+    "build:electron:linux": "yarn build && electron-builder -l --x64",
+    "build:electron:macos": "yarn build && electron-builder -m --x64",
+    "build:electron:windows": "yarn build && electron-builder -w --ia32 --x64",
    "build:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk build",
    "build:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:init",
    "build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle",
    "build:dev": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle:dev",
    "dist": "scripts/package.sh",
-    "install:electron": "install-app-deps",
+    "install:electron": "electron-builder install-app-deps",
    "electron": "yarn install:electron && electron .",
    "start:res": "node scripts/copy-res.js -w",
    "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development",
@@ -70,16 +71,16 @@
    "draft-js": "^0.11.0-alpha",
    "extract-text-webpack-plugin": "^4.0.0-beta.0",
    "favico.js": "^0.3.10",
-    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
+    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
    "gfm.css": "^1.1.2",
    "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "2.0.1",
-    "matrix-react-sdk": "1.2.2",
+    "matrix-js-sdk": "2.4.0",
+    "matrix-react-sdk": "1.6.0",
    "modernizr": "^3.6.0",
    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
-    "prop-types": "^15.6.2",
-    "react": "^15.6.0",
-    "react-dom": "^15.6.0",
+    "prop-types": "^15.7.2",
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0",
    "sanitize-html": "^1.19.1",
    "ua-parser-js": "^0.7.19",
    "url": "^0.11.0"
@@ -107,8 +108,8 @@
    "cpx": "^1.3.2",
    "cross-env": "^4.0.0",
    "css-loader": "^2.1.0",
-    "electron-builder": "^20.38.5",
-    "electron-builder-squirrel-windows": "^20.38.5",
+    "electron-builder": "^21.2.0",
+    "electron-builder-squirrel-windows": "^21.2.0",
    "electron-devtools-installer": "^2.2.4",
    "eslint": "^5.8.0",
    "eslint-config-google": "^0.7.1",
@@ -131,7 +132,7 @@
    "karma-webpack": "4.0.0-beta.0",
    "loader-utils": "^1.2.3",
    "matrix-mock-request": "^1.2.3",
-    "matrix-react-test-utils": "^0.2.0",
+    "matrix-react-test-utils": "^0.2.2",
    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
    "mocha": "^5.2.0",
@@ -143,8 +144,6 @@
    "postcss-scss": "^1.0.6",
    "postcss-simple-vars": "^4.1.0",
    "postcss-strip-inline-comments": "^0.1.5",
-    "react-addons-perf": "^15.4.0",
-    "react-addons-test-utils": "^15.6.0",
    "rimraf": "^2.4.3",
    "source-map-loader": "^0.2.4",
    "webpack": "^4.23.1",
@@ -153,13 +152,16 @@
  },
  "build": {
    "appId": "im.riot.app",
-    "electronVersion": "4.2.4",
+    "electronVersion": "6.0.10",
    "files": [
      "node_modules/**",
-      "src/**",
-      "img/**"
+      "src/**"
    ],
    "extraResources": [
+      {
+        "from": "electron_app/img",
+        "to": "img"
+      },
      "webapp/**/*",
      "origin_migrator/**/*"
    ],
@@ -171,6 +173,9 @@
        "StartupWMClass": "riot"
      }
    },
+    "deb": {
+      "afterInstall": "electron_app/build/linux/after-install.tpl"
+    },
    "mac": {
      "category": "public.app-category.social-networking"
    },
--- a/riot.im/README
+++ b/riot.im/README
@@ -0,0 +1,11 @@
+This directory contains the config files and deployment scripts for the official
+riot.im distribution of Riot Web at https://riot.im.
+
+You probably do not want to build with this config unless you're building the
+official riot.im distribution, but these files may be useful if you want to
+inspect the configuration used there.
+
+Riot Desktop uses a separate config (see electron_app/riot.im/config.json).
+
+Deployment scripts (such as app/deploy.py) are meant to be run on the web server
+hosting the Riot installation.
--- a/riot.im/app/config.json
+++ b/riot.im/app/config.json
@@ -0,0 +1,50 @@
+{
+    "default_hs_url": "https://matrix.org",
+    "default_is_url": "https://vector.im",
+    "brand": "Riot",
+    "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",
+        "https://scalar-staging.vector.im/_matrix/integrations/v1",
+        "https://scalar-staging.vector.im/api",
+        "https://scalar-staging.riot.im/scalar/api"
+    ],
+    "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "welcomeUserId": "@riot-bot:matrix.org",
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "siteId": 1,
+        "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy"
+    },
+    "phasedRollOut": {
+        "feature_lazyloading": {
+            "offset": 1539684000000,
+            "period": 604800000
+        }
+    },
+    "features": {
+        "feature_lazyloading": "enable",
+        "feature_room_breadcrumbs": "labs"
+    },
+    "roomDirectory": {
+        "servers": [
+            "matrix.org"
+        ]
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false
+    },
+    "terms_and_conditions_links": [
+        {
+            "url": "https://riot.im/privacy",
+            "text": "Privacy Policy"
+        },
+        {
+            "url": "https://matrix.org/docs/guides/riot_im_cookie_policy",
+            "text": "Cookie Policy"
+        }
+    ]
+}
--- a/riot.im/app/deploy.py
+++ b/riot.im/app/deploy.py
@@ -0,0 +1,191 @@
+#!/usr/bin/env python
+#
+# download and unpack a riot-web tarball.
+#
+# Allows `bundles` to be extracted to a common directory, and a link to
+# config.json to be added.
+
+from __future__ import print_function
+
+import argparse
+import os
+import os.path
+import subprocess
+import sys
+import tarfile
+import shutil
+import glob
+
+try:
+    # python3
+    from urllib.request import urlretrieve
+except ImportError:
+    # python2
+    from urllib import urlretrieve
+
+class DeployException(Exception):
+    pass
+
+def create_relative_symlink(linkname, target):
+    relpath = os.path.relpath(target, os.path.dirname(linkname))
+    print ("Symlink %s -> %s" % (linkname, relpath))
+    os.symlink(relpath, linkname)
+
+
+def move_bundles(source, dest):
+    """Move the contents of the 'bundles' directory to a common dir
+
+    We check that we will not be overwriting anything before we proceed.
+
+    Args:
+        source (str): path to 'bundles' within the extracted tarball
+        dest (str): target common directory
+    """
+
+    if not os.path.isdir(dest):
+        os.mkdir(dest)
+
+    # build a map from source to destination, checking for non-existence as we go.
+    renames = {}
+    for f in os.listdir(source):
+        dst = os.path.join(dest, f)
+        if os.path.exists(dst):
+            print (
+                "Skipping bundle. The bundle includes '%s' which we have previously deployed."
+                % f
+            )
+        else:
+            renames[os.path.join(source, f)] = dst
+
+    for (src, dst) in renames.iteritems():
+        print ("Move %s -> %s" % (src, dst))
+        os.rename(src, dst)
+
+class Deployer:
+    def __init__(self):
+        self.packages_path = "."
+        self.bundles_path = None
+        self.should_clean = False
+        # filename -> symlink path e.g 'config.localhost.json' => '../localhost/config.json'
+        self.symlink_paths = {}
+        self.verify_signature = True
+
+    def deploy(self, tarball, extract_path):
+        """Download a tarball if necessary, and unpack it
+
+        Returns:
+            (str) the path to the unpacked deployment
+        """
+        print("Deploying %s to %s" % (tarball, extract_path))
+
+        name_str = os.path.basename(tarball).replace(".tar.gz", "")
+        extracted_dir = os.path.join(extract_path, name_str)
+        if os.path.exists(extracted_dir):
+            raise DeployException('Cannot unpack %s: %s already exists' % (
+                tarball, extracted_dir))
+
+        downloaded = False
+        if tarball.startswith("http://") or tarball.startswith("https://"):
+            tarball = self.download_and_verify(tarball)
+            print("Downloaded file: %s" % tarball)
+            downloaded = True
+
+        try:
+            with tarfile.open(tarball) as tar:
+                tar.extractall(extract_path)
+        finally:
+            if self.should_clean and downloaded:
+                os.remove(tarball)
+
+        print ("Extracted into: %s" % extracted_dir)
+
+        if self.symlink_paths:
+            for link_path, file_path in self.symlink_paths.iteritems():
+                create_relative_symlink(
+                    target=file_path,
+                    linkname=os.path.join(extracted_dir, link_path)
+                )
+
+        if self.bundles_path:
+            extracted_bundles = os.path.join(extracted_dir, 'bundles')
+            move_bundles(source=extracted_bundles, dest=self.bundles_path)
+
+            # replace the extracted_bundles dir (which may not be empty if some
+            # bundles were skipped) with a symlink to the common dir.
+            shutil.rmtree(extracted_bundles)
+            create_relative_symlink(
+                target=self.bundles_path,
+                linkname=extracted_bundles,
+            )
+        return extracted_dir
+
+    def download_and_verify(self, url):
+        tarball = self.download_file(url)
+
+        if self.verify_signature:
+            sigfile = self.download_file(url + ".asc")
+            subprocess.check_call(["gpg", "--verify", sigfile, tarball])
+
+        return tarball
+
+    def download_file(self, url):
+        if not os.path.isdir(self.packages_path):
+            os.mkdir(self.packages_path)
+        local_filename = os.path.join(self.packages_path,
+                                      url.split('/')[-1])
+        sys.stdout.write("Downloading %s -> %s..." % (url, local_filename))
+        sys.stdout.flush()
+        urlretrieve(url, local_filename)
+        print ("Done")
+        return local_filename
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser("Deploy a Riot build on a web server.")
+    parser.add_argument(
+        "-p", "--packages-dir", default="./packages", help=(
+            "The directory to download the tarball into. (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "-e", "--extract-path", default="./deploys", help=(
+            "The location to extract .tar.gz files to. (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "-b", "--bundles-dir", nargs='?', default="./bundles", help=(
+            "A directory to move the contents of the 'bundles' directory to. A \
+            symlink to the bundles directory will also be written inside the \
+            extracted tarball. Example: './bundles'. \
+            (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "-c", "--clean", action="store_true", default=False, help=(
+            "Remove .tar.gz files after they have been downloaded and extracted. \
+            (Default: %(default)s)"
+        )
+    )
+    parser.add_argument(
+        "--include", nargs='*', default=['./config*.json'], help=(
+            "Symlink these files into the root of the deployed tarball. \
+             Useful for config files and home pages. Supports glob syntax. \
+             (Default: '%(default)s')"
+        )
+    )
+    parser.add_argument(
+        "tarball", help=(
+            "filename of tarball, or URL to download."
+        ),
+    )
+
+    args = parser.parse_args()
+
+    deployer = Deployer()
+    deployer.packages_path = args.packages_dir
+    deployer.bundles_path = args.bundles_dir
+    deployer.should_clean = args.clean
+
+    for include in args.include:
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
+
+    deployer.deploy(args.tarball, args.extract_path)
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -0,0 +1,58 @@
+{
+    "default_hs_url": "https://matrix.org",
+    "default_is_url": "https://vector.im",
+    "brand": "Riot",
+    "integrations_ui_url": "https://scalar-staging.vector.im/",
+    "integrations_rest_url": "https://scalar-staging.vector.im/api",
+    "integrations_widgets_urls": [
+        "https://scalar.vector.im/_matrix/integrations/v1",
+        "https://scalar.vector.im/api",
+        "https://scalar-staging.vector.im/_matrix/integrations/v1",
+        "https://scalar-staging.vector.im/api",
+        "https://scalar-staging.riot.im/scalar/api"
+    ],
+    "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "features": {
+        "feature_rich_quoting": "labs",
+        "feature_pinning": "labs",
+        "feature_presence_management": "labs",
+        "feature_sticker_messages": "labs",
+        "feature_jitsi": "labs",
+        "feature_tag_panel": "enable",
+        "feature_keybackup": "labs",
+        "feature_custom_status": "labs",
+        "feature_custom_tags": "labs",
+        "feature_lazyloading": "enable",
+        "feature_tabbed_settings": "labs",
+        "feature_sas": "labs",
+        "feature_room_breadcrumbs": "labs",
+        "feature_state_counters": "labs",
+        "feature_cider_composer": "labs",
+        "feature_many_integration_managers": "labs"
+    },
+    "welcomeUserId": "@riot-bot:matrix.org",
+    "piwik": {
+        "url": "https://piwik.riot.im/",
+        "siteId": 1,
+        "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy"
+    },
+    "roomDirectory": {
+        "servers": [
+            "matrix.org"
+        ]
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false
+    },
+    "terms_and_conditions_links": [
+        {
+            "url": "https://riot.im/privacy",
+            "text": "Privacy Policy"
+        },
+        {
+            "url": "https://matrix.org/docs/guides/riot_im_cookie_policy",
+            "text": "Cookie Policy"
+        }
+    ]
+}
--- a/scripts/compare-file.js
+++ b/scripts/compare-file.js
@@ -0,0 +1,10 @@
+const fs = require("fs");
+
+if (process.argv.length < 4) throw new Error("Missing source and target file arguments");
+
+const sourceFile = fs.readFileSync(process.argv[2], 'utf8');
+const targetFile = fs.readFileSync(process.argv[3], 'utf8');
+
+if (sourceFile !== targetFile) {
+    throw new Error("Files do not match");
+}
--- a/src/components/views/auth/VectorAuthFooter.js
+++ b/src/components/views/auth/VectorAuthFooter.js
@@ -15,45 +15,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-'use strict';
-
-const React = require('react');
+import React from 'react';
 import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';

 import { _t } from 'matrix-react-sdk/lib/languageHandler';

-module.exports = React.createClass({
-    displayName: 'VectorAuthFooter',
-    statics: {
-        replaces: 'AuthFooter',
-    },
+module.exports = () => {
+    const brandingConfig = SdkConfig.get().branding;
+    let links = [
+        {"text": "blog", "url": "https://medium.com/@RiotChat"},
+        {"text": "twitter", "url": "https://twitter.com/@RiotChat"},
+        {"text": "github", "url": "https://github.com/vector-im/riot-web"},
+    ];

-    render: function() {
-        const brandingConfig = SdkConfig.get().branding;
-        let links = [
-            {"text": "blog", "url": "https://medium.com/@RiotChat"},
-            {"text": "twitter", "url": "https://twitter.com/@RiotChat"},
-            {"text": "github", "url": "https://github.com/vector-im/riot-web"},
-        ];
+    if (brandingConfig && brandingConfig.authFooterLinks) {
+        links = brandingConfig.authFooterLinks;
+    }

-        if (brandingConfig && brandingConfig.authFooterLinks) {
-            links = brandingConfig.authFooterLinks;
-        }
-
-        const authFooterLinks = [];
-        for (const linkEntry of links) {
-            authFooterLinks.push(
-                <a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noopener">
-                    {linkEntry.text}
-                </a>,
-            );
-        }
-
-        return (
-            <div className="mx_AuthFooter">
-                {authFooterLinks}
-                <a href="https://matrix.org" target="_blank" rel="noopener">{ _t('powered by Matrix') }</a>
-            </div>
+    const authFooterLinks = [];
+    for (const linkEntry of links) {
+        authFooterLinks.push(
+            <a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noopener">
+                {linkEntry.text}
+            </a>,
        );
-    },
-});
+    }
+
+    return (
+        <div className="mx_AuthFooter">
+            {authFooterLinks}
+            <a href="https://matrix.org" target="_blank" rel="noopener">{ _t('powered by Matrix') }</a>
+        </div>
+    );
+};
+module.exports.statics = {
+    replaces: 'AuthFooter',
+};
--- a/src/components/views/auth/VectorCustomServerDialog.js
+++ b/src/components/views/auth/VectorCustomServerDialog.js
@@ -15,44 +15,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-const React = require("react");
+import React from "react";
 import { _t } from 'matrix-react-sdk/lib/languageHandler';

 /**
 * This is identical to `CustomServerDialog` except for replacing "this app"
 * with "Riot".
 */
-module.exports = React.createClass({
-    displayName: 'VectorCustomServerDialog',
-    statics: {
-        replaces: 'CustomServerDialog',
-    },
-
-    render: function() {
-        return (
-            <div className="mx_ErrorDialog">
-                <div className="mx_Dialog_title">
-                    { _t('Custom Server Options') }
-                </div>
-                <div className="mx_Dialog_content">
-                    <p>{_t(
-                        "You can use the custom server options to sign into other " +
-                        "Matrix servers by specifying a different homeserver URL. This " +
-                        "allows you to use Riot with an existing Matrix account on a " +
-                        "different homeserver.",
-                    )}</p>
-                    <p>{_t(
-                        "You can also set a custom identity server, but you won't be " +
-                        "able to invite users by email address, or be invited by email " +
-                        "address yourself.",
-                    )}</p>
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.props.onFinished} autoFocus={true}>
-                        { _t('Dismiss') }
-                    </button>
-                </div>
+module.exports = ({onFinished}) => {
+    return (
+        <div className="mx_ErrorDialog">
+            <div className="mx_Dialog_title">
+                { _t('Custom Server Options') }
            </div>
-        );
-    },
-});
+            <div className="mx_Dialog_content">
+                <p>{_t(
+                    "You can use the custom server options to sign into other " +
+                    "Matrix servers by specifying a different homeserver URL. This " +
+                    "allows you to use Riot with an existing Matrix account on a " +
+                    "different homeserver.",
+                )}</p>
+                <p>{_t(
+                    "You can also set a custom identity server, but you won't be " +
+                    "able to invite users by email address, or be invited by email " +
+                    "address yourself.",
+                )}</p>
+            </div>
+            <div className="mx_Dialog_buttons">
+                <button onClick={onFinished} autoFocus={true}>
+                    { _t('Dismiss') }
+                </button>
+            </div>
+        </div>
+    );
+};
+module.exports.statics = {
+    replaces: 'CustomServerDialog',
+};
--- a/src/i18n/strings/az.json
+++ b/src/i18n/strings/az.json
@@ -2,5 +2,17 @@
    "Riot is not supported on mobile web. Install the app?": "Riot mobil qurğular üçün veb-saytın versiyasını dəstəkləmir. Proqramı qurmaq?",
    "Riot Desktop on %(platformName)s": "%(platformName)s-da Riot Desktop",
    "Unknown device": "Naməlum qurğu",
-    "You need to be using HTTPS to place a screen-sharing call.": "İş stolunun birgə istifadəsi üçün HTTPS-dan istifadə tələb olunur."
+    "You need to be using HTTPS to place a screen-sharing call.": "İş stolunun birgə istifadəsi üçün HTTPS-dan istifadə tələb olunur.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot konfiqurasiyanızda yanlış JSON var. Lütfən, xətanı düzəldin və səhifəni yeniləyin",
+    "Invalid JSON": "Yanlış JSON",
+    "Sign In": "Daxil ol",
+    "Create Account": "Hesab Aç",
+    "Need help?": "Kömək lazımdır?",
+    "Chat with Riot Bot": "Riot Bot-la söhbət edin",
+    "Explore rooms": "Otaqları kəşf edin",
+    "Your Riot is misconfigured": "Riot yanlış quraşdırılıb",
+    "Unexpected error preparing the app. See console for details.": "Proqramı başladarkən gözlənilməz xəta. Ətraflı məlumat üçün konsola baxın.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Yanlış konfiqurasiya: default_server_config, default_server_name, və ya default_hs_url-dən yalnız birini təyin etməlisiniz.",
+    "Invalid configuration: no default server specified.": "Yanlış konfiqurasiya: ilkin server təyin edilməyib.",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s-da %(browserName)s ilə %(appName)s"
 }
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -46,5 +46,9 @@
    "Unexpected error preparing the app. See console for details.": "Неочаквана грешка при подготвянето на приложението. Вижте конзолата за подробности.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невалидна конфигурация: може да е указано само едно от: default_server_config, default_server_name, или default_hs_url.",
    "Invalid configuration: no default server specified.": "Невалидна конфигурация: не е указан сървър по подразбиране.",
-    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Тази инсталация на Riot изглежда няма валидна конфигурация за сървър. Ако сте администраторът, моля поправете грешката по-долу"
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Тази инсталация на Riot изглежда няма валидна конфигурация за сървър. Ако сте администраторът, моля поправете грешката по-долу",
+    "Your Riot is misconfigured": "Riot не е конфигуриран правилно",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot конфигурацията ви съдържа невалиден JSON. Коригирайте проблема и презаредете страницата.",
+    "The message from the parser is: %(message)s": "Грешката от парсъра е: %(message)s",
+    "Invalid JSON": "Невалиден JSON"
 }
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -46,5 +46,9 @@
    "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App. Siehe Konsole für Details.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.",
    "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.",
-    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Diese Installation von Riot scheint eine ungültige Serverkonfiguration zu haben. Wenn Sie der Administrator sind, korrigieren Sie bitte den folgenden Fehler"
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Diese Installation von Riot scheint eine ungültige Serverkonfiguration zu haben. Wenn Sie der Administrator sind, korrigieren Sie bitte den folgenden Fehler",
+    "Your Riot is misconfigured": "Dein Riot ist falsch konfiguriert",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Riot Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
+    "The message from the parser is: %(message)s": "Die Nachricht des Parsers ist: %(message)s",
+    "Invalid JSON": "Ungültiges JSON"
 }
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,6 +1,9 @@
 {
-    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.",
+    "The message from the parser is: %(message)s": "The message from the parser is: %(message)s",
+    "Invalid JSON": "Invalid JSON",
    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
    "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s",
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -42,5 +42,12 @@
    "Create Account": "Create Account",
    "Need help?": "Need help?",
    "Explore rooms": "Explore rooms",
-    "Room Directory": "Room Directory"
+    "Room Directory": "Room Directory",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.",
+    "The message from the parser is: %(message)s": "The message from the parser is: %(message)s",
+    "Invalid JSON": "Invalid JSON",
+    "Your Riot is misconfigured": "Your Riot is misconfigured",
+    "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
+    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified."
 }
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -36,15 +36,18 @@
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s je %(osName)s",
    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix, per specifo de alia hejmservila URL.<br/>Tio permesas al vi uzi klienton Riot kun jama konto de Matrix en alia hejmservilo.<br/><br/>Vi ankaŭ povas agordi propran identigan servilon, sed vi ne povos inviti uzantojn per retpoŝtadreso, aŭ esti invitata per retpoŝtadreso mem.",
    "Co-ordination for Riot translators": "Kunordigo por tradukantoj de Riot",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas ankaŭ agordi propran identigan servilon, sed vi ne eblos inviti uzantojn per retpoŝtadresoj, nek eblos esti invitita per retpoŝtadreso.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Vi povas ankaŭ agordi propran identigan servilon, sed vi ne eblos inviti uzantojn per retpoŝtadresoj, nek tiel invitiĝi.",
    "Sign In": "Saluti",
    "Create Account": "Krei konton",
    "Need help?": "Ĉu vi bezonas helpon?",
    "Explore rooms": "Esplori ĉambrojn",
    "Room Directory": "Ĉambra dosierujo",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Vi povas uzi proprajn servilajn elekteblojn por saluti aliajn servilojn de Matrix, donante alian hejmeservilan URL-on. Tio povigos vin uzi programon Riot kun jama konto de Matrix en alia hejmservilo.",
-    "Unexpected error preparing the app. See console for details.": "Neatendida eraro okazis dum preparad de la aplikaĵo. Detalojn trovu en konzolo.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Vi povas uzi proprajn servilajn elekteblojn por saluti al aliaj serviloj de Matrix per doni alian hejmeservilan URL-on. Tio povigos vin uzi Riot kun jama konto de Matrix en alia hejmservilo.",
+    "Unexpected error preparing the app. See console for details.": "Neatendita eraro okazis dum la preparado de la aplikaĵo. Rigardu la konzolon por detaloj.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nevalida agordo: vi povas specifi nur unu elekteblon el « default_server_config », « default_server_name », aŭ « default_hs_url ».",
    "Invalid configuration: no default server specified.": "Nevalida agordo: neniu implicita servilo estas specifita.",
-    "Your Riot is misconfigured": "Via kliento Riot estas misagordita"
+    "Your Riot is misconfigured": "Via kliento Riot estas misagordita",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Viaj Riot-agordoj enhavas nevalidan JSON-on. Bonvolu korekti la problemon kaj reŝarĝi la paĝon.",
+    "The message from the parser is: %(message)s": "La mesaĝo el la analizilo estas: %(message)s",
+    "Invalid JSON": "Nevalida JSON"
 }
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -8,7 +8,7 @@
    "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. ¿Quieres instalar la aplicación?",
    "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
    "Welcome to Riot.im": "Bienvenido a Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas &amp;  colaboración con el poder de [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]",
    "Search the room directory": "Buscar en el directorio de salas",
    "Chat with Riot Bot": "Hablar con Riot Bot",
    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos consejos de Riot Bot!",
@@ -42,5 +42,12 @@
    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "También puedes definir un servidor de identidad personalizado,  pero no podrás invitar a usuarios o ser inivitado usando direcciones de correo.",
    "Explore rooms": "Explorar salas",
    "Room Directory": "Directorio de salas",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Puedes usar la opción de servidor personalizado para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Puedes usar la opción de servidor personalizado para iniciar sesión en otros servidores Matrix, especificando la dirección URL del servidor. Esto te permite usar una cuenta Matrix en un servidor diferente.",
+    "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Vea la consola para más detalles.",
+    "Your Riot is misconfigured": "Riot tiene un error de configuración",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración errónea: sólo puede especificar uno de default_server_config, default_server_name, o default_hs_url.",
+    "Invalid configuration: no default server specified.": "Configuración errónea: no se ha especificado servidor.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Tu configuración de Riot contiene JSON inválido. Por favor corrige el error y recarga la página.",
+    "The message from the parser is: %(message)s": "El mensaje del parser es: %(message)s",
+    "Invalid JSON": "JSON inválido"
 }
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -45,5 +45,9 @@
    "Room Directory": "Gelen direktorioa",
    "Unexpected error preparing the app. See console for details.": "Ustekabeko errorea aplikazioa prestatzean. Ikusi xehetasunak kontsolan.",
    "Your Riot is misconfigured": "Zure Riot gaizki konfiguratuta dago",
-    "Invalid configuration: no default server specified.": "Konfigurazio baliogabea: Ez da lehenetsitako zerbitzaririk zehaztu."
+    "Invalid configuration: no default server specified.": "Konfigurazio baliogabea: Ez da lehenetsitako zerbitzaririk zehaztu.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurazio baliogabea: default_server_config, default_server_name, edo default_hs_url bat bakarra zehaztu daiteke.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Zure Riot konfigurazioak baliogabeko JSON kodea du. Zuzendu arazoa eta kargatu orria berriro.",
+    "The message from the parser is: %(message)s": "Prozesatzailearen mezua hau da: %(message)s",
+    "Invalid JSON": "JSON baliogabea"
 }
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -28,7 +28,7 @@
    "Dev chat for the Riot/Web dev team": "Kehittäjäkeskustelu Riot/Web kehitystiimille",
    "Dev chat for the Dendrite dev team": "Kehittäjäkeskustelu Dendrite kehitystiimille",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrixissa on olemassa monia huoneita, jotka on linkitetty olemassa oleviin verkkoihin (Slack, IRC, Gitter yms.). Tutustu hakemistoon!",
-    "powered by Matrix": "Matrix",
+    "powered by Matrix": "moottorina Matrix",
    "Riot is not supported on mobile web. Install the app?": "Riot ei tue laitettasi. Asenna mobiilisovellus?",
    "Design and implementation of E2E in Matrix": "Matrix päästä-päähän salauksen suunnittelu ja implementointi",
    "Contributing code to Matrix and Riot": "Osallistu kehitystyöhön",
@@ -40,6 +40,13 @@
    "Sign In": "Kirjaudu",
    "Create Account": "Luo tili",
    "Need help?": "Tarvitsetko apua?",
-    "Explore rooms": "Etsi huoneita",
-    "Room Directory": "Huoneluettelo"
+    "Explore rooms": "Selaa huoneita",
+    "Room Directory": "Huoneluettelo",
+    "Unexpected error preparing the app. See console for details.": "Odottamaton virhe sovellusta valmisteltaessa. Katso konsolista lisätietoja.",
+    "Your Riot is misconfigured": "Riotin asetukset ovat pielessä",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Virheellinen asetus. Vain yhden seuraavista voi määrittää: default_server_config, default_server_name, tai default_hs_url.",
+    "Invalid configuration: no default server specified.": "Virheellinen asetus: oletuspalvelinta ei ole määritetty.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot-asetuksissasi on virheellistä JSONia. Korjaa ongelma ja lataa sivu uudelleen.",
+    "The message from the parser is: %(message)s": "Viesti jäsentimeltä: %(message)s",
+    "Invalid JSON": "Virheellinen JSON"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -47,5 +47,8 @@
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs entre default_server_config, default_server_name et default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut spécifié.",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Cette installation de Riot semble avoir une configuration de serveur non valide. Si vous êtes l’administrateur, corrigez l’erreur ci-dessous",
-    "Your Riot is misconfigured": "Votre Riot est mal configuré"
+    "Your Riot is misconfigured": "Votre Riot est mal configuré",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Votre configuration de Riot contient du JSON non valide. Corrigez ce problème et rechargez la page.",
+    "The message from the parser is: %(message)s": "Le message de l’analyseur est : %(message)s",
+    "Invalid JSON": "JSON non valide"
 }
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -41,11 +41,14 @@
    "Sign In": "Bejelentkezés",
    "Create Account": "Fiók készítés",
    "Need help?": "Segíthetünk?",
-    "Explore rooms": "Szobák felfedezése",
+    "Explore rooms": "Szobák felderítése",
    "Room Directory": "Szoba lista",
    "Unexpected error preparing the app. See console for details.": "Váratlan hiba történt az alkalmazás előkészítésénél. A részletekért nézd meg a konzolt.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Érvénytelen konfiguráció: csak egyet lehet megadni a default_server_config, default_server_name és default_hs_url közül.",
    "Invalid configuration: no default server specified.": "Érvénytelen konfiguráció: nincs megadva alapértelmezett szerver.",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "A telepített Riotnak úgy tűnik hibás a szerver beállítása. Ha te vagy az adminisztrátor, kérlek javítsd az alábbi hibát",
-    "Your Riot is misconfigured": "A Riotod hibásan van beállítva"
+    "Your Riot is misconfigured": "A Riotod hibásan van beállítva",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "A Riot beállításod érvénytelen JSON szöveget tartalmaz. Kérlek javítsd és töltsd újra az oldalt.",
+    "The message from the parser is: %(message)s": "A feldolgozó algoritmus üzenete: %(message)s",
+    "Invalid JSON": "Érvénytelen JSON"
 }
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -46,5 +46,9 @@
    "Unexpected error preparing the app. See console for details.": "Errore inaspettato preparando l'app. Vedi la console per i dettagli.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurazione non valida: specificare solo uno di default_server_config, default_server_name, o default_hs_url.",
    "Invalid configuration: no default server specified.": "Configurazione non valida: nessun server predefinito specificato.",
-    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Questa installazione di Riot sembra avere una configurazione server non valida. Se sei l'amministratore, correggi l'errore sottostante"
+    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Questa installazione di Riot sembra avere una configurazione server non valida. Se sei l'amministratore, correggi l'errore sottostante",
+    "Your Riot is misconfigured": "Il tuo Riot è configurato male",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "La tua configurazione di Riot contiene un JSON non valido. Correggi il problema e ricarica la pagina.",
+    "The message from the parser is: %(message)s": "Il messaggio dal parser è: %(message)s",
+    "Invalid JSON": "JSON non valido"
 }
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -7,7 +7,7 @@
    "Custom Server Options": "カスタムサーバのオプション",
    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "他のホームサーバのURLを指定することで、他のMatrixサーバにサインインするためにカスタムサーバのオプションを利用できます。<br/>これにより、他のホームサーバ上で既存のMatrixアカウントを用いてRiotを利用できます。<br/><br/>カスタムアイデンティティサーバを立てることもできますが、メールアドレスでユーザを招待する、または自身が招待されることはできません。",
    "Dismiss": "やめる",
-    "powered by Matrix": "Matrixによって動作しています",
+    "powered by Matrix": "Matrix の支援により活動しています。",
    "Riot Desktop on %(platformName)s": "%(platformName)s向けデスクトップ版Riot",
    "You need to be using HTTPS to place a screen-sharing call.": "画面共有通話を行うにはHTTPS通信を使う必要があります。",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "分散型の、暗号化された会話とコラボレーション。[matrix]で動作しています",
@@ -35,5 +35,13 @@
    "Contributing code to Matrix and Riot": "MatrixとRiotにコードを提供する",
    "Dev chat for the Riot/Web dev team": "Riot/Web開発者チームのための開発者チャット",
    "Dev chat for the Dendrite dev team": "Dendrite開発者チームのための開発者チャット",
-    "Co-ordination for Riot translators": "Riot 翻訳者による共同作業"
+    "Co-ordination for Riot translators": "Riot 翻訳者による共同作業",
+    "Unexpected error preparing the app. See console for details.": "アプリケーションの準備中に予期しないエラーが発生しました。詳細はコンソールを参照してください。",
+    "Your Riot is misconfigured": "あなたの Riot は間違って設定されています。",
+    "Invalid configuration: no default server specified.": "不正な設定です：デフォルトのサーバーが設定されていません。",
+    "Sign In": "サインイン",
+    "Create Account": "アカウントを作成する",
+    "Need help?": "助けが必要ですか？",
+    "Explore rooms": "部屋を探索する",
+    "Room Directory": "部屋のディレクトリー"
 }
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -1,13 +1,13 @@
 {
-    "Custom Server Options": "사용자 지정 서버 설정",
-    "Dismiss": "없애기",
-    "powered by Matrix": "Matrix의 지원을 받고 있습니다",
-    "Riot Desktop on %(platformName)s": "%(platformName)s PC용 Riot",
+    "Custom Server Options": "맞춤 서버 설정",
+    "Dismiss": "버리기",
+    "powered by Matrix": "Matrix의 지원을 받음",
+    "Riot Desktop on %(platformName)s": "%(platformName)s 용 Riot 데스크톱",
    "Riot is not supported on mobile web. Install the app?": "”Riot은 모바일 사이트를 지원하지 않습니다. 앱을 설치하시겠어요?",
-    "Unknown device": "알 수 없는 장치",
-    "Welcome to Riot.im": "Riot에 오신 걸 환영해요",
-    "Chat with Riot Bot": "Riot 봇과 대화하기",
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)s",
+    "Unknown device": "알 수 없는 기기",
+    "Welcome to Riot.im": "Riot.im에 오신 것을 환영합니다",
+    "Chat with Riot Bot": "Riot 봇과 대화",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s 용 %(browserName)s에서 연 %(appName)s",
    "You need to be using HTTPS to place a screen-sharing call.": "화면 공유 전화를 걸려면 HTTPS를 사용해야 합니다.",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "분산되고, 암호화된 대화 &amp; [matrix]의 지원으로 협력",
    "Search the room directory": "방 목록 찾기",
@@ -35,5 +35,19 @@
    "Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화",
    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방이 이미 Matrix에 있습니다. 목록을 확인해보세요!",
    "Co-ordination for Riot translators": "Riot 번역자 조합",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "사용자정의 서버 설정에서 다른 홈서버 URL를 지정해 다른 Matrix 서버에 접속할 수 있습니다. <br/>이렇게하면 다른 홈서버에서 기존의 Matrix 계정으로 Riot을 이용할 수 있습니다.<br/><br/>사용자정의 아이덴티티 서버도 설정할 수 있지만 이메일 주소로 이용자를 초대하거나 자신이 이메일 주소로 초대받을 수 없습니다."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "사용자정의 서버 설정에서 다른 홈서버 URL를 지정해 다른 Matrix 서버에 접속할 수 있습니다. <br/>이렇게하면 다른 홈서버에서 기존의 Matrix 계정으로 Riot을 이용할 수 있습니다.<br/><br/>사용자정의 아이덴티티 서버도 설정할 수 있지만 이메일 주소로 이용자를 초대하거나 자신이 이메일 주소로 초대받을 수 없습니다.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot 설정이 올바르지 않은 JSON을 포함하고 있습니다. 문제를 해결한 후, 페이지를 새로고침하세요.",
+    "The message from the parser is: %(message)s": "파서에서 온 메시지: %(message)s",
+    "Invalid JSON": "잘못된 JSON",
+    "Your Riot is misconfigured": "Riot이 잘못 설정됨",
+    "Unexpected error preparing the app. See console for details.": "앱을 준비하는 동안 예기치 않은 오류가 발생했습니다. 자세한 내용은 콘솔을 확인하세요.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "잘못된 설정: default_server_config 와 defalut_server_name, default_hs_url 중 하나만 지정할 수 있습니다.",
+    "Invalid configuration: no default server specified.": "잘못된 설정: 기본 서버가 지정되지 않았습니다.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "다른 홈서버 URL을 지정함으로써 맞춤 서버 옵션을 사용, 다른 Matrix 서버에 로그인할 수 있습니다. 이를 통해 다른 홈서버의 기존 Matrix 계정으로 Riot을 사용할 수 있습니다.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "또한 맞춤 ID 서버를 설정할 수도 있지만, 이메일 주소로 사용자를 초대하거나, 이메일로 직접 초대할 수 없습니다.",
+    "Sign In": "로그인",
+    "Create Account": "계정 만들기",
+    "Need help?": "도움이 필요합니까?",
+    "Explore rooms": "방 검색",
+    "Room Directory": "방 목록"
 }
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -45,5 +45,9 @@
    "Unexpected error preparing the app. See console for details.": "Negaidīta kļūda, sagatavojot lietotni. Sīkāku informāciju skatiet konsolē.",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Šai Riot instalācijai ir nekorekta servera konfigurācija. Ja esat administrators, lūdzu, izlabojiet tālāk norādīto kļūdu",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Nederīga konfigurācija: var norādīt tikai vienu no default_server_config, default_server_name, vai default_hs_url.",
-    "Invalid configuration: no default server specified.": "Nekorekta konfigurācija: nav norādīts noklusējuma serveris."
+    "Invalid configuration: no default server specified.": "Nekorekta konfigurācija: nav norādīts noklusējuma serveris.",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsu Riot konfigurācijā ir nederīgs JSON. Lūdzu, izlabojiet problēmu un ielādējiet lapu atkārtoti.",
+    "The message from the parser is: %(message)s": "Ziņojums no parsētāja ir: %(message)s",
+    "Invalid JSON": "Nederīgs JSON",
+    "Your Riot is misconfigured": "Jūsu Riot ir nepareizi konfigurēts"
 }
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -47,5 +47,8 @@
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ongeldige configuratie: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
    "Invalid configuration: no default server specified.": "Ongeldige configuratie: geen standaardserver opgegeven.",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "De serverconfiguratie van deze Riot-instantie lijkt ongeldig. Als u de beheerder bent, gelieve dan de fout hieronder te corrigeren",
-    "Your Riot is misconfigured": "Uw Riot is verkeerd geconfigureerd"
+    "Your Riot is misconfigured": "Uw Riot is verkeerd geconfigureerd",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Riot-configuratie bevat ongeldige JSON. Corrigeer het probleem en herlaad de pagina.",
+    "The message from the parser is: %(message)s": "Het bericht van de verwerker is: %(message)s",
+    "Invalid JSON": "Ongeldige JSON"
 }
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -40,5 +40,14 @@
    "Sign In": "Zaloguj",
    "Need help?": "Potrzebujesz pomocy?",
    "Room Directory": "Katalog pokojów",
-    "Explore rooms": "Przeglądaj pokoje"
+    "Explore rooms": "Przeglądaj pokoje",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracja Twojego Riot zawiera błędny plik JSON. Popraw swoją konfigurację i odśwież stronę.",
+    "The message from the parser is: %(message)s": "Wiadomość od parsera to: %(message)s",
+    "Invalid JSON": "Błędny JSON",
+    "Your Riot is misconfigured": "Twój Riot jest źle skonfigurowany",
+    "Unexpected error preparing the app. See console for details.": "Niespodziewany błąd podczas przygotowywania aplikacji. Otwórz konsolę po szczegóły.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Błędna konfiguracja. Można sprecyzować tylko jedno z: default_server_config, default_server_name, lub default_hs_url.",
+    "Invalid configuration: no default server specified.": "Błędna konfiguracja: nie wybrano domyślnego serwera.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Możesz użyć Niestandardowych Opcji Serwera by zalogować się do innych serwerów Matrix poprzez podanie URL innego serwera głównego. Dzięki temu możesz używać Riot z istniejącym kontem z innego serwera głównego.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Możesz również ustawić niestandardowy serwer tożsamości, lecz nie będziesz móc zapraszać użytkowników i otrzymywać zaproszeń poprzez podanie adresu email."
 }
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1,5 +1,5 @@
 {
-    "Custom Server Options": "Выбор другого сервера",
+    "Custom Server Options": "Параметры другого сервера",
    "Dismiss": "Отклонить",
    "powered by Matrix": "основано на Matrix",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s с %(browserName)s на %(osName)s",
@@ -47,5 +47,8 @@
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Неверная конфигурация: может указывать только один из следующих параметров: default_server_config, default_server_name или default_hs_url.",
    "Invalid configuration: no default server specified.": "Неверная конфигурация: сервер по умолчанию не указан.",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Эта установка Riot, кажется, имеет неверную конфигурацию сервера. Если вы являетесь администратором, пожалуйста, исправьте ошибку ниже",
-    "Your Riot is misconfigured": "Твой Riot неправильно настроен"
+    "Your Riot is misconfigured": "Ваш Riot неправильно настроен",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Ваша конфигурация Riot содержит  нерабочий JSON. Пожалуйста исправьте проблему и перезагрузите страницу.",
+    "The message from the parser is: %(message)s": "Сообщение из парсера: %(message)s",
+    "Invalid JSON": "Нерабочий JSON"
 }
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -42,5 +42,6 @@
    "Create Account": "Vytvoriť účet",
    "Need help?": "Potrebujete pomoc?",
    "Explore rooms": "Preskúmať miestnosti",
-    "Room Directory": "Adresár miestností"
+    "Room Directory": "Adresár miestností",
+    "Your Riot is misconfigured": "Váš Riot nie je nastavený správne"
 }
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -47,5 +47,8 @@
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Formësim i pavlefshëm: mund të caktohet vetëm një prej default_server_config, default_server_name, ose default_hs_url.",
    "Invalid configuration: no default server specified.": "Formësim i pavlefshëm: s’është caktuar shërbyes parazgjedhje.",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "Ky instalim i Riot-it duket se ka një formësim të pavlefshëm për shërbyesin. Nëse jeni një përgjegjës, ju lutemi, ndreqni gabimin më poshtë",
-    "Your Riot is misconfigured": "Riot-i juaj është i keqformësuar"
+    "Your Riot is misconfigured": "Riot-i juaj është i keqformësuar",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Formësimi juaj i Riot-it përmban JSON. Ju lutemi, ndreqeni problemin dhe ringarkoni faqen.",
+    "The message from the parser is: %(message)s": "Mesazhi prej procesit është: %(message)s",
+    "Invalid JSON": "JSON i pavlefshëm"
 }
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -42,5 +42,12 @@
    "Create Account": "Skapa konto",
    "Need help?": "Behöver du hjälp?",
    "Explore rooms": "Utforska rum",
-    "Room Directory": "Rumslista"
+    "Room Directory": "Rumslista",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Dina Riot-inställningar innhåller ogiltig JSON. Vänligen uppdatera inställningarna och ladda om sidan.",
+    "The message from the parser is: %(message)s": "Medelandet från parsern är: %(message)s",
+    "Invalid JSON": "Ogiltig JSON",
+    "Your Riot is misconfigured": "Riot är felkonfigurerat",
+    "Unexpected error preparing the app. See console for details.": "Oväntat fel vid appstart. Se konsollen för mer information.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ogilitiga inställningar: enbart möjligt att specificera en default_config, default_server, eller default_hs_url.",
+    "Invalid configuration: no default server specified.": "Ogilitiga inställningar: ingen standardserver specificerad."
 }
--- a/src/i18n/strings/ta.json
+++ b/src/i18n/strings/ta.json
@@ -13,5 +13,20 @@
    "Matrix technical discussions": "Matrix தொழில்நுட்ப விவாதங்கள்",
    "Running Matrix services": "இருப்பிலிருக்கும் Matrix சேவைகள்",
    "Building services on Matrix": "Matrix- ல் சேவைகளைக் கட்டமைக்க",
-    "Contributing code to Matrix and Riot": "Matrix மற்றும் Riot -ற்க்கு நிரல் பங்களிக்க"
+    "Contributing code to Matrix and Riot": "Matrix மற்றும் Riot -ற்க்கு நிரல் பங்களிக்க",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "உங்கள் Riot உள்ளமைவில் தவறான JSON உள்ளது. சிக்கலை சரிசெய்து பக்கத்தை மீண்டும் ஏற்றவும்.",
+    "The message from the parser is: %(message)s": "பாகுபடுத்தி அனுப்பிய செய்தி: %(message)s",
+    "Invalid JSON": "தவறான JSON",
+    "Your Riot is misconfigured": "உங்கள் Riot தவறாக உள்ளமைக்கப்பட்டுள்ளது",
+    "Unexpected error preparing the app. See console for details.": "பயன்பாட்டைத் தயாரிப்பதில் எதிர்பாராத பிழை. விவரங்களுக்கு console ஐப் பார்க்கவும்.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "தவறான உள்ளமைவு: default_server_config, default_server_name அல்லது default_hs_url இல் ஒன்றை மட்டுமே குறிப்பிட முடியும்.",
+    "Invalid configuration: no default server specified.": "தவறான உள்ளமைவு: இயல்புநிலை சேவையகம் குறிப்பிடப்படவில்லை.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "வேறுபட்ட ஹோம்சர்வர் URL ஐக் குறிப்பிடுவதன் மூலம் பிற Matrix சேவையகங்களில் உள்நுழைய தனிப்பயன் சேவையக விருப்பங்களைப் பயன்படுத்தலாம். இது வேறு வீட்டு சேவையகத்தில் ஏற்கனவே உள்ள Matrix கணக்கைக் கொண்ட Riot ஐப் பயன்படுத்த உங்களை அனுமதிக்கிறது.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "நீங்கள் தனிப்பயன் அடையாள சேவையகத்தையும் அமைக்கலாம், ஆனால் நீங்கள் மின்னஞ்சல் முகவரி மூலம் பயனர்களை அழைக்க முடியாது, அல்லது மின்னஞ்சல் முகவரியால் உங்களை அழைக்க முடியாது.",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "[matrix] ஆல் இயக்கப்படும் பரவலாக்கப்பட்ட, மறைகுறியாக்கப்பட்ட அரட்டை &amp; ஒத்துழைப்பு",
+    "Sign In": "உள்நுழைக",
+    "Create Account": "உங்கள் கணக்கை துவங்குங்கள்",
+    "Need help?": "உதவி தேவை?",
+    "Explore rooms": "அறைகளை ஆராயுங்கள்",
+    "Room Directory": "அறை அடைவு"
 }
--- a/src/i18n/strings/vi.json
+++ b/src/i18n/strings/vi.json
@@ -16,5 +16,19 @@
    "Get started with some tips from Riot Bot!": "Bắt đầu với các hướng dẫn từ Riot Bot!",
    "General discussion about Matrix and Riot": "Thảo luận chung về Matrix và Riot",
    "Discussion of all things Matrix!": "Thào luận về mọi vấn đề liên quan đến Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat"
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
+    "Unexpected error preparing the app. See console for details.": "Lỗi xảy ra trong lúc chuẩn bị app. Xem console log để biết chi tiết.",
+    "Your Riot is misconfigured": "Hệ thống Riot của bạn bị thiết lập sai",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Thiết lập Riot của bạn chứa JSON không hợp lệ. Bạn hãy sửa lỗi và tải lại trang.",
+    "The message from the parser is: %(message)s": "Nội dung tin là: %(message)s",
+    "Invalid JSON": "JSON không hợp lệ",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Thiết lập không hợp lệ: chỉ có thể điền một trong số default_server_config, default_server_name, hoặc default_hs_url.",
+    "Invalid configuration: no default server specified.": "Cấu hình không hợp lệ: máy chủ mặc định không được thiết lập.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Bạn có thể sử dụng lựa chọn máy chủ khác để đăng nhập vào máy chủ Matrix bằng cách nhập đường dẫn máy chủ riêng. Cách này giúp bạn sử dụng Riot với máy chủ riêng của bạn.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Bạn có thể sử dụng máy chủ định danh riêng, nhưng bạn sẽ không thể mời người dùng bằng email, hoặc được mời bằng email của bạn.",
+    "Sign In": "Đăng nhập",
+    "Create Account": "Tạo tài khoản",
+    "Need help?": "Cần hỗ trợ?",
+    "Explore rooms": "Khám phá phòng chat",
+    "Room Directory": "Danh mục phòng"
 }
--- a/src/i18n/strings/vls.json
+++ b/src/i18n/strings/vls.json
@@ -1,24 +1,27 @@
 {
-    "Unexpected error preparing the app. See console for details.": "’t Es een onverwachte fout ipgetreedn by ’t voorbereiden van den app. Bekykt de console vo details.",
+    "Unexpected error preparing the app. See console for details.": "’t Is een onverwachte foute ipgetreedn by ’t voorbereidn van den app. Bekykt de console vo details.",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "De serverconfiguroatie van deze Riot-instantie lykt oungeldig. A je gy den beheerder zyt, gelieve ton de foute hierounder te corrigeern",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Oungeldige configuroatie: kun slechts één van default_server_config, default_server_name, of default_hs_url ipgeevn.",
-    "Invalid configuration: no default server specified.": "Oungeldige configuroatie: geen standoardserver ipgegeevn.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Oungeldige configuroasje: ku moar één van default_server_config, default_server_name, of default_hs_url ingeevn.",
+    "Invalid configuration: no default server specified.": "Oungeldige configuroasje: geen standoardserver ingegeevn.",
    "Riot Desktop on %(platformName)s": "Riot Desktop ip %(platformName)s",
    "Unknown device": "Ounbekend toestel",
    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s ip %(osName)s",
    "You need to be using HTTPS to place a screen-sharing call.": "Je moet HTTPS gebruukn vo een iproep me schermdeeln te kunn startn.",
    "powered by Matrix": "meuglik gemakt deur Matrix",
    "Custom Server Options": "Angepaste serverinstelliengn",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Je kut d’angepaste serverinstelliengn gebruukn vo jen an te melden by andere Matrix-servers, deur een andere thuusserver-URL in te geevn. Dit laat je toe van Riot te gebruukn met e bestoande Matrix-account by een andere thuusserver.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kut ook een angepaste identiteitsserver instelln, ma je goa geen gebruukers kunn uutnodign via e-mail, of zelve via e-mail uutgenodigd wirden.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Je kut d’angepaste serverinstelliengn gebruukn vo jen eigen an te meldn by andere Matrix-servers, deur een andere thuusserver-URL in te geevn. Da lat je toe van Riot te gebruukn met e bestoande Matrix-account by een andere thuusserver.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Je kut ook een angepasten identiteitsserver instelln, ma je goa geen gebruukers kunn uutnodign via e-mail, of zelve via e-mail uutgenodigd wirden.",
    "Dismiss": "Afwyzn",
    "Welcome to Riot.im": "Welgekommn by Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chattn &amp; soamenwerkn meuglijk gemakt deur [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chattn &amp; soamenwerkn meuglik gemakt deur [matrix]",
    "Sign In": "Anmeldn",
    "Create Account": "Account anmoakn",
    "Need help?": "Hulp nodig?",
    "Chat with Riot Bot": "Chattn me Riot-robot",
    "Explore rooms": "Gesprekkn ountdekkn",
-    "Room Directory": "Gesprekscatalogus",
-    "Your Riot is misconfigured": "Je Riot is verkeerd geconfigureerd gewist"
+    "Room Directory": "Gesprekscataloog",
+    "Your Riot is misconfigured": "Je Riot is verkeerd geconfigureerd gewist",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Je Riot-configuroasje bevat oungeldigen JSON. Corrigeer ’t probleem en herload ’t blad.",
+    "The message from the parser is: %(message)s": "’t Bericht van de verwerker is: %(message)s",
+    "Invalid JSON": "Oungeldigen JSON"
 }
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -47,5 +47,8 @@
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "無效的設定：只能指定 default_server_config、default_server_name 或 default_hs_url 其中之一。",
    "Invalid configuration: no default server specified.": "無效設定：未指定預設的伺服器。",
    "This installation of Riot seems to have an invalid server configuration. If you are the administrator, please correct the error below": "這個 Riot 安裝似乎有無效的伺服器設定。如果您是管理員，請在下方更正錯誤",
-    "Your Riot is misconfigured": "您的 Riot 沒有設定好"
+    "Your Riot is misconfigured": "您的 Riot 沒有設定好",
+    "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "您的 Riot 包含無效的 JSON。請修正問題並重新整理頁面。",
+    "The message from the parser is: %(message)s": "從解析器而來的訊息為：%(message)s",
+    "Invalid JSON": "無效的 JSON"
 }
--- a/src/vector/getconfig.js
+++ b/src/vector/getconfig.js
@@ -17,6 +17,8 @@ limitations under the License.
 import Promise from 'bluebird';
 import request from 'browser-request';

+// Load the config file. First try to load up a domain-specific config of the
+// form "config.$domain.json" and if that fails, fall back to config.json.
 export async function getVectorConfig(relativeLocation) {
    if (relativeLocation === undefined) relativeLocation = '';
    if (relativeLocation !== '' && !relativeLocation.endsWith('/')) relativeLocation += '/';
@@ -35,30 +37,34 @@ export async function getVectorConfig(relativeLocation) {
 function getConfig(configJsonFilename) {
    return new Promise(function(resolve, reject) {
        request(
-            { method: "GET", url: configJsonFilename },
+            { method: "GET", url: configJsonFilename, qs: { cachebuster: Date.now() } },
            (err, response, body) => {
-                if (err || response.status < 200 || response.status >= 300) {
-                    // Lack of a config isn't an error, we should
-                    // just use the defaults.
-                    // Also treat a blank config as no config, assuming
-                    // the status code is 0, because we don't get 404s
-                    // from file: URIs so this is the only way we can
-                    // not fail if the file doesn't exist when loading
-                    // from a file:// URI.
-                    if (response) {
-                        if (response.status == 404 || (response.status == 0 && body == '')) {
-                            resolve({});
+                try {
+                    if (err || response.status < 200 || response.status >= 300) {
+                        // Lack of a config isn't an error, we should
+                        // just use the defaults.
+                        // Also treat a blank config as no config, assuming
+                        // the status code is 0, because we don't get 404s
+                        // from file: URIs so this is the only way we can
+                        // not fail if the file doesn't exist when loading
+                        // from a file:// URI.
+                        if (response) {
+                            if (response.status == 404 || (response.status == 0 && body == '')) {
+                                resolve({});
+                            }
                        }
+                        reject({err: err, response: response});
+                        return;
                    }
-                    reject({err: err, response: response});
-                    return;
-                }

-                // We parse the JSON ourselves rather than use the JSON
-                // parameter, since this throws a parse error on empty
-                // which breaks if there's no config.json and we're
-                // loading from the filesystem (see above).
-                resolve(JSON.parse(body));
+                    // We parse the JSON ourselves rather than use the JSON
+                    // parameter, since this throws a parse error on empty
+                    // which breaks if there's no config.json and we're
+                    // loading from the filesystem (see above).
+                    resolve(JSON.parse(body));
+                } catch (e) {
+                    reject({err: e});
+                }
            },
        );
    });
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -41,6 +41,7 @@
    </script>
    <script src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
    <img src="<%= require('matrix-react-sdk/res/img/warning.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
+    <img src="<%= require('matrix-react-sdk/res/img/e2e/warning.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
    <audio id="messageAudio">
        <source src="media/message.ogg" type="audio/ogg" />
        <source src="media/message.mp3" type="audio/mpeg" />
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -2,6 +2,7 @@
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
 Copyright 2018, 2019 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,9 +33,6 @@ import React from 'react';
 // add React and ReactPerf to the global namespace, to make them easier to
 // access via the console
 global.React = React;
-if (process.env.NODE_ENV !== 'production') {
-    global.Perf = require('react-addons-perf');
-}

 import './modernizr';
 import ReactDOM from 'react-dom';
@@ -43,7 +41,6 @@ import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
 sdk.loadSkin(require('../component-index'));
 import VectorConferenceHandler from 'matrix-react-sdk/lib/VectorConferenceHandler';
 import Promise from 'bluebird';
-import request from 'browser-request';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
 import {_t, _td, newTranslatableError} from 'matrix-react-sdk/lib/languageHandler';
 import AutoDiscoveryUtils from 'matrix-react-sdk/lib/utils/AutoDiscoveryUtils';
@@ -66,8 +63,6 @@ import Olm from 'olm';

 import CallHandler from 'matrix-react-sdk/lib/CallHandler';

-import {getVectorConfig} from './getconfig';
-
 let lastLocationHashSet = null;

 // Disable warnings for now: we use deprecated bluebird functions
@@ -119,7 +114,7 @@ function routeUrl(location) {
 }

 function onHashChange(ev) {
-    if (decodeURIComponent(window.location.hash) == lastLocationHashSet) {
+    if (decodeURIComponent(window.location.hash) === lastLocationHashSet) {
        // we just set this: no need to route it!
        return;
    }
@@ -159,7 +154,7 @@ function makeRegistrationUrl(params) {

    const keys = Object.keys(params);
    for (let i = 0; i < keys.length; ++i) {
-        if (i == 0) {
+        if (i === 0) {
            url += '?';
        } else {
            url += '&';
@@ -170,38 +165,6 @@ function makeRegistrationUrl(params) {
    return url;
 }

-export function getConfig(configJsonFilename) {
-    return new Promise(function(resolve, reject) {
-        request(
-            { method: "GET", url: configJsonFilename },
-            (err, response, body) => {
-                if (err || response.status < 200 || response.status >= 300) {
-                    // Lack of a config isn't an error, we should
-                    // just use the defaults.
-                    // Also treat a blank config as no config, assuming
-                    // the status code is 0, because we don't get 404s
-                    // from file: URIs so this is the only way we can
-                    // not fail if the file doesn't exist when loading
-                    // from a file:// URI.
-                    if (response) {
-                        if (response.status == 404 || (response.status == 0 && body == '')) {
-                            resolve({});
-                        }
-                    }
-                    reject({err: err, response: response});
-                    return;
-                }
-
-                // We parse the JSON ourselves rather than use the JSON
-                // parameter, since this throws a parse error on empty
-                // which breaks if there's no config.json and we're
-                // loading from the filesystem (see above).
-                resolve(JSON.parse(body));
-            },
-        );
-    });
-}
-
 function onTokenLoginCompleted() {
    // if we did a token login, we're now left with the token, hs and is
    // url as query params in the url; a little nasty but let's redirect to
@@ -229,11 +192,6 @@ async function loadApp() {

    await loadOlm();

-    await loadLanguage();
-
-    const fragparts = parseQsFromFragment(window.location);
-    const params = parseQs(window.location);
-
    // set the platform for react sdk
    if (window.ipcRenderer) {
        console.log("Using Electron platform");
@@ -252,20 +210,33 @@ async function loadApp() {
        PlatformPeg.set(new WebPlatform());
    }

-    // Load the config file. First try to load up a domain-specific config of the
-    // form "config.$domain.json" and if that fails, fall back to config.json.
+    const platform = PlatformPeg.get();
+
    let configJson;
    let configError;
+    let configSyntaxError = false;
    try {
-        configJson = await getVectorConfig();
+        configJson = await platform.getConfig();
    } catch (e) {
        configError = e;
+
+        if (e && e.err && e.err instanceof SyntaxError) {
+            console.error("SyntaxError loading config:", e);
+            configSyntaxError = true;
+            configJson = {}; // to prevent errors between here and loading CSS for the error box
+        }
    }

    // XXX: We call this twice, once here and once in MatrixChat as a prop. We call it here to ensure
    // granular settings are loaded correctly and to avoid duplicating the override logic for the theme.
    SdkConfig.put(configJson);

+    // Load language after loading config.json so that settingsDefaults.language can be applied
+    await loadLanguage();
+
+    const fragparts = parseQsFromFragment(window.location);
+    const params = parseQs(window.location);
+
    // don't try to redirect to the native apps if we're
    // verifying a 3pid (but after we've loaded the config)
    // or if the user is following a deep link
@@ -329,6 +300,33 @@ async function loadApp() {
        }
    }

+    // Now that we've loaded the theme (CSS), display the config syntax error if needed.
+    if (configSyntaxError) {
+        const errorMessage = (
+            <div>
+                <p>
+                    {_t(
+                        "Your Riot configuration contains invalid JSON. Please correct the problem " +
+                        "and reload the page.",
+                    )}
+                </p>
+                <p>
+                    {_t(
+                        "The message from the parser is: %(message)s",
+                        {message: configError.err.message || _t("Invalid JSON")},
+                    )}
+                </p>
+            </div>
+        );
+
+        const GenericErrorPage = sdk.getComponent("structures.GenericErrorPage");
+        window.matrixChat = ReactDOM.render(
+            <GenericErrorPage message={errorMessage} title={_t("Your Riot is misconfigured")} />,
+            document.getElementById('matrixchat'),
+        );
+        return;
+    }
+
    const validBrowser = checkBrowserFeatures([
        "displaytable", "flexbox", "es5object", "es5function", "localstorage",
        "objectfit", "indexeddb", "webworkers",
@@ -336,13 +334,13 @@ async function loadApp() {

    const acceptInvalidBrowser = window.localStorage && window.localStorage.getItem('mx_accepts_unsupported_browser');

-    console.log("Vector starting at "+window.location);
+    const urlWithoutQuery = window.location.protocol + '//' + window.location.host + window.location.pathname;
+    console.log("Vector starting at " + urlWithoutQuery);
    if (configError) {
        window.matrixChat = ReactDOM.render(<div className="error">
            Unable to load config file: please refresh the page to try again.
        </div>, document.getElementById('matrixchat'));
    } else if (validBrowser || acceptInvalidBrowser) {
-        const platform = PlatformPeg.get();
        platform.startUpdater();

        // Don't bother loading the app until the config is verified
@@ -410,7 +408,7 @@ function loadOlm() {
    }).then(() => {
        console.log("Using WebAssembly Olm");
    }).catch((e) => {
-        console.log("Failed to load Olm: trying legacy version");
+        console.log("Failed to load Olm: trying legacy version", e);
        return new Promise((resolve, reject) => {
            const s = document.createElement('script');
            s.src = 'olm_legacy.js'; // XXX: This should be cache-busted too
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -92,9 +92,12 @@ async function initPage() {
    if (isUrl && !isUrl.endsWith('/')) isUrl += '/';

    if (hsUrl !== 'https://matrix.org/') {
+        document.getElementById('configure_riot_button').href =
+            "https://riot.im/config/config?hs_url=" + encodeURIComponent(hsUrl) +
+            "&is_url=" + encodeURIComponent(isUrl);
+        document.getElementById('step1_heading').innerHTML= '1: Install the app';
        document.getElementById('step2_container').style.display = 'block';
        document.getElementById('hs_url').innerText = hsUrl;
-        document.getElementById('step_login_header').innerHTML= 'Step 3: Register or Log in';

        if (isUrl && isUrl !== "https://vector.im/") {
            document.getElementById('default_is').style.display = 'none';
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -4,6 +4,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -101,6 +102,10 @@ export default class ElectronPlatform extends VectorBasePlatform {
        this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
    }

+    async getConfig(): Promise<{}> {
+        return this._ipcCall('getConfig');
+    }
+
    async onUpdateDownloaded(ev, updateInfo) {
        dis.dispatch({
            action: 'new_version',
@@ -169,7 +174,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
    }

    async getAppVersion(): Promise<string> {
-        return await this._ipcCall('getAppVersion');
+        return this._ipcCall('getAppVersion');
    }

    supportsAutoLaunch(): boolean {
@@ -177,11 +182,23 @@ export default class ElectronPlatform extends VectorBasePlatform {
    }

    async getAutoLaunchEnabled(): boolean {
-        return await this._ipcCall('getAutoLaunchEnabled');
+        return this._ipcCall('getAutoLaunchEnabled');
    }

    async setAutoLaunchEnabled(enabled: boolean): void {
-        return await this._ipcCall('setAutoLaunchEnabled', enabled);
+        return this._ipcCall('setAutoLaunchEnabled', enabled);
+    }
+
+    supportsAutoHideMenuBar(): boolean {
+        return true;
+    }
+
+    async getAutoHideMenuBarEnabled(): boolean {
+        return this._ipcCall('getAutoHideMenuBarEnabled');
+    }
+
+    async setAutoHideMenuBarEnabled(enabled: boolean): void {
+        return this._ipcCall('setAutoHideMenuBarEnabled', enabled);
    }

    supportsMinimizeToTray(): boolean {
@@ -189,11 +206,11 @@ export default class ElectronPlatform extends VectorBasePlatform {
    }

    async getMinimizeToTrayEnabled(): boolean {
-        return await this._ipcCall('getMinimizeToTrayEnabled');
+        return this._ipcCall('getMinimizeToTrayEnabled');
    }

    async setMinimizeToTrayEnabled(enabled: boolean): void {
-        return await this._ipcCall('setMinimizeToTrayEnabled', enabled);
+        return this._ipcCall('setMinimizeToTrayEnabled', enabled);
    }

    async canSelfUpdate(): boolean {
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -4,6 +4,7 @@
 Copyright 2016 Aviral Dasgupta
 Copyright 2016 OpenMarket Ltd
 Copyright 2018 New Vector Ltd
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@ limitations under the License.
 import BasePlatform from 'matrix-react-sdk/lib/BasePlatform';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import dis from 'matrix-react-sdk/lib/dispatcher';
+import {getVectorConfig} from "../getconfig";

 import Favico from 'favico.js';

@@ -44,6 +46,10 @@ export default class VectorBasePlatform extends BasePlatform {
        this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
    }

+    async getConfig(): Promise<{}> {
+        return getVectorConfig();
+    }
+
    getHumanReadableName(): string {
        return 'Vector Base Platform'; // no translation required: only used for analytics
    }
--- a/src/vector/rageshakesetup.js
+++ b/src/vector/rageshakesetup.js
@@ -50,6 +50,10 @@ initRageshake();

 global.mxSendRageshake = function(text, withLogs) {
    if (withLogs === undefined) withLogs = true;
+    if (!text || !text.trim()) {
+        console.error("Cannot send a rageshake without a message - please tell us what went wrong");
+        return;
+    }
    require(['matrix-react-sdk/lib/rageshake/submit-rageshake'], (s) => {
        s(SdkConfig.get().bug_report_endpoint_url, {
            userText: text,
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -34,7 +34,7 @@ const RoomView = sdk.getComponent('structures.RoomView');

 const React = require('react');
 const ReactDOM = require('react-dom');
-const ReactTestUtils = require('react-addons-test-utils');
+const ReactTestUtils = require('react-dom/test-utils');
 const expect = require('expect');
 import Promise from 'bluebird';
 import {makeType} from "matrix-react-sdk/lib/utils/TypeUtils";
@@ -104,7 +104,6 @@ describe('joining a room', function() {
                    hsName: "TEST_ENVIRONMENT",
                    hsNameIsDifferent: false, // yes, we lie
                    isUrl: IS_URL,
-                    identityEnabled: true,
                }),
            };

--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -23,7 +23,7 @@ import 'skin-sdk';

 import React from 'react';
 import ReactDOM from 'react-dom';
-import ReactTestUtils from 'react-addons-test-utils';
+import ReactTestUtils from 'react-dom/test-utils';
 import expect from 'expect';
 import Promise from 'bluebird';
 import MatrixReactTestUtils from 'matrix-react-test-utils';
@@ -153,7 +153,6 @@ describe('loading:', function() {
                hsName: "TEST_ENVIRONMENT",
                hsNameIsDifferent: false, // yes, we lie
                isUrl: DEFAULT_IS_URL,
-                identityEnabled: true,
            }),
            embeddedPages: {
                homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -152,7 +152,6 @@ module.exports = {
            // using `npm link` / `yarn link`.
            "react": path.resolve('./node_modules/react'),
            "react-dom": path.resolve('./node_modules/react-dom'),
-            "react-addons-perf": path.resolve('./node_modules/react-addons-perf'),

            // same goes for js-sdk
            "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
--- a/yarn.lock
+++ b/yarn.lock