v1.7.16

Upgrade JS SDK to 9.4.1 and React SDK to 3.11.1
Prepare changelog for v1.7.16
2020-12-21 17:46:39 +00:00 · 2020-12-21 17:43:11 +00:00 · 2020-12-21 17:39:56 +00:00 · 2020-12-21 17:13:43 +00:00 · 2020-12-21 17:11:53 +00:00 · 2020-12-16 16:43:59 +00:00
81 changed files with 2466 additions and 938 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,7 +8,7 @@ module.exports = {
        "quotes": "off",
    },
    "overrides": [{
-        "files": ["src/**/*.{ts, tsx}"],
+        "files": ["src/**/*.{ts,tsx}"],
        "extends": ["matrix-org/ts", "matrix-org/react"],
        "env": {
            "browser": true,
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -38,7 +38,7 @@ For the web app:

 - **Browser**: Chrome, Safari, Firefox? which version?
 - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+- **URL**: develop.element.io / app.element.io / somewhere else? If a private server, what version of Element Web?

 For the desktop app:

--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -48,7 +48,7 @@ For the web app:

 - **Browser**: Chrome, Safari, Firefox? which version?
 - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+- **URL**: develop.element.io / app.element.io / somewhere else? If a private server, what version of Element Web?

 For the desktop app:

--- a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
@@ -50,7 +50,7 @@ For the web app:

 - **Browser**: Chrome, Safari, Firefox? which version?
 - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+- **URL**: develop.element.io / app.element.io / somewhere else? If a private server, what version of Element Web?

 For the desktop app:

--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -19,7 +19,7 @@ module.exports = {
        "at-rule-no-unknown": null,
        "no-descending-specificity": null,
        "scss/at-rule-no-unknown": [true, {
-            // https://github.com/vector-im/riot-web/issues/10544
+            // https://github.com/vector-im/element-web/issues/10544
            "ignoreAtRules": ["define-mixin"],
        }],
    }
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -16,3 +16,6 @@ include:

 * Alexandr Korsak (https://github.com/oivoodoo)
  Improved multiple file uploading
+
+* Thom Cleary (https://github.com/thomcatdotrocks)
+  Small update for tarball deployment
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,271 @@
+Changes in [1.7.16](https://github.com/vector-im/element-web/releases/tag/v1.7.16) (2020-12-21)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16-rc.1...v1.7.16)
+
+ * Upgrade to React SDK 3.11.1 and JS SDK 9.4.1
+
+Changes in [1.7.16-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.16-rc.1) (2020-12-16)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15...v1.7.16-rc.1)
+
+ * Upgrade to React SDK 3.11.0-rc.2 and JS SDK 9.4.0-rc.2
+ * Translations update from Weblate
+   [\#15979](https://github.com/vector-im/element-web/pull/15979)
+ * Bump ini from 1.3.5 to 1.3.7
+   [\#15949](https://github.com/vector-im/element-web/pull/15949)
+ * Document pull request previews
+   [\#15937](https://github.com/vector-im/element-web/pull/15937)
+ * Improve asset path for KaTeX fonts
+   [\#15939](https://github.com/vector-im/element-web/pull/15939)
+ * Fix an important semicolon
+   [\#15912](https://github.com/vector-im/element-web/pull/15912)
+ * Bump highlight.js from 10.1.2 to 10.4.1
+   [\#15898](https://github.com/vector-im/element-web/pull/15898)
+ * Add gitter.im to room directory
+   [\#15894](https://github.com/vector-im/element-web/pull/15894)
+ * Extend Platform to support idpId for SSO flows
+   [\#15771](https://github.com/vector-im/element-web/pull/15771)
+ * Include KaTeX CSS as a dependency
+   [\#15843](https://github.com/vector-im/element-web/pull/15843)
+
+Changes in [1.7.15](https://github.com/vector-im/element-web/releases/tag/v1.7.15) (2020-12-07)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15-rc.1...v1.7.15)
+
+ * Upgrade to React SDK 3.10.0 and JS SDK 9.3.0
+
+Changes in [1.7.15-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.15-rc.1) (2020-12-02)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14...v1.7.15-rc.1)
+
+ * Upgrade to React SDK 3.10.0-rc.1 and JS SDK 9.3.0-rc.1
+ * Include KaTeX CSS as a dependency
+   [\#15843](https://github.com/vector-im/element-web/pull/15843)
+ * Translations update from Weblate
+   [\#15884](https://github.com/vector-im/element-web/pull/15884)
+ * added katex.min.css to webpack for math support (main PR in matrix-react-
+   sdk)
+   [\#15277](https://github.com/vector-im/element-web/pull/15277)
+ * Rebrand package name and other details
+   [\#15828](https://github.com/vector-im/element-web/pull/15828)
+ * Bump highlight.js from 9.18.1 to 10.1.2
+   [\#15819](https://github.com/vector-im/element-web/pull/15819)
+ * Update branding of packaging artifacts
+   [\#15810](https://github.com/vector-im/element-web/pull/15810)
+ * Update the react-sdk reference in the lockfile
+   [\#15814](https://github.com/vector-im/element-web/pull/15814)
+ * Update widget API for good measure in Element Web
+   [\#15812](https://github.com/vector-im/element-web/pull/15812)
+ * Stop publishing Element to NPM
+   [\#15811](https://github.com/vector-im/element-web/pull/15811)
+ * Add inotify instance limit info to README
+   [\#15795](https://github.com/vector-im/element-web/pull/15795)
+
+Changes in [1.7.14](https://github.com/vector-im/element-web/releases/tag/v1.7.14) (2020-11-23)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14-rc.1...v1.7.14)
+
+ * Upgrade to React SDK 3.9.0 and JS SDK 9.2.0
+
+Changes in [1.7.14-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.14-rc.1) (2020-11-18)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.13...v1.7.14-rc.1)
+
+ * Upgrade to React SDK 3.9.0-rc.1 and JS SDK 9.2.0-rc.1
+ * Translations update from Weblate
+   [\#15767](https://github.com/vector-im/element-web/pull/15767)
+ * Update the widget-api for element-web
+   [\#15717](https://github.com/vector-im/element-web/pull/15717)
+
+Changes in [1.7.13](https://github.com/vector-im/element-web/releases/tag/v1.7.13) (2020-11-09)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.13-rc.1...v1.7.13)
+
+ * Upgrade to React SDK 3.8.0 and JS SDK 9.1.0
+
+Changes in [1.7.13-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.13-rc.1) (2020-11-04)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.12...v1.7.13-rc.1)
+
+ * Upgrade to React SDK 3.8.0-rc.1 and JS SDK 9.1.0-rc.1
+ * Translations update from Weblate
+   [\#15644](https://github.com/vector-im/element-web/pull/15644)
+ * Add countly experiment to develop/nightly configs
+   [\#15614](https://github.com/vector-im/element-web/pull/15614)
+ * Add documentation for new UIFeature flag regarding room history settings
+   [\#15592](https://github.com/vector-im/element-web/pull/15592)
+ * Rename Docker repo in docs
+   [\#15590](https://github.com/vector-im/element-web/pull/15590)
+ * Fix Jitsi regressions with custom themes
+   [\#15575](https://github.com/vector-im/element-web/pull/15575)
+
+Changes in [1.7.12](https://github.com/vector-im/element-web/releases/tag/v1.7.12) (2020-10-28)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11...v1.7.12)
+
+ * Upgrade to React SDK 3.7.1 and JS SDK 9.0.1
+ * [Release] Fix Jitsi regressions with custom themes
+   [\#15577](https://github.com/vector-im/element-web/pull/15577)
+
+Changes in [1.7.11](https://github.com/vector-im/element-web/releases/tag/v1.7.11) (2020-10-26)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11-rc.1...v1.7.11)
+
+ * Upgrade to React SDK 3.7.0 and JS SDK 9.0.0
+
+Changes in [1.7.11-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.11-rc.1) (2020-10-21)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.10...v1.7.11-rc.1)
+
+ * Upgrade to React SDK 3.7.0-rc.2 and JS SDK 9.0.0-rc.1
+ * Update Weblate URL
+   [\#15516](https://github.com/vector-im/element-web/pull/15516)
+ * Translations update from Weblate
+   [\#15517](https://github.com/vector-im/element-web/pull/15517)
+ * Jitsi accept theme variable and restyle
+   [\#15499](https://github.com/vector-im/element-web/pull/15499)
+ * Skip editor confirmation of upgrades
+   [\#15506](https://github.com/vector-im/element-web/pull/15506)
+ * Adjust for new widget messaging APIs
+   [\#15495](https://github.com/vector-im/element-web/pull/15495)
+ * Use HTTPS_PROXY environment variable for downloading external_api.min…
+   [\#15479](https://github.com/vector-im/element-web/pull/15479)
+ * Document customisation points
+   [\#15475](https://github.com/vector-im/element-web/pull/15475)
+ * Don't fatally end the Jitsi widget when it's not being used as a widget
+   [\#15466](https://github.com/vector-im/element-web/pull/15466)
+ * electron-platform: Pass the user/devce id pair when initializing the event
+   index.
+   [\#15455](https://github.com/vector-im/element-web/pull/15455)
+
+Changes in [1.7.10](https://github.com/vector-im/element-web/releases/tag/v1.7.10) (2020-10-20)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9...v1.7.10)
+
+ * [Release] Adjust for new widget messaging APIs
+   [\#15497](https://github.com/vector-im/element-web/pull/15497)
+ * Upgrade to React SDK 3.6.1
+
+Changes in [1.7.9](https://github.com/vector-im/element-web/releases/tag/v1.7.9) (2020-10-12)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.9-rc.1...v1.7.9)
+
+ * Upgrade to React SDK 3.6.0 and JS SDK 8.5.0
+
+Changes in [1.7.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.9-rc.1) (2020-10-07)
+=======================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.8...v1.7.9-rc.1)
+
+ * Upgrade to React SDK 3.6.0-rc.1 and JS SDK 8.5.0-rc.1
+ * Update from Weblate
+   [\#15406](https://github.com/vector-im/element-web/pull/15406)
+ * Update Jest and JSDOM
+   [\#15402](https://github.com/vector-im/element-web/pull/15402)
+ * Add support for dehydration/fallback keys
+   [\#15398](https://github.com/vector-im/element-web/pull/15398)
+ * Remove riot-bot from sample config
+   [\#15376](https://github.com/vector-im/element-web/pull/15376)
+ * Switch to using the Widget API SDK for Jitsi widgets
+   [\#15102](https://github.com/vector-im/element-web/pull/15102)
+ * Remove workbox
+   [\#15352](https://github.com/vector-im/element-web/pull/15352)
+ * Disable workbox when running in webpack dev server, not in dev mode
+   [\#15345](https://github.com/vector-im/element-web/pull/15345)
+ * Update Riot -> Element in contribute.json
+   [\#15326](https://github.com/vector-im/element-web/pull/15326)
+ * Update Riot -> Element in redeploy.py
+   [\#15336](https://github.com/vector-im/element-web/pull/15336)
+ * Update Riot -> Element in docs/feature-flags.md
+   [\#15325](https://github.com/vector-im/element-web/pull/15325)
+ * Update Riot -> Element in element.io/README.md
+   [\#15327](https://github.com/vector-im/element-web/pull/15327)
+ * Update Riot -> Element in VectorAuthFooter
+   [\#15328](https://github.com/vector-im/element-web/pull/15328)
+ * Update Riot -> Element in VectorEmbeddedPage
+   [\#15329](https://github.com/vector-im/element-web/pull/15329)
+ * Update Riot -> Element in docs/review.md
+   [\#15330](https://github.com/vector-im/element-web/pull/15330)
+ * Update Riot -> Element in welcome.html
+   [\#15332](https://github.com/vector-im/element-web/pull/15332)
+ * Update Riot -> Element in issues-burndown.pl
+   [\#15333](https://github.com/vector-im/element-web/pull/15333)
+ * Update Riot -> Element in redeploy.py
+   [\#15334](https://github.com/vector-im/element-web/pull/15334)
+ * Update Riot -> Element in index.ts
+   [\#15335](https://github.com/vector-im/element-web/pull/15335)
+ * Update Riot -> Element Web in issue templates
+   [\#15324](https://github.com/vector-im/element-web/pull/15324)
+ * Give the Jitsi widget an icon to help with discovery
+   [\#15316](https://github.com/vector-im/element-web/pull/15316)
+ * Jitsi widget wrapper updates for hangup button
+   [\#15219](https://github.com/vector-im/element-web/pull/15219)
+ * Tidy up Service Worker, only run Workbox in production
+   [\#15271](https://github.com/vector-im/element-web/pull/15271)
+ * Remove conference handler
+   [\#15274](https://github.com/vector-im/element-web/pull/15274)
+ * Rebrand the webpack pipeline for Element
+   [\#15266](https://github.com/vector-im/element-web/pull/15266)
+ * Replace dummy sw.js with pre-caching and runtime-caching workbox SW
+   [\#15196](https://github.com/vector-im/element-web/pull/15196)
+
+Changes in [1.7.8](https://github.com/vector-im/element-web/releases/tag/v1.7.8) (2020-09-28)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.8-rc.1...v1.7.8)
+
+ * Upgrade to React SDK 3.5.0 and JS SDK 8.4.1
+
+Changes in [1.7.8-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.8-rc.1) (2020-09-23)
+=======================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.7...v1.7.8-rc.1)
+
+ * Upgrade to React SDK 3.5.0-rc.1 and JS SDK 8.4.0-rc.1
+ * Update from Weblate
+   [\#15262](https://github.com/vector-im/element-web/pull/15262)
+ * Upgrade sanitize-html
+   [\#15260](https://github.com/vector-im/element-web/pull/15260)
+ * Document config for preferring Secure Backup setup methods
+   [\#15251](https://github.com/vector-im/element-web/pull/15251)
+ * Add end-user documentation for UI features
+   [\#15190](https://github.com/vector-im/element-web/pull/15190)
+ * Update git checkout instructions
+   [\#15218](https://github.com/vector-im/element-web/pull/15218)
+ * If no bug_report_endpoint_url, hide rageshaking from the App
+   [\#15201](https://github.com/vector-im/element-web/pull/15201)
+ * Bump node-fetch from 2.6.0 to 2.6.1
+   [\#15153](https://github.com/vector-im/element-web/pull/15153)
+ * Remove references to Travis CI
+   [\#15137](https://github.com/vector-im/element-web/pull/15137)
+ * Fix onNewScreen to use replace when going from roomId->roomAlias
+   [\#15127](https://github.com/vector-im/element-web/pull/15127)
+ * Enable Estonian in language menu
+   [\#15136](https://github.com/vector-im/element-web/pull/15136)
+
+Changes in [1.7.7](https://github.com/vector-im/element-web/releases/tag/v1.7.7) (2020-09-14)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6...v1.7.7)
+
+ * Upgrade to React SDK 3.4.1
+
+Changes in [1.7.6](https://github.com/vector-im/element-web/releases/tag/v1.7.6) (2020-09-14)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6-rc.1...v1.7.6)
+
+ * Upgrade to React SDK 3.4.0 and JS SDK 8.3.0
+
+Changes in [1.7.6-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.6-rc.1) (2020-09-09)
+=======================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5...v1.7.6-rc.1)
+
+ * Upgrade to React SDK 3.4.0-rc.1 and JS SDK 8.3.0-rc.1
+ * Update from Weblate
+   [\#15125](https://github.com/vector-im/element-web/pull/15125)
+ * Support usage of Jitsi widgets with "openidtoken-jwt" auth
+   [\#15114](https://github.com/vector-im/element-web/pull/15114)
+ * Fix eslint ts override tsx matching and delint
+   [\#15064](https://github.com/vector-im/element-web/pull/15064)
+ * Add testing to review guidelines
+   [\#15050](https://github.com/vector-im/element-web/pull/15050)
+
 Changes in [1.7.5](https://github.com/vector-im/element-web/releases/tag/v1.7.5) (2020-09-01)
 =============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5-rc.1...v1.7.5)
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,4 +1,4 @@
-Contributing code to Riot
-=========================
+Contributing code to Element
+============================

-Riot follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.rst.
+Element follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.rst.
--- a/2
+++ b/2
@@ -2,7 +2,7 @@
 FROM node:12 as builder

 # Support custom branches of the react-sdk and js-sdk. This also helps us build
-# images of riot-web develop.
+# images of element-web develop.
 ARG USE_CUSTOM_SDKS=false
 ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git"
 ARG REACT_SDK_BRANCH="master"
--- a/README.md
+++ b/README.md
@@ -39,14 +39,14 @@ released version of Element:

 1. Download the latest version from https://github.com/vector-im/element-web/releases
 1. Untar the tarball on your web server
-1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name
+1. Move (or symlink) the `element-x.x.x` directory to an appropriate name
 1. Configure the correct caching headers in your webserver (see below)
 1. If desired, copy `config.sample.json` to `config.json` and edit it
   as desired. See the [configuration docs](docs/config.md) for details.
 1. Enter the URL into your browser and log into Element!

 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.
+at https://packages.riot.im/element-release-key.asc.

 Note that for the security of your chats will need to serve Element
 over HTTPS. Major browsers also do not allow you to use VoIP/video
@@ -129,14 +129,14 @@ Running from Docker
 The Docker image can be used to serve element-web as a web server. The easiest way to use
 it is to use the prebuilt image:
 ```bash
-docker run -p 80:80 vectorim/riot-web
+docker run -p 80:80 vectorim/element-web
 ```

 To supply your own custom `config.json`, map a volume to `/app/config.json`. For example,
 if your custom config was located at `/etc/element-web/config.json` then your Docker command
 would be:
 ```bash
-docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/riot-web
+docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-web
 ```

 To build the image yourself:
@@ -225,7 +225,6 @@ First clone and build `matrix-js-sdk`:
 ``` bash
 git clone https://github.com/matrix-org/matrix-js-sdk.git
 pushd matrix-js-sdk
-git checkout develop
 yarn link
 yarn install
 popd
@@ -236,7 +235,6 @@ Then similarly with `matrix-react-sdk`:
 ```bash
 git clone https://github.com/matrix-org/matrix-react-sdk.git
 pushd matrix-react-sdk
-git checkout develop
 yarn link
 yarn link matrix-js-sdk
 yarn install
@@ -248,7 +246,6 @@ Finally, build and start Element itself:
 ```bash
 git clone https://github.com/vector-im/element-web.git
 cd element-web
-git checkout develop
 yarn link matrix-js-sdk
 yarn link matrix-react-sdk
 yarn install
@@ -278,22 +275,29 @@ modifying it. See the [configuration docs](docs/config.md) for details.
 Open http://127.0.0.1:8080/ in your browser to see your newly built Element.

 **Note**: The build script uses inotify by default on Linux to monitor directories
-for changes. If the inotify watch limit is too low your build will silently fail.
-To avoid this issue, we recommend a limit of at least 128M.
+for changes. If the inotify limits are too low your build will fail silently or with
+`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit
+of at least `128M` and instance limit around `512`.

-To set a new inotify watch limit, execute:
+You may be interested in issues [#15750](https://github.com/vector-im/element-web/issues/15750) and
+[#15774](https://github.com/vector-im/element-web/issues/15774) for further details.
+
+To set a new inotify watch and instance limit, execute:

 ```
-$ sudo sysctl fs.inotify.max_user_watches=131072
-$ sudo sysctl -p
+sudo sysctl fs.inotify.max_user_watches=131072
+sudo sysctl fs.inotify.max_user_instances=512
+sudo sysctl -p
 ```

-If you wish, you can make this new limit permanent, by executing:
+If you wish, you can make the new limits permanent, by executing:

 ```
-$ echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
-$ sudo sysctl -p
+echo fs.inotify.max_user_watches=131072 | sudo tee -a /etc/sysctl.conf
+echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf
+sudo sysctl -p
 ```
+
 ___

 When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
@@ -336,7 +340,7 @@ To add a new translation, head to the [translating doc](docs/translating.md).

 For a developer guide, see the [translating dev doc](docs/translating-dev.md).

-[<img src="https://translate.riot.im/widgets/element-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.riot.im/engage/element-web/?utm_source=widget)
+[<img src="https://translate.element.io/widgets/element-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.element.io/engage/element-web/?utm_source=widget)

 Triaging issues
 ===============
--- a/config.sample.json
+++ b/config.sample.json
@@ -35,7 +35,6 @@
            "matrix.org"
        ]
    },
-    "welcomeUserId": "@riot-bot:matrix.org",
    "piwik": {
        "url": "https://piwik.riot.im/",
        "whitelistedHSUrls": ["https://matrix.org"],
--- a/contribute.json
+++ b/contribute.json
@@ -1,13 +1,13 @@
 {
-  "name": "Riot",
+  "name": "Element",
    "description": "A glossy Matrix collaboration client for the web.",
    "repository": {
-      "url": "https://github.com/vector-im/riot-web",
+      "url": "https://github.com/vector-im/element-web",
      "license": "Apache License 2.0"
    },
    "bugs": {
-      "list": "https://github.com/vector-im/riot-web/issues",
-      "report": "https://github.com/vector-im/riot-web/issues/new/choose"
+      "list": "https://github.com/vector-im/element-web/issues",
+      "report": "https://github.com/vector-im/element-web/issues/new/choose"
    },
    "keywords": [
      "chat",
--- a/docs/app-load.md
+++ b/docs/app-load.md
@@ -74,7 +74,7 @@ Key:

 Notes:
 + A task begins when all its dependencies (arrows going into it) are fulfilled.
-+ The success of setting up rageshake is never asserted, riot-web has a fallback path for running without IDB (and thus rageshake).
+ The success of setting up rageshake is never asserted, element-web has a fallback path for running without IDB (and thus rageshake).
 + Everything is awaited to be settled before the Modernizr check, to allow it to make use of things like i18n if they are successful.

 Underlying dependencies:
--- a/docs/config.md
+++ b/docs/config.md
@@ -48,7 +48,7 @@ For a good example, see https://develop.element.io/config.json.
 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
+   "Send Logs" within the application. Bug reports can be disabled/hidden 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
@@ -101,6 +101,15 @@ For a good example, see https://develop.element.io/config.json.
    Defaults to false (3rd party identity options are shown).
 1. `default_federate`: Default option for room federation when creating a room
    Defaults to true (room federation enabled).
+1. `desktopBuilds`: Used to alter promotional links to the desktop app. By default
+   the builds are considered available and accessible from https://element.io. This
+   config option is typically used in the context of encouraging encrypted message
+   search capabilities (Seshat). All the options listed below are required if this
+   option is specified.
+   1. `available`: When false, the desktop app will not be promoted to the user.
+   1. `logo`: An HTTP URL to the avatar for the desktop build. Should be 24x24, ideally
+      an SVG.
+   1. `url`: An HTTP URL for where to send the user to download the desktop build.

 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 Element
@@ -143,4 +152,45 @@ decentralised.
 Desktop app configuration
 =========================

-See https://github.com/vector-im/riot-desktop#user-specified-configjson
+See https://github.com/vector-im/element-desktop#user-specified-configjson
+
+UI Features
+===========
+
+Parts of the UI can be disabled using UI features. These are settings which appear
+under `settingDefaults` and can only be `true` (default) or `false`. When `false`,
+parts of the UI relating to that feature will be disabled regardless of the user's
+preferences.
+
+Currently, the following UI feature flags are supported:
+
+* `UIFeature.urlPreviews` - Whether URL previews are enabled across the entire application.
+* `UIFeature.feedback` - Whether prompts to supply feedback are shown.
+* `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
+  Jitsi widgets will still work though they cannot easily be added.
+* `UIFeature.widgets` - Whether or not widgets will be shown.
+* `UIFeature.flair` - Whether or not community flair is shown in rooms.
+* `UIFeature.communities` - Whether or not to show any UI related to communities. Implicitly
+  disables `UIFeature.flair` when disabled.
+* `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
+  user settings are shown to the user.
+* `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog
+  is shown.
+* `UIFeature.shareSocial` - Whether or not the social icons on the share room/event dialog
+  are shown.
+* `UIFeature.identityServer` - Whether or not functionality requiring an identity server
+  is shown. When disabled, the user will not be able to interact with the identity
+  server (sharing email addresses, 3PID invites, etc).
+* `UIFeature.thirdPartyId` - Whether or not UI relating to third party identifiers (3PIDs)
+  is shown. Typically this is considered "contact information" on the homeserver, and is
+  not directly related to the identity server.
+* `UIFeature.registration` - Whether or not the registration page is accessible. Typically
+  useful if accounts are managed externally.
+* `UIFeature.passwordReset` - Whether or not the password reset page is accessible. Typically
+  useful if accounts are managed externally.
+* `UIFeature.deactivate` - Whether or not the deactivate account button is accessible. Typically
+  useful if accounts are managed externally.
+* `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
+  user.
+* `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
+  This should only be used if the room history visibility options are managed by the server.
--- a/docs/customisations.md
+++ b/docs/customisations.md
@@ -0,0 +1,34 @@
+# Customisations
+
+Element Web and the React SDK support "customisation points" that can be used to
+easily add custom logic specific to a particular deployment of Element Web.
+
+An example of this is the [security customisations
+module](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/customisations/Security.ts).
+This module in the React SDK only defines some empty functions and their types:
+it does not do anything by default.
+
+To make use of these customisation points, you will first need to fork Element
+Web so that you can add your own code. Even though the default module is part of
+the React SDK, you can still override it from the Element Web layer:
+
+1. Copy the default customisation module to
+   `element-web/src/customisations/YourNameSecurity.ts`
+2. Edit customisations points and make sure export the ones you actually want to
+   activate
+3. Tweak the Element build process to use the customised module instead of the
+   default by adding this to end of the `plugins` array in `webpack.config.js`:
+
+```js
+new webpack.NormalModuleReplacementPlugin(
+    /src\/customisations\/Security.ts/,
+    path.resolve(__dirname, 'src/customisations/YourNameSecurity.ts'),
+),
+```
+
+If we add more customisation modules in the future, we'll likely improve these
+steps to remove the need for build changes like the above.
+
+By isolating customisations to their own module, this approach should remove the
+chance of merge conflicts when updating your fork, and thus simplify ongoing
+maintenance.
--- a/docs/e2ee.md
+++ b/docs/e2ee.md
@@ -35,6 +35,27 @@ following on your homeserver's `/.well-known/matrix/client` config:
 }
 ```

+## Preferring setup methods
+
+By default, Element offers users a choice of a random key or user-chosen
+passphrase when setting up Secure Backup. If a homeserver admin would like to
+only offer one of these, you can signal this via the
+`/.well-known/matrix/client` config, for example:
+
+```json
+{
+  "io.element.e2ee": {
+    "secure_backup_setup_methods": ["passphrase"]
+  }
+}
+```
+
+The field `secure_backup_setup_methods` is an array listing the methods the
+client should display. Supported values currently include `key` and
+`passphrase`. If the `secure_backup_setup_methods` field is not present or
+exists but does not contain any supported methods, Element will fallback to the
+default value of: `["key", "passphrase"]`.
+
 # Compatibility

 The settings above were first proposed under a `im.vector.riot.e2ee` key, which
--- a/docs/feature-flags.md
+++ b/docs/feature-flags.md
@@ -8,7 +8,7 @@ For example, flags make the following things possible:
 * Extended testing of a feature via labs on develop
 * Enabling features when ready instead of the first moment the code is released
 * Testing a feature with a specific set of users (by enabling only on a specific
-  Riot instance)
+  Element instance)

 The size of the feature controlled by a feature flag may vary widely: it could
 be a large project like reactions or a smaller change to an existing algorithm.
@@ -49,7 +49,7 @@ When starting work on a feature, we should create a matching feature flag:
 ```js
    SettingsStore.getValue("feature_cats")
 ```
-3. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+3. Document the feature in the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)

 With these steps completed, the feature is disabled by default, but can be
 enabled on develop and nightly by interested users for testing.
@@ -60,9 +60,9 @@ The following lists a few common options.
 ## Enabling by default on develop and nightly

 Set the feature to `true` in the
-[develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json)
+[develop](https://github.com/vector-im/element-web/blob/develop/element.io/develop/config.json)
 and
-[nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json)
+[nightly](https://github.com/vector-im/element-desktop/blob/develop/element.io/nightly/config.json)
 configs:

 ```json
@@ -74,9 +74,9 @@ configs:
 ## Enabling by default on staging, app, and release

 Set the feature to `true` in the
-[staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json)
+[staging / app](https://github.com/vector-im/element-web/blob/develop/element.io/app/config.json)
 and
-[release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json)
+[release](https://github.com/vector-im/element-desktop/blob/develop/element.io/release/config.json)
 configs.

 **Note:** The above will only enable the feature for https://app.element.io and official Element
@@ -90,18 +90,18 @@ Once we're confident that a feature is working well, we should remove or convert
 If the feature is meant to be turned off/on by the user:
 1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Change the `default` to `true` (if desired).
-3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+3. Remove the feature from the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)
 4. Celebrate! 🥳

 If the feature is meant to be forced on (non-configurable):
 1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Remove all `getValue` lines that test for the feature.
-3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+3. Remove the feature from the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)
 4. If applicable, remove the feature state from
-   [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json),
-   [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json),
-   [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json),
+   [develop](https://github.com/vector-im/element-web/blob/develop/element.io/develop/config.json),
+   [nightly](https://github.com/vector-im/element-desktop/blob/develop/element.io/nightly/config.json),
+   [staging / app](https://github.com/vector-im/element-web/blob/develop/element.io/app/config.json),
   and
-   [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json)
+   [release](https://github.com/vector-im/element-desktop/blob/develop/element.io/release/config.json)
   configs
 5. Celebrate! 🥳
--- a/docs/img/pr-checks.png
+++ b/docs/img/pr-checks.png
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -40,7 +40,7 @@ should start a new conference on your Jitsi server.
 domain will appear later in the URL as a configuration parameter.

 **Hint**: If you want everyone on your homeserver to use the same Jitsi server by
-default, and you are using riot-web 1.6 or newer, set the following on your homeserver's 
+default, and you are using element-web 1.6 or newer, set the following on your homeserver's 
 `/.well-known/matrix/client` config:
 ```json
 {
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -7,6 +7,10 @@ to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in
 **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 LaTeX maths in messages (`feature_latex_maths`)
+
+Enables rendering of LaTeX maths in messages using [KaTeX](https://katex.org/). LaTeX between single dollar-signs is interpreted as inline maths and double dollar-signs as display maths (i.e. centred on its own line).
+
 ## New spinner design (`feature_new_spinner`)

 Replaces the old spinner image with a new, svg-based one featuring a sleeker design.
@@ -106,3 +110,8 @@ To enable message previews for reactions in DMs, enable `feature_roomlist_previe
 represent what communities v2 will look/feel like and can/will change without notice. Due to the early
 stages this feature is in and the requirement for a compatible homeserver, we will not be accepting issues
 or feedback for this functionality at this time.
+
+## Dehydrated devices (`feature_dehydration`)
+
+Allows users to receive encrypted messages by creating a device that is stored
+encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).
--- a/docs/pr-previews.md
+++ b/docs/pr-previews.md
@@ -0,0 +1,33 @@
+# Pull Request Previews
+
+Pull requests to the React SDK layer (and in the future other layers as well)
+automatically set up a preview site with a full deployment of Element with the
+changes from the pull request added in so that anyone can easily test and review
+them. This is especially useful for checking visual and interactive changes.
+
+To access the preview site, scroll down to the bottom of the PR where the
+various CI results are displayed:
+
+![Pull request: checks section](./img/pr-checks.png)
+
+The checks section could be collapsed at first, so you may need to click "Show
+all checks" to reveal them. Look for an entry that mentions `deploy-preview`. It
+may be at the end of the list, so you may need scroll a bit to see it. To access
+the preview site, click the "Details" link in the deploy preview row.
+
+**Important:** Please always use test accounts when logging into preview sites,
+as they may contain unreviewed and potentially dangerous code that could damage
+your account, exfiltrate encryption keys, etc.
+
+## FAQs
+
+### Are preview sites created for pull requests from contributors?
+
+Yes, they are created for all PRs from any author.
+
+### Do preview sites expire after some time period?
+
+No, there is no expiry date, so they should remain accessible indefinitely, but
+of course they obviously aren't meant to live beyond the development workflow,
+so please don't rely on them for anything important. They may disappear at any
+time without notice.
--- a/docs/review.md
+++ b/docs/review.md
@@ -14,6 +14,7 @@ When reviewing code, here are some things we look for and also things we avoid:
 * Performance
 * Accessibility
 * Security
+* Quality via automated and manual testing
 * Comments and documentation where needed
 * Sharing knowledge of different areas among the team
 * Ensuring it's something we're comfortable maintaining for the long term
@@ -34,6 +35,7 @@ When reviewing code, here are some things we look for and also things we avoid:
 * Reviewers should be explicit about required versus optional changes
  * Reviews are conversations and the PR author should feel comfortable
    discussing and pushing back on changes before making them
+* Reviewers are encouraged to ask for tests where they believe it is reasonable
 * Core team should lead by example through their tone and language
 * Take the time to thank and point out good code changes
 * Using softer language like "please" and "what do you think?" goes a long way
@@ -41,7 +43,7 @@ When reviewing code, here are some things we look for and also things we avoid:

 ### Workflow

-* Authors should request review from the riot-web team by default (if someone on
+* Authors should request review from the element-web team by default (if someone on
  the team is clearly the expert in an area, a direct review request to them may
  be more appropriate)
 * Reviewers should remove the team review request and request review from
@@ -71,10 +73,9 @@ functionality is:
  required (though may still be useful) since we can continue tweaking

 As it can be difficult to review design work from looking at just the changed
-files in a PR, authors should be prepared for Design and / or Product teams to
-request a link to an ad-hoc build of Element (hosted anywhere) that can be used for
-the review. In the future, we [hope to automate
-this](https://github.com/vector-im/riot-web/issues/12624) for every PR.
+files in a PR, a [preview site](./pr-previews.md) that includes your changes
+will be added automatically so that anyone who's interested can try them out
+easily.

 Before starting work on a feature, it's best to ensure your plan aligns well
 with our vision for Element. Please chat with the team in
--- a/docs/skinning
+++ b/docs/skinning
@@ -52,7 +52,7 @@ other changes:
    - skins/vector/themes/foo/css
    - skins/vector/themes/foo/img
    - skins/vector/themes/foo/fonts
-  - ideally riot-web would contain almost nothing but skins/vector directory. 
+  - ideally element-web would contain almost nothing but skins/vector directory. 
  - ability to entirely replace CSS rather than override it for a given theme
    - e.g. if we replace `Login.js` with `StatusLogin.js`, then we should similarly be able to replace `_Login.scss` with `_StatusLogin.scss`.

--- a/docs/translating.md
+++ b/docs/translating.md
@@ -6,27 +6,27 @@
 - Be able to understand English
 - Be able to understand the language you want to translate Element into

-## Step 0: Join #riotweb-translations:matrix.org
+## Step 0: Join #element-translations:matrix.org

-1. Come and join https://matrix.to/#/#riotweb-translations:matrix.org
+1. Come and join https://matrix.to/#/#element-translations:matrix.org
 2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)

 ## Step 1: Preparing your Weblate Profile

-1. Head to https://translate.riot.im and register either via Github or email
+1. Head to https://translate.element.io and register either via Github or email
 2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
 3. Log into weblate
-4. Head to https://translate.riot.im/accounts/profile/ and select the languages you know and maybe another language you know too.
-6. Head to https://translate.riot.im/accounts/profile/#subscriptions and select Element Web as Project
+4. Head to https://translate.element.io/accounts/profile/ and select the languages you know and maybe another language you know too.
+6. Head to https://translate.element.io/accounts/profile/#subscriptions and select Element Web as Project

 ## How to check if your language already is being translated

-Go to https://translate.riot.im/projects/riot-web/ and visit the 2 sub-projects.
+Go to https://translate.element.io/projects/element-web/ and visit the 2 sub-projects.
 If your language is listed go to Step 2a and if not go to Step 2b

 ## Step 2a: Helping on existing languages.

-1. Head to one of the projects listed https://translate.riot.im/projects/riot-web/
+1. Head to one of the projects listed https://translate.element.io/projects/element-web/
 2. Click on the ``translate`` button on the right side of your language
 3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.

@@ -34,7 +34,7 @@ Head to the explanations under Steb 2b

 ## Step 2b: Adding a new language

-1. Go to one of the projects listed https://translate.riot.im/projects/riot-web/
+1. Go to one of the projects listed https://translate.element.io/projects/element-web/
 2. Click the ``Start new translation`` button at the bottom
 3. Select a language
 4. Start translating like in 2a.3
--- a/element.io/README
+++ b/element.io/README
@@ -6,7 +6,7 @@ official element.io distribution, but these files may be useful if you want to
 inspect the configuration used there.

 Element Desktop uses a separate config (see
-https://github.com/vector-im/riot-desktop/tree/develop/element.io).
+https://github.com/vector-im/element-desktop/tree/develop/element.io).

 Deployment scripts (such as app/deploy.py) are meant to be run on the web server
 hosting the Element installation.
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -20,7 +20,8 @@
    },
    "roomDirectory": {
        "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im"
        ]
    },
    "enable_presence_by_hs_url": {
--- a/element.io/app/deploy.py
+++ b/element.io/app/deploy.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# download and unpack a riot-web tarball.
+# download and unpack a element-web tarball.
 #
 # Allows `bundles` to be extracted to a common directory, and a link to
 # config.json to be added.
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -18,9 +18,14 @@
        "siteId": 1,
        "policyUrl": "https://element.io/cookie-policy"
    },
+    "countly": {
+        "url": "https://try.count.ly",
+        "appKey": "8abf1ee15646bc884556b82e5053857904264b66"
+    },
    "roomDirectory": {
        "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im"
        ]
    },
    "enable_presence_by_hs_url": {
--- a/package.json
+++ b/package.json
@@ -1,12 +1,11 @@
 {
-  "name": "riot-web",
-  "productName": "Riot",
-  "version": "1.7.5",
+  "name": "element-web",
+  "version": "1.7.16",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
    "type": "git",
-    "url": "https://github.com/vector-im/riot-web"
+    "url": "https://github.com/vector-im/element-web"
  },
  "license": "Apache-2.0",
  "files": [
@@ -46,7 +45,7 @@
    "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
    "build:types": "tsc --emitDeclarationOnly --jsx react",
    "dist": "scripts/package.sh",
-    "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,riot-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
+    "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
    "start:res": "yarn build:jitsi && 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",
    "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
@@ -58,14 +57,17 @@
  "dependencies": {
    "browser-request": "^0.3.3",
    "gfm.css": "^1.1.2",
-    "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "8.2.0",
-    "matrix-react-sdk": "3.3.0",
-    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
+    "highlight.js": "^10.4.1",
+    "jsrsasign": "^9.1.5",
+    "katex": "^0.12.0",
+    "matrix-js-sdk": "9.4.1",
+    "matrix-react-sdk": "3.11.1",
+    "matrix-widget-api": "^0.1.0-beta.10",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
    "prop-types": "^15.7.2",
    "react": "^16.9.0",
    "react-dom": "^16.9.0",
-    "sanitize-html": "^1.19.1",
+    "sanitize-html": "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db",
    "ua-parser-js": "^0.7.19",
    "url": "^0.11.0"
  },
@@ -91,6 +93,7 @@
    "@types/node": "^12.12.41",
    "@types/react": "16.9",
    "@types/react-dom": "^16.9.4",
+    "@types/sanitize-html": "^1.23.3",
    "autoprefixer": "^9.7.3",
    "babel-eslint": "^10.0.3",
    "babel-jest": "^24.9.0",
@@ -111,8 +114,8 @@
    "file-loader": "^5.0.2",
    "fs-extra": "^0.30.0",
    "html-webpack-plugin": "^3.2.0",
-    "jest": "^24.9.0",
-    "jest-environment-jsdom-fourteen": "^1.0.1",
+    "jest": "^26.5.2",
+    "jest-environment-jsdom-sixteen": "^1.0.3",
    "json-loader": "^0.5.3",
    "loader-utils": "^1.2.3",
    "matrix-mock-request": "^1.2.3",
@@ -136,6 +139,7 @@
    "postcss-strip-inline-comments": "^0.1.5",
    "rimraf": "^2.4.3",
    "shell-escape": "^0.2.0",
+    "simple-proxy-agent": "^1.1.0",
    "stylelint": "^12.0.1",
    "terser-webpack-plugin": "^2.3.0",
    "typescript": "^3.7.3",
@@ -144,7 +148,7 @@
    "webpack-dev-server": "^3.9.0"
  },
  "jest": {
-    "testEnvironment": "jest-environment-jsdom-fourteen",
+    "testEnvironment": "jest-environment-jsdom-sixteen",
    "testMatch": [
      "<rootDir>/test/**/*-test.js"
    ],
--- a/release.sh
+++ b/release.sh
@@ -38,14 +38,12 @@ do
            echo "Upgrading $i to $latestver..."
            yarn add -E $i@$latestver
            git add -u
-            # The `-e` flag opens the editor and gives you a chance to check
-            # the upgrade for correctness.
-            git commit -m "Upgrade $i to $latestver" -e
+            git commit -m "Upgrade $i to $latestver"
        fi
    fi
 done

-./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args"
+./node_modules/matrix-js-sdk/release.sh -n -z "$orig_args"

 release="${1#v}"
 tag="v${release}"
--- a/res/sw.js
+++ b/res/sw.js
@@ -1 +1 @@
-self.addEventListener('fetch',() => {});
+self.addEventListener('fetch', () => {});
--- a/res/welcome.html
+++ b/res/welcome.html
@@ -169,7 +169,7 @@ we don't have an account and should hide them. No account == no guest account ei
 </style>

 <div class="mx_Parent">
-    <a href="https://riot.im" target="_blank" rel="noopener">
+    <a href="https://element.io" target="_blank" rel="noopener">
        <img src="welcome/images/logo.svg" alt="" class="mx_Logo"/>
    </a>
    <h1 class="mx_Header_title">_t("Welcome to Element")</h1>
@@ -185,7 +185,7 @@ we don't have an account and should hide them. No account == no guest account ei
        </div>
        <!-- The comments below are meant to be used by Ansible as a quick way
             to strip out the marked content when desired.
-             See https://github.com/vector-im/riot-web/issues/8622.
+             See https://github.com/vector-im/element-web/issues/8622.
             TODO: Strip out these comments and rely on the guest flag -->
        <!-- BEGIN Ansible: Remove these lines when guest access is disabled -->
        <div class="mx_ButtonRow mx_WelcomePage_guestFunctions">
--- a/scripts/build-jitsi.js
+++ b/scripts/build-jitsi.js
@@ -7,6 +7,7 @@ const fs = require("fs");
 const path = require("path");
 const mkdirp = require("mkdirp");
 const fetch = require("node-fetch");
+const ProxyAgent = require("simple-proxy-agent");

 console.log("Making webapp directory");
 mkdirp.sync("webapp");
@@ -14,7 +15,13 @@ mkdirp.sync("webapp");
 // curl -s https://jitsi.riot.im/libs/external_api.min.js > ./webapp/jitsi_external_api.min.js
 console.log("Downloading Jitsi script");
 const fname = path.join("webapp", "jitsi_external_api.min.js");
-fetch("https://jitsi.riot.im/libs/external_api.min.js").then(res => {
+
+const options = {};
+if (process.env.HTTPS_PROXY) {
+   options.agent = new ProxyAgent(process.env.HTTPS_PROXY, {tunnel: true});
+}
+
+fetch("https://jitsi.riot.im/libs/external_api.min.js", options).then(res => {
   const stream = fs.createWriteStream(fname);
   return new Promise((resolve, reject) => {
       res.body.pipe(stream);
--- a/scripts/ci_package.sh
+++ b/scripts/ci_package.sh
@@ -6,7 +6,7 @@

 set -ex

-rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
+rm dist/element-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist

 # Since the deps are fetched from git, we can rev-parse
 REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -21,6 +21,7 @@ const INCLUDE_LANGS = [
    {'value': 'en_US', 'label': 'English (US)'},
    {'value': 'eo', 'label': 'Esperanto'},
    {'value': 'es', 'label': 'Español'},
+    {'value': 'et', 'label': 'Eesti'},
    {'value': 'eu', 'label': 'Euskara'},
    {'value': 'fi', 'label': 'Suomi'},
    {'value': 'fr', 'label': 'Français'},
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# download and unpack a riot-web tarball.
+# download and unpack a element-web tarball.
 #
 # Allows `bundles` to be extracted to a common directory, and a link to
 # config.json to be added.
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -70,7 +70,6 @@ function dodep() {

 ##############################

-echo -en 'travis_fold:start:matrix-js-sdk\r'
 echo 'Setting up matrix-js-sdk'

 dodep matrix-org matrix-js-sdk
@@ -83,11 +82,8 @@ popd

 yarn link matrix-js-sdk

-echo -en 'travis_fold:end:matrix-js-sdk\r'
-
 ##############################

-echo -en 'travis_fold:start:matrix-react-sdk\r'
 echo 'Setting up matrix-react-sdk'

 dodep matrix-org matrix-react-sdk
@@ -101,8 +97,6 @@ popd

 yarn link matrix-react-sdk

-echo -en 'travis_fold:end:matrix-react-sdk\r'
-
 ##############################

 # Link the reskindex binary in place: if we used `yarn link`,
--- a/scripts/issues-burndown.pl
+++ b/scripts/issues-burndown.pl
@@ -18,7 +18,7 @@ my $gh = Net::GitHub->new(
    login => 'ara4n', pass => read_password("github password: "),
 );

-$gh->set_default_user_repo('vector-im', 'riot-web');
+$gh->set_default_user_repo('vector-im', 'element-web');

 #my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
 my @issues = $gh->issue->repos_issues({ state => 'all' });
--- a/scripts/issues-no-state.pl
+++ b/scripts/issues-no-state.pl
@@ -18,7 +18,7 @@ my $gh = Net::GitHub->new(
    login => 'ara4n', pass => read_password("github password: "),
 );

-$gh->set_default_user_repo('vector-im', 'riot-web');
+$gh->set_default_user_repo('vector-im', 'element-web');

 #my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
 my @issues = $gh->issue->repos_issues({ state => 'all' });
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -16,20 +16,20 @@ yarn build
 cp config.sample.json webapp/

 mkdir -p dist
-cp -r webapp riot-$version
+cp -r webapp element-$version

 # Just in case you have a local config, remove it before packaging
-rm riot-$version/config.json || true
+rm element-$version/config.json || true

 # if $version looks like semver with leading v, strip it before writing to file
 if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
-    echo ${version:1} > riot-$version/version
+    echo ${version:1} > element-$version/version
 else
-    echo ${version} > riot-$version/version
+    echo ${version} > element-$version/version
 fi

-tar chvzf dist/riot-$version.tar.gz riot-$version
-rm -r riot-$version
+tar chvzf dist/element-$version.tar.gz element-$version
+rm -r element-$version

 echo
-echo "Packaged dist/riot-$version.tar.gz"
+echo "Packaged dist/element-$version.tar.gz"
--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# auto-deploy script for https://riot.im/develop
+# auto-deploy script for https://develop.element.io
 #
 # Listens for buildkite webhook pokes (https://buildkite.com/docs/apis/webhooks)
 # When it gets one, downloads the artifact from buildkite
@@ -191,7 +191,7 @@ def deploy_tarball(artifact, build_dir):

    # Download the tarball here as buildkite needs auth to do this
    # we don't pgp-sign buildkite artifacts, relying on HTTPS and buildkite
-    # not being evil. If that's not good enough for you, don't use riot.im/develop.
+    # not being evil. If that's not good enough for you, don't use develop.element.io.
    resp = requests.get(artifact['download_url'], stream=True, headers=req_headers())
    resp.raise_for_status()
    with open(artifact['filename'], 'wb') as ofp:
--- a/src/async-components/structures/CompatibilityView.tsx
+++ b/src/async-components/structures/CompatibilityView.tsx
@@ -78,17 +78,26 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                    <div>
                        <h2 id="step2_heading">Use Element on mobile</h2>
                        <p><strong>iOS</strong> (iPhone or iPad)</p>
-                        <a href="https://apps.apple.com/app/vector/id1083446067" target="_blank"
-                           className="mx_ClearDecoration">
+                        <a
+                            href="https://apps.apple.com/app/vector/id1083446067"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
                            <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
                        </a>
                        <p className="mx_Spacer"><strong>Android</strong></p>
-                        <a href="https://play.google.com/store/apps/details?id=im.vector.app" target="_blank"
-                           className="mx_ClearDecoration">
+                        <a
+                            href="https://play.google.com/store/apps/details?id=im.vector.app"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
                            <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
                        </a>
-                        <a href="https://f-droid.org/repository/browse/?fdid=im.vector.app" target="_blank"
-                           className="mx_ClearDecoration">
+                        <a
+                            href="https://f-droid.org/repository/browse/?fdid=im.vector.app"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
                            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
                        </a>
                    </div>
--- a/src/components/structures/VectorEmbeddedPage.js
+++ b/src/components/structures/VectorEmbeddedPage.js
@@ -28,7 +28,7 @@ export default class VectorEmbeddedPage extends EmbeddedPage {
    // we're overriding the base component here, for Element-specific tweaks
    translate(s) {
        s = sanitizeHtml(_t(s));
-        // ugly fix for https://github.com/vector-im/riot-web/issues/4243
+        // ugly fix for https://github.com/vector-im/element-web/issues/4243
        // eslint-disable-next-line max-len
        s = s.replace(/\[matrix\]/, '<a href="https://matrix.org" target="_blank" rel="noreferrer noopener"><img width="79" height="34" alt="Matrix" style="padding-left: 1px;vertical-align: middle" src="welcome/images/matrix.svg"/></a>');
        return s;
--- a/src/components/views/auth/VectorAuthFooter.js
+++ b/src/components/views/auth/VectorAuthFooter.js
@@ -24,7 +24,7 @@ const VectorAuthFooter = () => {
    let links = [
        {"text": "Blog", "url": "https://element.io/blog"},
        {"text": "Twitter", "url": "https://twitter.com/element_hq"},
-        {"text": "GitHub", "url": "https://github.com/vector-im/riot-web"},
+        {"text": "GitHub", "url": "https://github.com/vector-im/element-web"},
    ];

    if (brandingConfig && brandingConfig.authFooterLinks) {
--- a/src/customisations/README.md
+++ b/src/customisations/README.md
@@ -0,0 +1 @@
+../../docs/customisations.md
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1,35 +1,36 @@
 {
-    "Dismiss": "تجاهل",
+    "Dismiss": "أهمِل",
    "Unknown device": "جهاز مجهول",
-    "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن (HTTPS) للسماح بمشاركة الشاشة.",
+    "You need to be using HTTPS to place a screen-sharing call.": "عليك استعمال ميفاق HTTPS للاتصال بمشاركة الشاشة.",
    "powered by Matrix": "مشغل بواسطة Matrix",
-    "Welcome to Element": "مرحبا بك في Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "دردشة مشفرة غير مركزية  &amp;تطبيق تعاوني مدعوم بواسطة [matrix]",
-    "Create Account": "انشاء حساب",
-    "Explore rooms": "استكشف غرف المحادثات",
-    "Sign In": "الدخول",
-    "Missing indexeddb worker script!": "منفذ السكريبت الخاص ب Indexeddb غير موجود!",
-    "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.": "اعدادات خاطئة: لم يتم تحديد السيرفر الافتراضي.",
-    "Your Element is misconfigured": "تطبيقك معد بطريقة خاطئة",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "اعداداتك تحتوى على بنية JSON غير صحيحة. يرجى تصحيح المشكلة واعادة تحديث الصفحة.",
-    "The message from the parser is: %(message)s": "الرسالة من المدقق هي:%(message)s",
-    "Invalid JSON": "JSON خاطئ",
-    "Unable to load config file: please refresh the page to try again.": "لم نستطع تحميل ملف الاعداد: يرجى تحديث الصفحة للمحاولة مرة اخرى.",
-    "Unexpected error preparing the app. See console for details.": "حدث خطأ غير متوقع عند تجهيز التطبيق. انظر الى منصة التحكم للمزيد من التفاصيل.",
-    "Download Completed": "تم اكتمال التحميل",
-    "Open": "فتح",
-    "Open user settings": "فتح اعدادات المستخدم",
-    "Previous/next recently visited room or community": "السابقة/اللاحقة الغرفة او المجتمع الذي تمت زيارته مؤخرا",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s سطح المكتب (%(platformName)s)",
-    "Go to your browser to complete Sign In": "اذهب الى المتصفح لاكمال تسجيل الدخول",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Unsupported browser": "متصفح غير متوافق",
-    "Your browser can't run %(brand)s": "متصفحك لايمكنه تشغيل %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s يستخدم مزايا المتصفح المتقدمة والتي لا يدعمها متصفحك الحالي.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "يرجى تثبيت <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "يمكنك الاستمرار في استخدام متصفحك الحالي، ولكن بعض او كل المزايا ربما لا تعمل ويكون شكل التطبيق وشعورك تجاهه غير صحيح.",
-    "I understand the risks and wish to continue": "ادرك المخاطر وارغب في الاستمرار",
-    "Go to element.io": "اذهب الى Element.io",
-    "Failed to start": "فشل الاقلاع"
+    "Welcome to Element": "مرحبًا بك في Element",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "دردشة وتعاون غير مركزي معمّى، تدعمه [matrix]",
+    "Create Account": "أنشِئ حسابًا",
+    "Explore rooms": "استكشِف الغرف",
+    "Sign In": "لِج",
+    "Missing indexeddb worker script!": "سكربت عامل indexeddb ناقص!",
+    "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.": "الضبط غير صالح: لم تحدّد خادومًا مبدئيًا.",
+    "Your Element is misconfigured": "لم يُضبط تطبيق Element كما ينبغي",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "يحتوي ضبط تطبيق Element على تنسيق JSON غير صالح. من فضلك صحّح المشكلة وأعِد تحميل الصفحة.",
+    "The message from the parser is: %(message)s": "الرسالة القادمة من المحلّل: %(message)s",
+    "Invalid JSON": "تنسيق JSON غير صالح",
+    "Unable to load config file: please refresh the page to try again.": "تعذّر تحميل ملف الضبط: من فضلك أنعِش الصفحة لمعاودة المحاولة.",
+    "Unexpected error preparing the app. See console for details.": "حدث عُطل غير متوقع أثناء تجهيز التطبيق. طالِع المِعراض للتفاصيل.",
+    "Download Completed": "اكتمل التنزيل",
+    "Open": "افتح",
+    "Open user settings": "افتح إعدادات المستخدم",
+    "Previous/next recently visited room or community": "الغرفة أو المجتمع التالي/السابق الذي زرته حديثًا",
+    "%(brand)s Desktop (%(platformName)s)": "‏‏%(brand)s لسطح المكتب (%(platformName)s)",
+    "Go to your browser to complete Sign In": "افتح المتصفح لإكمال الولوج",
+    "%(appName)s (%(browserName)s, %(osName)s)": "‏‏%(appName)s (‏‏%(browserName)s، ‏‏%(osName)s)",
+    "Unsupported browser": "متصفح غير مدعوم",
+    "Your browser can't run %(brand)s": "لا يمكن لمتصفحك تشغيل %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "يستعمل %(brand)s ميزات متقدمة في المتصفحات لا يدعمها متصفحك الحالي.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "من فضلك ثبّت <chromeLink>كروم</chromeLink> أو <firefoxLink>فَيَرفُكس</firefoxLink> أو <safariLink>سفاري</safariLink> لأفضل تجربة.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "يمكنك مواصل استعمال متصفحك الحالي ولكن قد لا تعمل بعض المزايا (أو كلها) وقد لا يظهر التطبيق كما ينبغي له أن يظهر.",
+    "I understand the risks and wish to continue": "أفهم المخاطرة وأود المواصلة",
+    "Go to element.io": "انتقل إلى element.io",
+    "Failed to start": "فشل البدء",
+    "Powered by Matrix": "تدعمه «ماترِكس»"
 }
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -31,5 +31,6 @@
    "Download Completed": "Свалянето завърши",
    "Open": "Отвори",
    "Your browser can't run %(brand)s": "Браузърът ви не може да изпълни %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия.",
+    "Powered by Matrix": "Базирано на Matrix"
 }
--- a/src/i18n/strings/bs.json
+++ b/src/i18n/strings/bs.json
@@ -1 +1,35 @@
-{}
+{
+    "Missing indexeddb worker script!": "Nedostaje indexeddb radna skripta!",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neispravna konfiguracija: navesti se samo može jedan od default_server_config, default_server_name ili default_hs_url.",
+    "Invalid configuration: no default server specified.": "Neispravna konfiguracija: nije naveden zadani server.",
+    "Your Element is misconfigured": "Vaš element je pogrešno konfiguriran",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracija vašeg elementa sadrži nevažeći JSON. Ispravite problem i ponovo učitajte stranicu.",
+    "The message from the parser is: %(message)s": "Poruka parsera je: %(message)s",
+    "Invalid JSON": "Nevažeći JSON",
+    "Unable to load config file: please refresh the page to try again.": "Nije moguće učitati konfiguracijsku datoteku: osvježite stranicu i pokušajte ponovo.",
+    "Unexpected error preparing the app. See console for details.": "Neočekivana greška prilikom pripreme aplikacije. Pogledajte konzolu za detalje.",
+    "Download Completed": "Preuzimanje završeno",
+    "Open": "Otvori",
+    "Dismiss": "Odbaci",
+    "Open user settings": "Otvori korisničke postavke",
+    "Previous/next recently visited room or community": "Prethodna / sljedeća nedavno posjećena soba ili zajednica",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Radna povrsina (%(platformName)s)",
+    "Go to your browser to complete Sign In": "Idite na svoj pretraživač da biste dovršili prijavu",
+    "Unknown device": "Nepoznat uređaj",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "You need to be using HTTPS to place a screen-sharing call.": "Morate koristiti HTTPS za upućivanje poziva za dijeljenje ekrana.",
+    "Powered by Matrix": "Pokretano uz Matrix",
+    "Unsupported browser": "Nepodržani pretraživač",
+    "Your browser can't run %(brand)s": "Vaš pretraživač ne može pokretati %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s koristi napredne funkcije pretraživača koje vaš trenutni pretraživač ne podržava.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Molimo instalirajte <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ili <safariLink>Safari</safariLink> za najbolje iskustvo.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Možete nastaviti koristiti svoj trenutni pretraživač, ali neke ili sve funkcije možda neće raditi, a izgled i dojam aplikacije mogu biti neispravani.",
+    "I understand the risks and wish to continue": "Razumijem rizike i želim nastaviti",
+    "Go to element.io": "Idite na element.io",
+    "Failed to start": "Pokretanje nije uspjelo",
+    "Welcome to Element": "Dobrodošli u Element",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizirani, šifrirani razgovor &amp; suradnja pokrenuta [matrix]",
+    "Sign In": "Prijavite se",
+    "Create Account": "Otvori račun",
+    "Explore rooms": "Istražite sobe"
+}
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -1,14 +1,36 @@
 {
    "Dismiss": "Omet",
    "Unknown device": "Dispositiu desconegut",
-    "Welcome to Element": "Us donem la benvinguda a Element",
-    "You need to be using HTTPS to place a screen-sharing call.": "Heu d'utilitzar HTTPS per poder fer una trucada amb pantalla compartida.",
+    "Welcome to Element": "Benvingut/da a Element",
+    "You need to be using HTTPS to place a screen-sharing call.": "Necessites utilitzar HTTPS per poder fer una trucada amb pantalla compartida.",
    "powered by Matrix": "amb tecnologia de Matrix",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Xat descentralitzat, encriptat i col·laboratiu amb tecnologia de [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Xat descentralitzat, encriptat &amp; col·laboratiu amb tecnologia de [matrix]",
    "Create Account": "Crea un compte",
-    "Explore rooms": "Exploreu les sales",
+    "Explore rooms": "Explora sales",
    "Sign In": "Inicia la sessió",
-    "Invalid configuration: no default server specified.": "Configuració no vàlida: no s'ha especificat cap servidor per defecte.",
-    "Invalid JSON": "JSON no vàlid",
-    "Go to your browser to complete Sign In": "Aneu al vostre navegador per completar l'inici de sessió"
+    "Invalid configuration: no default server specified.": "Configuració invàlida: no s'ha especificat cap servidor predeterminat.",
+    "Invalid JSON": "JSON invàlid",
+    "Go to your browser to complete Sign In": "Ves al teu navegador per completar l'inici de sessió",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració invàlida: només pots especificar una sol de default_server_config, default_server_name, o default_hs_url.",
+    "Your Element is misconfigured": "Element està mal configurat",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuració d'Element conté un JSON invàlid. Arregla el problema i actualitza la pàgina.",
+    "The message from the parser is: %(message)s": "El missatge de l'analitzador és: %(message)s",
+    "Unable to load config file: please refresh the page to try again.": "No s'ha pogut carregar el fitxer de configuració: actualitza la pàgina per tornar-ho a provar.",
+    "Unexpected error preparing the app. See console for details.": "Error inesperat preparant l'app. Consulta la consola pels a més detalls.",
+    "Download Completed": "Descàrrega completada",
+    "Open": "Obre",
+    "Open user settings": "Obre la configuració d'usuari",
+    "Previous/next recently visited room or community": "Anterior/següent sala o comunitat visitada recentment",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s d'escriptori (%(platformName)s)",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Powered by Matrix": "Amb tecnologia de Matrix",
+    "Unsupported browser": "Navegador no compatible",
+    "Your browser can't run %(brand)s": "El teu navegador no pot executar %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utilitza funcions del navegador avançades que no són compatibles amb el teu navegador actual.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instal·la <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per obtenir la millor experiència.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Pots continuar utilitzant el teu navegador actual, però algunes o totes les funcions podrien no funcionar i l'aspecte de l'aplicació podria ser incorrecte.",
+    "I understand the risks and wish to continue": "Entenc els riscos i vull continuar",
+    "Go to element.io": "Vés a element.io",
+    "Failed to start": "Ha fallat l'inici",
+    "Missing indexeddb worker script!": "Falta l'script del treballador indexeddb!"
 }
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -28,5 +28,9 @@
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pro nejlepší zážitek si prosím nainstalujte prohlížeč <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Můžete pokračovat v užívání vašeho současného prohlížeče, ale některé (nebo dokonce všechny) funkce nemusí fungovat a vzhled a chování aplikace nemusí být správné.",
    "I understand the risks and wish to continue": "Rozumím a přesto chci pokračovat",
-    "Go to element.io": "Přejít na element.io"
+    "Go to element.io": "Přejít na element.io",
+    "Failed to start": "Nepovedlo se nastartovat",
+    "Powered by Matrix": "Běží na Matrixu",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)",
+    "Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!"
 }
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -17,5 +17,12 @@
    "Unable to load config file: please refresh the page to try again.": "Ikke i stand til at loade config fil: genopfrisk venligst siden for at prøve igen.",
    "Open user settings": "Åbn brugerindstillinger",
    "Previous/next recently visited room or community": "Forrige/næste besøgte rum eller fællesskab",
-    "Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind"
+    "Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind",
+    "Go to element.io": "Gå til element.io",
+    "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker at fortsætte",
+    "Unsupported browser": "Usupporteret browser",
+    "Open": "Åbn",
+    "Download Completed": "Hentning færdig",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration indeholder ugyldig JSON. Løs venligst problemet og genindlæs siden.",
+    "Your Element is misconfigured": "Din Element er konfigureret forkert"
 }
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -15,7 +15,7 @@
    "Invalid JSON": "Ungültiges JSON",
    "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen",
    "Open user settings": "Öffne Nutzer-Einstellungen",
-    "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisieren Sie die Seite, um es erneut zu versuchen.",
+    "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisiere die Seite, um es erneut zu versuchen.",
    "Missing indexeddb worker script!": "Fehlendes indexeddb Worker-Skript!",
    "Previous/next recently visited room or community": "Vorheriger/nächster kürzlich besuchter Raum oder Community",
    "Unsupported browser": "Nicht unterstützter Browser",
@@ -32,5 +32,5 @@
    "Open": "Öffnen",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von Ihrem aktuellen Browser nicht unterstützt werden.",
    "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
-    "Powered by Matrix": "Betrieben von Matrix"
+    "Powered by Matrix": "Betrieben mit Matrix"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -10,7 +10,27 @@
    "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s",
    "Invalid JSON": "Μη έγκυρο JSON",
    "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: 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.": "Μη έγκυρη ρύθμιση παραμέτρων: δεν έχει οριστεί προκαθορισμένος διακομιστής.",
-    "Explore rooms": "Εξερευνήστε δωμάτια"
+    "Explore rooms": "Εξερευνήστε δωμάτια",
+    "Open": "Άνοιγμα",
+    "Go to your browser to complete Sign In": "Μεταβείτε στο πρόγραμμα περιήγησής σας για να ολοκληρώσετε τη σύνδεση",
+    "Powered by Matrix": "Με την υποστήριξη του Matrix",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Παρακαλούμε εγκαταστήστε <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ή <safariLink>Safari</safariLink> για καλύτερη εμπειρία χρήσης.",
+    "Your Element is misconfigured": "Το Element σας δεν εχει ρυθμιστεί σωστά",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Η ρύθμιση του Element περιέχει μη έγκυρο JSON. Διορθώστε το πρόβλημα και φορτώστε ξανά τη σελίδα.",
+    "Unable to load config file: please refresh the page to try again.": "Δεν είναι δυνατή η φόρτωση του αρχείου config: ανανεώστε τη σελίδα για να δοκιμάσετε ξανά.",
+    "Download Completed": "Η λήψη ολοκληρώθηκε",
+    "Open user settings": "Ανοίξτε τις ρυθμίσεις χρήστη",
+    "Previous/next recently visited room or community": "Προηγούμενο / επόμενο δωμάτιο ή κοινότητα που επισκεφτήκατε πρόσφατα",
+    "Unsupported browser": "Μη υποστηριζόμενο πρόγραμμα περιήγησης",
+    "Your browser can't run %(brand)s": "Το πρόγραμμα περιήγησής σας δεν μπορεί να εκτελέσει %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s χρησιμοποιεί προηγμένες δυνατότητες προγράμματος περιήγησης που δεν υποστηρίζονται από το τρέχον πρόγραμμα περιήγησής σας.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Μπορείτε να συνεχίσετε να χρησιμοποιείτε το τρέχον πρόγραμμα περιήγησής σας, αλλά ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν και η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι λανθασμένη.",
+    "I understand the risks and wish to continue": "Κατανοώ τους κινδύνους και επιθυμώ να συνεχίσω",
+    "Go to element.io": "Πήγαινε στο element.io",
+    "Failed to start": "Αποτυχία έναρξης",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
+    "Missing indexeddb worker script!": "Απουσία indexeddb worker script!"
 }
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -4,7 +4,7 @@
    "powered by Matrix": "con el poder de Matrix",
    "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
    "Welcome to Element": "Bienvenido a Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas &amp; colaboración impulsada por [matrix]",
    "Sign In": "Iniciar sesión",
    "Create Account": "Crear cuenta",
    "Explore rooms": "Explorar salas",
@@ -15,10 +15,10 @@
    "Invalid JSON": "JSON inválido",
    "Open user settings": "Abrir opciones de usuario",
    "Go to your browser to complete Sign In": "Abre tu navegador web para completar el registro",
-    "Missing indexeddb worker script!": "¡Worker script “indexeddb” faltante!",
+    "Missing indexeddb worker script!": "Falta el script de trabajo indexeddb!",
    "Unable to load config file: please refresh the page to try again.": "No se ha podido cargar el archivo de configuración. Recarga la página para intentar nuevamente.",
    "Previous/next recently visited room or community": "Anterior/siguiente sala o comunidad visitada recientemente",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Escritorio (%(platformName)s)",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Navegador no soportado",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> para la mejor experiencia.",
@@ -26,10 +26,11 @@
    "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
    "Go to element.io": "Ir a element.io",
    "Failed to start": "Fallo al iniciar",
-    "Your Element is misconfigured": "Su Element está mal configurado",
+    "Your Element is misconfigured": "Tu elemento está mal configurado",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Su configuración de Element contiene JSON inválido. Por favor corríjalo e inténtelo de nuevo.",
    "Download Completed": "Descarga completada",
    "Open": "Abrir",
-    "Your browser can't run %(brand)s": "Su navegador es compatible con %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funciones avanzadas no soportadas por su navegador."
+    "Your browser can't run %(brand)s": "Su navegador es incompatible con %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.",
+    "Powered by Matrix": "Desarrollado por Matrix"
 }
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -15,7 +15,7 @@
    "Previous/next recently visited room or community": "Eelmine/järgmine hiljuti kasutatud jututuba või kogukond",
    "You need to be using HTTPS to place a screen-sharing call.": "Ekraani jagava kõne jaoks pead kasutama HTTPS-ühendust.",
    "powered by Matrix": "põhineb Matrix'il",
-    "Welcome to Element": "Tere tulemast Element kasutajaks",
+    "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element",
    "Sign In": "Logi sisse",
    "Create Account": "Loo konto",
    "%(brand)s Desktop (%(platformName)s)": "%(brand)s'i töölauaversioon (%(platformName)s)",
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -4,7 +4,7 @@
    "Unknown device": "Appareil inconnu",
    "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
    "Welcome to Element": "Bienvenue sur Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Discussion &amp; collaboration décentralisées et chiffrées, propulsées par [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]",
    "Sign In": "Se connecter",
    "Create Account": "Créer un compte",
    "Explore rooms": "Explorer les salons",
@@ -31,5 +31,6 @@
    "Your Element is misconfigured": "Votre Element est mal configuré",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuration de votre Element contient du JSON invalide. Veuillez corriger le problème et recharger la page.",
    "Your browser can't run %(brand)s": "Votre navigateur ne peut pas exécuter %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne supporte pas."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne supporte pas.",
+    "Powered by Matrix": "Propulsé par Matrix"
 }
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2,35 +2,35 @@
    "Dismiss": "Eltüntetés",
    "powered by Matrix": "a gépházban: Matrix",
    "Unknown device": "Ismeretlen eszköz",
-    "You need to be using HTTPS to place a screen-sharing call.": "Képernyőmegosztás indításához HTTPS-t kell használnod.",
-    "Welcome to Element": "Üdvözöl a Element",
+    "You need to be using HTTPS to place a screen-sharing call.": "Képernyőmegosztás indításához HTTPS-t kell használnia.",
+    "Welcome to Element": "Üdvözli az Element",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizált, titkosított csevegés és kollaboráció [matrix] alapokon",
    "Sign In": "Bejelentkezés",
    "Create Account": "Fiók létrehozása",
    "Explore rooms": "Szobák felderítése",
-    "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.",
+    "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 lásd 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 kiszolgáló.",
    "The message from the parser is: %(message)s": "A feldolgozó algoritmus üzenete: %(message)s",
    "Invalid JSON": "Érvénytelen JSON",
-    "Go to your browser to complete Sign In": "A böngészőben fejezd be a bejelentkezést",
+    "Go to your browser to complete Sign In": "A böngészőben fejezze be a bejelentkezést",
    "Open user settings": "Felhasználói beállítások megnyitása",
    "Missing indexeddb worker script!": "Hiányzó indexeddb worker parancsfájl!",
-    "Unable to load config file: please refresh the page to try again.": "A konfigurációs fájlt nem sikerült betölteni: frissítsd az oldalt és próbáld meg újra.",
+    "Unable to load config file: please refresh the page to try again.": "A konfigurációs fájlt nem sikerült betölteni: frissítse az oldalt és próbálja meg újra.",
    "Previous/next recently visited room or community": "Előző/következő nemrég meglátogatott szobák vagy közösségek",
    "%(brand)s Desktop (%(platformName)s)": "Asztali %(brand)s (%(platformName)s)",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "A böngésző nem támogatott",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény eléréséhez kérlek telepíts <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Folytathatod a jelenlegi böngésződdel, de néhány vagy az összes funkció használhatatlan lehet, vagy hibák lehetnek az alkalmazás kinézetében és viselkedésében.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény érdékében telepítsen <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Folytathatja a jelenlegi böngészőjével, de néhány vagy az összes funkció használhatatlan lehet, vagy hibák lehetnek az alkalmazás kinézetében és viselkedésében.",
    "I understand the risks and wish to continue": "Megértettem a kockázatot és folytatom",
    "Go to element.io": "Irány a element.io",
    "Failed to start": "Az indítás sikertelen",
    "Download Completed": "A letöltés befejeződött",
    "Open": "Megnyitás",
    "Your Element is misconfigured": "Az Element hibásan van beállítva",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Az Element érvénytelen JSON-t tartalmazó konfigurációval rendelkezik. Kérlek javítsd és töltsd újra az oldalt.",
-    "Your browser can't run %(brand)s": "A böngésződ nem tudja futtatni ezt: %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s haladó böngésző funkciókat használ amiket a jelenlegi böngésződ nem támogat.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Az Element érvénytelen JSON-t tartalmazó konfigurációval rendelkezik. Javítsa és töltse újra az oldalt.",
+    "Your browser can't run %(brand)s": "A böngészője nem tudja futtatni ezt: %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s speciális böngészőfunkciókat használ, amelyeket a jelenlegi böngészője nem támogat.",
    "Powered by Matrix": "A gépházban: Matrix"
 }
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -30,5 +30,6 @@
    "Your Element is misconfigured": "Elementの設定が間違っています",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Elementの設定ファイルに不正なJSONが含まれています。問題を修正してからページを再読込してください。",
    "Your browser can't run %(brand)s": "このブラウザでは%(brand)sが動きません",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザの高度な機能を使う必要がありますが、このブラウザではその機能がサポートされていないようです。"
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザの高度な機能を使う必要がありますが、このブラウザではその機能がサポートされていないようです。",
+    "Powered by Matrix": "Powered by Matrix"
 }
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -18,7 +18,7 @@
    "Missing indexeddb worker script!": "Trūksta indexeddb worker skripto!",
    "Unable to load config file: please refresh the page to try again.": "Nepavyko įkelti konfigūracijos failo: atnaujinkite puslapį, kad pabandytumėte dar kartą.",
    "Previous/next recently visited room or community": "Ankstesnis/sekantis neseniai lankytas kambarys ar bendruomenė",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteriui (%(platformName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteryje (%(platformName)s)",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Nepalaikoma naršyklė",
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jūs galite toliau naudotis savo dabartine naršykle, bet kai kurios arba visos funkcijos gali neveikti ir programos išvaizda bei sąsaja gali būti neteisingai rodoma.",
@@ -31,5 +31,6 @@
    "Open": "Atidaryti",
    "Your browser can't run %(brand)s": "Jūsų naršyklė negali paleisti %(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s naudoja išplėstines naršyklės funkcijas, kurių jūsų dabartinė naršyklė nepalaiko.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>."
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>.",
+    "Powered by Matrix": "Veikia su Matrix"
 }
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -11,8 +11,21 @@
    "The message from the parser is: %(message)s": "Meldingen fra parseren er: %(message)s",
    "Invalid JSON": "Ugyldig JSON",
    "Invalid configuration: no default server specified.": "Ugyldig konfigurasjon: ingen standardserver spesifisert.",
-    "Unexpected error preparing the app. See console for details.": "Uventet feil oppsto mens appen ble gjort klar. Se konsollen for detaljer.",
+    "Unexpected error preparing the app. See console for details.": "Uventet feil ved klargjøring av appen. Se konsollen for detaljer.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfigurasjon: Spesifiser kun en av følgende: default_server_config, default_server_name eller default_hs_url.",
    "Open user settings": "Åpne brukerinnstillinger",
-    "Go to your browser to complete Sign In": "Gå til nettleseren din for å fullføre innloggingen"
+    "Go to your browser to complete Sign In": "Gå til nettleseren din for å fullføre innloggingen",
+    "Failed to start": "Kunne ikke starte",
+    "Go to element.io": "Gå til element.io",
+    "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker å fortsette",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kan fortsette å bruke din nåværende nettleser, men noen eller alle funksjonene fungerer kanskje ikke, og utseendet og følelsen av applikasjonen kan være feil.",
+    "Your browser can't run %(brand)s": "Nettleseren din kan ikke kjøre %(brand)s",
+    "Unsupported browser": "Ustøttet nettleser",
+    "Powered by Matrix": "Drevet av Matrix",
+    "Previous/next recently visited room or community": "Forrige/neste nylig besøkte rom eller samfunn",
+    "Download Completed": "Nedlasting Fullført",
+    "Unable to load config file: please refresh the page to try again.": "Kan ikke laste inn konfigurasjonsfil: oppdater siden for å prøve igjen.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ditt Element konfigurasjonen inneholder ugyldig JSON. Løs problemet og last siden på nytt.",
+    "Your Element is misconfigured": "Ditt Element er feilkonfigurert",
+    "Missing indexeddb worker script!": "Mangler indexeddb arbeiderskript!"
 }
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -7,7 +7,7 @@
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chatten &amp; samenwerken dankzij [matrix]",
    "Sign In": "Aanmelden",
    "Create Account": "Account aanmaken",
-    "Explore rooms": "Gesprekken ontdekken",
+    "Explore rooms": "Kamers verkennen",
    "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
    "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
@@ -22,8 +22,13 @@
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Niet-ondersteunde browser",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> voor de beste gebruikservaring.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle features zouden niet kunnen werken en de uitstraling van het programma kan verkeerd zijn.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de uitstraling van het programma kan verkeerd zijn.",
    "I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan",
    "Go to element.io": "Ga naar element.io",
-    "Failed to start": "Opstarten gefaald"
+    "Failed to start": "Opstarten mislukt",
+    "Open": "Open",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.",
+    "Download Completed": "Download voltooid",
+    "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd",
+    "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet draaien."
 }
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -25,5 +25,12 @@
    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Możesz kontynuować używanie obecnej przeglądarki, lecz niektóre lub wszystkie funkcje mogą nie działać oraz wygląd aplikacji może być niepoprawny.",
    "I understand the risks and wish to continue": "Rozumiem ryzyko i chcę kontynuować",
    "Go to element.io": "Przejdź do element.io",
-    "Failed to start": "Nie udało się wystartować"
+    "Failed to start": "Nie udało się wystartować",
+    "Download Completed": "Pobieranie Zakończone",
+    "Open": "Otwórz",
+    "Your browser can't run %(brand)s": "Twoja przeglądarka nie obsługuje %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s używa zaawansowanych funkcji przeglądarki, które nie są dostępne w twojej przeglądarce.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracja Elementa zawiera niepoprawny JSON. Popraw konfiguracje i odśwież stronę.",
+    "Your Element is misconfigured": "Element jest nieprawidłowo skonfigurowany",
+    "Powered by Matrix": "Zasilane przez Matrix"
 }
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -3,7 +3,7 @@
    "powered by Matrix": "powered by Matrix",
    "Unknown device": "Dispositivo desconhecido",
    "You need to be using HTTPS to place a screen-sharing call.": "Necessita de estar a usar HTTPS para poder iniciar uma chamada com partilha de ecrã.",
-    "Welcome to Element": "Bem-vindo ao Element",
+    "Welcome to Element": "Boas-vindas ao Element",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, encriptado &amp; colaborativo powered by [matrix]",
    "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s",
    "Invalid JSON": "JSON inválido",
@@ -13,5 +13,10 @@
    "Sign In": "Iniciar sessão",
    "Create Account": "Criar conta",
    "Explore rooms": "Explorar rooms",
-    "Go to your browser to complete Sign In": "Abra o seu navegador para completar o inicio de sessão"
+    "Go to your browser to complete Sign In": "Abra o seu navegador para completar o inicio de sessão",
+    "Open": "Abrir",
+    "Download Completed": "Transferência concluída",
+    "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o ficheiro de configuração: atualize a página para tentar novamente.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuração do Element contém um JSON inválido. Corrija o problema e recarregue a página.",
+    "Your Element is misconfigured": "O Element está configurado incorretamente"
 }
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -3,7 +3,7 @@
    "powered by Matrix": "oferecido por Matrix",
    "Unknown device": "Aparelho desconhecido",
    "You need to be using HTTPS to place a screen-sharing call.": "Você precisa usar HTTPS para compartilhar a tela durante uma chamada.",
-    "Welcome to Element": "Seja bem-vinda(o) a Element",
+    "Welcome to Element": "Boas-vindas ao Element",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]",
    "Sign In": "Entrar",
    "Create Account": "Criar Conta",
--- a/src/i18n/strings/si.json
+++ b/src/i18n/strings/si.json
@@ -1,4 +1,6 @@
 {
-    "Unknown device": "නොදන්නා උපකරණය",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)"
+    "Unknown device": "නොදන්නා උපාංගයකි",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Welcome to Element": "ඉලමන්ට් වෙත සාදරයෙන් පිළිගනිමු",
+    "Open": "විවෘත කරන්න"
 }
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -29,7 +29,8 @@
    "Download Completed": "Preberanie dokončené",
    "Open": "Otvoriť",
    "Your Element is misconfigured": "Váš Element je nesprávne nastavený",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávne JSON. Prosím, opravte chybu a obnovte stránku.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávny údaj JSON. Prosím, opravte chybu a obnovte stránku.",
    "Your browser can't run %(brand)s": "Váš prehliadač nerozbehne %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom.",
+    "Powered by Matrix": "používa protokol Matrix"
 }
--- a/src/i18n/strings/tzm.json
+++ b/src/i18n/strings/tzm.json
@@ -0,0 +1,14 @@
+{
+    "Create Account": "Ssenflul amiḍan",
+    "Download Completed": "Ittusmed wagam",
+    "Powered by Matrix": "Ittusker s Matrix",
+    "Sign In": "Kcem",
+    "Go to your browser to complete Sign In": "Ddu ɣer umessara fad ad tsemded azemmem",
+    "Welcome to Element": "Azul g Element",
+    "Go to element.io": "Ddu ɣer element.io",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Unknown device": "Allal arussin",
+    "Open user settings": "Ṛẓem tisɣal n unessemres",
+    "Dismiss": "Nexxel",
+    "Open": "Ṛẓem"
+}
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -2,35 +2,35 @@
    "Dismiss": "Відхилити",
    "powered by Matrix": "працює на Matrix",
    "Unknown device": "Невідомий пристрій",
-    "You need to be using HTTPS to place a screen-sharing call.": "Ви маєте використовувати HTTPS щоб зробити виклик із поширенням екрану.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Ви маєте використовувати HTTPS щоб зробити виклик із спільним доступом до екрану.",
    "Welcome to Element": "Ласкаво просимо до Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентралізована, зашифрована балачка та засіб для співробітництва, що працює на [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентралізований, зашифрований чат та засіб для співпраці, заснований на [matrix]",
    "Sign In": "Увійти",
    "Create Account": "Створити обліковий запис",
-    "Explore rooms": "Шукати кімнати",
-    "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при готуванні програми. Дивіться деталі у виводі консолі.",
+    "Explore rooms": "Каталог кімнат",
+    "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.": "Невірна конфігурація: не вказано усталений сервер.",
-    "The message from the parser is: %(message)s": "Аналізатор повідомляє: %(message)s",
+    "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.",
+    "The message from the parser is: %(message)s": "Повідомлення від аналізатора : %(message)s",
    "Invalid JSON": "Хибний JSON",
-    "Unsupported browser": "Непідтримуваний переглядач",
+    "Unsupported browser": "Непідтримуваний браузер",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Для найкращих вражень від користування встановіть, будь ласка, <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, або <safariLink>Safari</safariLink>.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Ви можете продовжити, користуючись вашим поточним переглядачем, але деякі функції можуть не працювати, а застосунок може виглядати неправильно.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Ви можете продовжити, користуючись вашим поточним браузером, але деякі функції можуть не працювати, а застосунок може виглядати неправильно.",
    "I understand the risks and wish to continue": "Я усвідомлюю ризик і бажаю продовжити",
    "Go to element.io": "Перейти на element.io",
    "Failed to start": "Запуск не вдався",
    "Download Completed": "Завантаження завершено",
-    "Missing indexeddb worker script!": "Відсутній скрипт воркеру для IndexedDB!",
-    "Your Element is misconfigured": "Ваш Element налаштовано неправильно",
+    "Missing indexeddb worker script!": "Відсутній робочий сценарій IndexedDB!",
+    "Your Element is misconfigured": "Ваш Element налаштовано невірно",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Ваша конфігурація Element містить хибний JSON. Виправте проблему та оновіть сторінку.",
-    "Unable to load config file: please refresh the page to try again.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку.",
+    "Unable to load config file: please refresh the page to try again.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку, щоб спробувати знову.",
    "Open": "Відкрити",
-    "Open user settings": "Відкрити користувацькі налаштування",
+    "Open user settings": "Відкрити налаштування користувача",
    "Previous/next recently visited room or community": "Попередня/наступна нещодавно відвідана кімната чи спільнота",
    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "Go to your browser to complete Sign In": "Перейдіть у ваш переглядач щоб завершити входження",
+    "Go to your browser to complete Sign In": "Перейдіть у ваш браузер щоб завершити вхід",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Powered by Matrix": "Працює на Matrix",
    "Your browser can't run %(brand)s": "Ваш переглядач неспроможний запустити %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш переглядач не підтримує."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш браузер не підтримує."
 }
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -32,5 +32,5 @@
    "Open": "打开",
    "Your browser can't run %(brand)s": "浏览器无法运行%(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "当前浏览器不支持%(brand)s调用的高级浏览器特性。",
-    "Powered by Matrix": "Powered by Matrix"
+    "Powered by Matrix": "由 Matrix 驱动"
 }
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -32,5 +32,5 @@
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element 的配置中包含無效JSON，請更正錯誤並重新加載網頁。",
    "Your browser can't run %(brand)s": "當前瀏覽器無法運行%(brand)s",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "當前瀏覽器不支持%(brand)s使用的高級特性。",
-    "Powered by Matrix": "威力本源 Matrix"
+    "Powered by Matrix": "由 Matrix 提供"
 }
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -26,7 +26,6 @@ window.React = React;
 import url from 'url';
 import * as sdk from 'matrix-react-sdk';
 import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
-import * as VectorConferenceHandler from 'matrix-react-sdk/src/VectorConferenceHandler';
 import {_td, newTranslatableError} from 'matrix-react-sdk/src/languageHandler';
 import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils';
 import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
@@ -34,7 +33,6 @@ import * as Lifecycle from "matrix-react-sdk/src/Lifecycle";
 import type MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat";
 import {MatrixClientPeg} from 'matrix-react-sdk/src/MatrixClientPeg';
 import SdkConfig from "matrix-react-sdk/src/SdkConfig";
-import CallHandler from 'matrix-react-sdk/src/CallHandler';

 import {parseQs, parseQsFromFragment} from './url_utils';
 import VectorBasePlatform from "./platform/VectorBasePlatform";
@@ -71,11 +69,16 @@ function onHashChange(ev: HashChangeEvent) {

 // This will be called whenever the SDK changes screens,
 // so a web page can update the URL bar appropriately.
-function onNewScreen(screen: string) {
+function onNewScreen(screen: string, replaceLast = false) {
    console.log("newscreen " + screen);
    const hash = '#/' + screen;
    lastLocationHashSet = hash;
-    window.location.hash = hash;
+
+    if (replaceLast) {
+        window.location.replace(hash);
+    } else {
+        window.location.assign(hash);
+    }
 }

 // We use this to work out what URL the SDK should
@@ -136,7 +139,6 @@ export async function loadApp(fragParams: {}) {
        throw newTranslatableError(_td("Missing indexeddb worker script!"));
    }
    MatrixClientPeg.setIndexedDbWorkerScript(vectorIndexeddbWorkerScript);
-    CallHandler.setConferenceHandler(VectorConferenceHandler);

    window.addEventListener('hashchange', onHashChange);

@@ -155,7 +157,6 @@ export async function loadApp(fragParams: {}) {
    return <MatrixChat
        onNewScreen={onNewScreen}
        makeRegistrationUrl={makeRegistrationUrl}
-        ConferenceHandler={VectorConferenceHandler}
        config={config}
        realQueryParams={params}
        startingFragmentQueryParams={fragParams}
@@ -235,7 +236,7 @@ async function verifyServerConfig() {

        validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
    } catch (e) {
-        const {hsUrl, isUrl, userId} = Lifecycle.getLocalStorageSessionVars();
+        const {hsUrl, isUrl, userId} = await Lifecycle.getStoredSessionVars();
        if (hsUrl && userId) {
            console.error(e);
            console.warn("A session was found - suppressing config error and using the session's homeserver");
--- a/src/vector/index.ts
+++ b/src/vector/index.ts
@@ -23,6 +23,7 @@ limitations under the License.
 // in webpack.config.js
 require('gfm.css/gfm.css');
 require('highlight.js/styles/github.css');
+require('katex/dist/katex.css');

 // These are things that can run before the skin loads - be careful not to reference the react-sdk though.
 import {parseQsFromFragment} from "./url_utils";
@@ -85,7 +86,7 @@ const supportedBrowser = checkBrowserFeatures();
 // try in react but fallback to an `alert`
 // We start loading stuff but don't block on it until as late as possible to allow
 // the browser to use as much parallelism as it can.
-// Load parallelism is based on research in https://github.com/vector-im/riot-web/issues/12253
+// Load parallelism is based on research in https://github.com/vector-im/element-web/issues/12253
 async function start() {
    // load init.ts async so that its code is not executed immediately and we can catch any exceptions
    const {
@@ -114,7 +115,7 @@ async function start() {
        // 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
-        // (https://github.com/vector-im/riot-web/issues/7378)
+        // (https://github.com/vector-im/element-web/issues/7378)
        const preventRedirect = fragparts.params.client_secret || fragparts.location.length > 0;

        if (!preventRedirect) {
--- a/src/vector/init.tsx
+++ b/src/vector/init.tsx
@@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import olmWasmPath from "olm/olm.wasm";
 import Olm from 'olm';
@@ -125,8 +126,9 @@ export async function loadSkin() {
            /* webpackPreload: true */
            "matrix-react-sdk"),
        import(
-            /* webpackChunkName: "riot-web-component-index" */
+            /* webpackChunkName: "element-web-component-index" */
            /* webpackPreload: true */
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
            // @ts-ignore - this module is generated so may fail lint
            "../component-index"),
    ]);
@@ -141,7 +143,7 @@ export async function loadTheme() {
 export async function loadApp(fragParams: {}) {
    // load app.js async so that its code is not executed immediately and we can catch any exceptions
    const module = await import(
-        /* webpackChunkName: "riot-web-app" */
+        /* webpackChunkName: "element-web-app" */
        /* webpackPreload: true */
        "./app");
    window.matrixChat = ReactDOM.render(await module.loadApp(fragParams),
--- a/src/vector/jitsi/index.html
+++ b/src/vector/jitsi/index.html
@@ -9,9 +9,12 @@
 <div id="joinButtonContainer">
    <div class="joinConferenceFloating">
        <div class="joinConferencePrompt">
+            <span class="icon"><!-- managed by CSS --></span>
            <!-- TODO: i18n -->
            <h2>Jitsi Video Conference</h2>
-            <button type="button" id="joinButton">Join Conference</button>
+            <div id="widgetActionContainer">
+                <button type="button" id="joinButton">Join Conference</button>
+            </div>
        </div>
    </div>
 </div>
--- a/src/vector/jitsi/index.scss
+++ b/src/vector/jitsi/index.scss
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// TODO: Match the user's theme: https://github.com/vector-im/riot-web/issues/12794
+// TODO: Match the user's theme: https://github.com/vector-im/element-web/issues/12794

@font-face {
    font-family: 'Nunito';
@@ -23,10 +23,19 @@ limitations under the License.
    src: url('~matrix-react-sdk/res/fonts/Nunito/Nunito-Regular.ttf') format('truetype');
 }

+$dark-fg: #edf3ff;
+$dark-bg: #363c43;
+$light-fg: #2e2f32;
+$light-bg: #fff;
 body {
    font-family: Nunito, Arial, Helvetica, sans-serif;
-    background-color: #181b21;
-    color: #edf3ff;
+    background-color: $dark-bg;
+    color: $dark-fg;
+}
+
+body.theme-light {
+    background-color: $light-bg;
+    color: $light-fg;
 }

 body, html {
@@ -73,3 +82,26 @@ body, html {
    background-color: #03b381;
    border: 0;
 }
+
+.icon {
+    $icon-size: 42px;
+    margin-top: -$icon-size; // to visually center the form
+
+    &::before {
+        content: '';
+        background-size: contain;
+        background-color: $dark-fg;
+        mask-repeat: no-repeat;
+        mask-position: center;
+        mask-image: url("~matrix-react-sdk/res/img/element-icons/call/video-call.svg");
+        mask-size: $icon-size;
+        display: block;
+        width: $icon-size;
+        height: $icon-size;
+        margin: 0 auto; // center
+    }
+}
+
+body.theme-light .icon::before {
+    background-color: $light-fg;
+}
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@@ -18,7 +18,16 @@ limitations under the License.
 require("./index.scss");

 import * as qs from 'querystring';
-import { Capability, WidgetApi } from "matrix-react-sdk/src/widgets/WidgetApi";
+import {KJUR} from 'jsrsasign';
+import {
+    IOpenIDCredentials,
+    IWidgetApiRequest,
+    VideoConferenceCapabilities,
+    WidgetApi,
+} from "matrix-widget-api";
+import { ElementWidgetActions } from "matrix-react-sdk/src/stores/widgets/ElementWidgetActions";
+
+const JITSI_OPENIDTOKEN_JWT_AUTH = 'openidtoken-jwt';

 // Dev note: we use raw JS without many dependencies to reduce bundle size.
 // We do not need all of React to render a Jitsi conference.
@@ -33,8 +42,12 @@ let conferenceId: string;
 let displayName: string;
 let avatarUrl: string;
 let userId: string;
+let jitsiAuth: string;
+let roomId: string;
+let openIdToken: IOpenIDCredentials;

 let widgetApi: WidgetApi;
+let meetApi: any; // JitsiMeetExternalAPI

 (async function() {
    try {
@@ -54,13 +67,33 @@ let widgetApi: WidgetApi;
        // out into a browser.
        const parentUrl = qsParam('parentUrl', true);
        const widgetId = qsParam('widgetId', true);
+        const theme = qsParam('theme', true);
+
+        if (theme) {
+            document.body.classList.add(`theme-${theme.replace(" ", "_")}`);
+        }

        // Set this up as early as possible because Element will be hitting it almost immediately.
+        let readyPromise: Promise<[void, void]>;
        if (parentUrl && widgetId) {
-            widgetApi = new WidgetApi(qsParam('parentUrl'), qsParam('widgetId'), [
-                Capability.AlwaysOnScreen,
+            const parentOrigin = new URL(qsParam('parentUrl')).origin;
+            widgetApi = new WidgetApi(qsParam("widgetId"), parentOrigin);
+            widgetApi.requestCapabilities(VideoConferenceCapabilities);
+            readyPromise = Promise.all([
+                new Promise<void>(resolve => {
+                    widgetApi.once(`action:${ElementWidgetActions.ClientReady}`, ev => {
+                        ev.preventDefault();
+                        widgetApi.transport.reply(ev.detail, {});
+                        resolve();
+                    });
+                }),
+                new Promise<void>(resolve => {
+                    widgetApi.once("ready", () => resolve());
+                }),
            ]);
-            widgetApi.expectingExplicitReady = true;
+            widgetApi.start();
+        } else {
+            console.warn("No parent URL or no widget ID - assuming no widget API is available");
        }

        // Populate the Jitsi params now
@@ -69,40 +102,112 @@ let widgetApi: WidgetApi;
        displayName = qsParam('displayName', true);
        avatarUrl = qsParam('avatarUrl', true); // http not mxc
        userId = qsParam('userId');
+        jitsiAuth = qsParam('auth', true);
+        roomId = qsParam('roomId', true);

        if (widgetApi) {
-            await widgetApi.waitReady();
+            await readyPromise;
            await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen
+
+            // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
+            if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
+                // Request credentials, give callback to continue when received
+                openIdToken = await widgetApi.requestOpenIDConnectToken();
+                console.log("Got OpenID Connect token");
+            }
+
+            // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/element-web/issues/12795)
+
+            widgetApi.on(`action:${ElementWidgetActions.HangupCall}`,
+                (ev: CustomEvent<IWidgetApiRequest>) => {
+                    if (meetApi) meetApi.executeCommand('hangup');
+                    widgetApi.transport.reply(ev.detail, {}); // ack
+                },
+            );
        }

-        // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795)
-
-        document.getElementById("joinButton").onclick = () => joinConference();
+        enableJoinButton(); // always enable the button
    } catch (e) {
        console.error("Error setting up Jitsi widget", e);
-        document.getElementById("jitsiContainer").innerText = "Failed to load Jitsi widget";
-        switchVisibleContainers();
+        document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget";
    }
 })();

+function enableJoinButton() {
+    document.getElementById("joinButton").onclick = () => joinConference();
+}
+
 function switchVisibleContainers() {
    inConference = !inConference;
    document.getElementById("jitsiContainer").style.visibility = inConference ? 'unset' : 'hidden';
    document.getElementById("joinButtonContainer").style.visibility = inConference ? 'hidden' : 'unset';
 }

+/**
+ * Create a JWT token fot jitsi openidtoken-jwt auth
+ *
+ * See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
+ */
+function createJWTToken() {
+    // Header
+    const header = {alg: 'HS256', typ: 'JWT'};
+    // Payload
+    const payload = {
+        // As per Jitsi token auth, `iss` needs to be set to something agreed between
+        // JWT generating side and Prosody config. Since we have no configuration for
+        // the widgets, we can't set one anywhere. Using the Jitsi domain here probably makes sense.
+        iss: jitsiDomain,
+        sub: jitsiDomain,
+        aud: `https://${jitsiDomain}`,
+        room: "*",
+        context: {
+            matrix: {
+                token: openIdToken.access_token,
+                room_id: roomId,
+            },
+            user: {
+                avatar: avatarUrl,
+                name: displayName,
+            },
+        },
+    };
+    // Sign JWT
+    // The secret string here is irrelevant, we're only using the JWT
+    // to transport data to Prosody in the Jitsi stack.
+    return KJUR.jws.JWS.sign(
+        'HS256',
+        JSON.stringify(header),
+        JSON.stringify(payload),
+        'notused',
+    );
+}
+
 function joinConference() { // event handler bound in HTML
+    let jwt;
+    if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
+        if (!openIdToken?.access_token) { // eslint-disable-line camelcase
+            // We've failing to get a token, don't try to init conference
+            console.warn('Expected to have an OpenID credential, cannot initialize widget.');
+            document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget";
+            return;
+        }
+        jwt = createJWTToken();
+    }
+
    switchVisibleContainers();

-    // noinspection JSIgnoredPromiseFromCall
-    if (widgetApi) widgetApi.setAlwaysOnScreen(true); // ignored promise because we don't care if it works
+    if (widgetApi) {
+        // ignored promise because we don't care if it works
+        // noinspection JSIgnoredPromiseFromCall
+        widgetApi.setAlwaysOnScreen(true);
+    }

    console.warn(
        "[Jitsi Widget] The next few errors about failing to parse URL parameters are fine if " +
        "they mention 'external_api' or 'jitsi' in the stack. They're just Jitsi Meet trying to parse " +
        "our fragment values and not recognizing the options.",
    );
-    const meetApi = new JitsiMeetExternalAPI(jitsiDomain, {
+    const options = {
        width: "100%",
        height: "100%",
        parentNode: document.querySelector("#jitsiContainer"),
@@ -113,7 +218,10 @@ function joinConference() { // event handler bound in HTML
            MAIN_TOOLBAR_BUTTONS: [],
            VIDEO_LAYOUT_FIT: "height",
        },
-    });
+        jwt: jwt,
+    };
+
+    meetApi = new JitsiMeetExternalAPI(jitsiDomain, options);
    if (displayName) meetApi.executeCommand("displayName", displayName);
    if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl);
    if (userId) meetApi.executeCommand("email", userId);
@@ -121,9 +229,13 @@ function joinConference() { // event handler bound in HTML
    meetApi.on("readyToClose", () => {
        switchVisibleContainers();

-        // noinspection JSIgnoredPromiseFromCall
-        if (widgetApi) widgetApi.setAlwaysOnScreen(false); // ignored promise because we don't care if it works
+        if (widgetApi) {
+            // ignored promise because we don't care if it works
+            // noinspection JSIgnoredPromiseFromCall
+            widgetApi.setAlwaysOnScreen(false);
+        }

        document.getElementById("jitsiContainer").innerHTML = "";
+        meetApi = null;
    });
 }
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -27,7 +27,7 @@ import BaseEventIndexManager, {
    MatrixEvent,
    MatrixProfile,
    SearchArgs,
-    SearchResult
+    SearchResult,
 } from 'matrix-react-sdk/src/indexing/BaseEventIndexManager';
 import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
 import {_t, _td} from 'matrix-react-sdk/src/languageHandler';
@@ -99,7 +99,7 @@ interface IPCPayload {

 class SeshatIndexManager extends BaseEventIndexManager {
    private pendingIpcCalls: Record<number, { resolve, reject }> = {};
-    private nextIpcCallId: number = 0;
+    private nextIpcCallId = 0;

    constructor() {
        super();
@@ -140,8 +140,8 @@ class SeshatIndexManager extends BaseEventIndexManager {
        return this._ipcCall('supportsEventIndexing');
    }

-    async initEventIndex(): Promise<void> {
-        return this._ipcCall('initEventIndex');
+    async initEventIndex(userId: string, deviceId: string): Promise<void> {
+        return this._ipcCall('initEventIndex', userId, deviceId);
    }

    async addEventToIndex(ev: MatrixEvent, profile: MatrixProfile): Promise<void> {
@@ -216,7 +216,7 @@ class SeshatIndexManager extends BaseEventIndexManager {
 export default class ElectronPlatform extends VectorBasePlatform {
    private eventIndexManager: BaseEventIndexManager = new SeshatIndexManager();
    private pendingIpcCalls: Record<number, { resolve, reject }> = {};
-    private nextIpcCallId: number = 0;
+    private nextIpcCallId = 0;
    // this is the opaque token we pass to the HS which when we get it in our callback we can resolve to a profile
    private ssoID: string = randomString(32);

@@ -239,7 +239,7 @@ export default class ElectronPlatform extends VectorBasePlatform {

        // try to flush the rageshake logs to indexeddb before quit.
        ipcRenderer.on('before-quit', function() {
-            console.log('riot-desktop closing');
+            console.log('element-desktop closing');
            rageshake.flush();
        });

@@ -503,9 +503,9 @@ export default class ElectronPlatform extends VectorBasePlatform {
        return url;
    }

-    startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string, idpId?: string) {
        // this will get intercepted by electron-main will-navigate
-        super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin);
+        super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin, idpId);
        Modal.createTrackedDialog('Electron', 'SSO', InfoDialog, {
            title: _t("Go to your browser to complete Sign In"),
            description: <Spinner />,
--- a/src/vector/platform/VectorBasePlatform.ts
+++ b/src/vector/platform/VectorBasePlatform.ts
@@ -40,7 +40,7 @@ export default abstract class VectorBasePlatform extends BasePlatform {
    /**
     * Delay creating the `Favicon` instance until first use (on the first notification) as
     * it uses canvas, which can trigger a permission prompt in Firefox's resist fingerprinting mode.
-     * See https://github.com/vector-im/riot-web/issues/9605.
+     * See https://github.com/vector-im/element-web/issues/9605.
     */
    get favicon() {
        if (this._favicon) {
--- a/src/vector/rageshakesetup.ts
+++ b/src/vector/rageshakesetup.ts
@@ -38,7 +38,7 @@ export function initRageshake() {
            "Meatball menu → Settings → Blackboxing → Add /rageshake\\.js$");

        window.addEventListener('beforeunload', (e) => {
-            console.log('riot-web closing');
+            console.log('element-web closing');
            // try to flush the logs to indexeddb
            rageshake.flush();
        });
@@ -51,12 +51,18 @@ export function initRageshake() {
 }

 window.mxSendRageshake = function(text: string, withLogs?: boolean) {
+    const url = SdkConfig.get().bug_report_endpoint_url;
+    if (!url) {
+        console.error("Cannot send a rageshake - no bug_report_endpoint_url configured");
+        return;
+    }
+
    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;
    }
-    sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
+    sendBugReport(url, {
        userText: text,
        sendLogs: withLogs,
        progressCallback: console.log.bind(console),
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -249,7 +249,7 @@ module.exports = (env, argv) => {
                },
                {
                    // cache-bust languages.json file placed in
-                    // riot-web/webapp/i18n during build by copy-res.js
+                    // element-web/webapp/i18n during build by copy-res.js
                    test: /\.*languages.json$/,
                    type: "javascript/auto",
                    loader: 'file-loader',
@@ -269,12 +269,12 @@ module.exports = (env, argv) => {
                            options: {
                                esModule: false,
                                name: '[name].[hash:7].[ext]',
-                                outputPath: getImgOutputPath,
+                                outputPath: getAssetOutputPath,
                                publicPath: function(url, resourcePath) {
                                    // CSS image usages end up in the `bundles/[hash]` output
                                    // directory, so we adjust the final path to navigate up
                                    // twice.
-                                    const outputPath = getImgOutputPath(url, resourcePath);
+                                    const outputPath = getAssetOutputPath(url, resourcePath);
                                    return toPublicPath(path.join("../..", outputPath));
                                },
                            },
@@ -285,9 +285,9 @@ module.exports = (env, argv) => {
                            options: {
                                esModule: false,
                                name: '[name].[hash:7].[ext]',
-                                outputPath: getImgOutputPath,
+                                outputPath: getAssetOutputPath,
                                publicPath: function(url, resourcePath) {
-                                    const outputPath = getImgOutputPath(url, resourcePath);
+                                    const outputPath = getAssetOutputPath(url, resourcePath);
                                    return toPublicPath(outputPath);
                                },
                            },
@@ -392,15 +392,25 @@ module.exports = (env, argv) => {

 /**
 * Merge assets found via CSS and imports into a single tree, while also preserving
- * directories under `res`.
+ * directories under e.g. `res` or similar.
 *
 * @param {string} url The adjusted name of the file, such as `warning.1234567.svg`.
 * @param {string} resourcePath The absolute path to the source file with unmodified name.
 * @return {string} The returned paths will look like `img/warning.1234567.svg`.
 */
-function getImgOutputPath(url, resourcePath) {
-    const prefix = /^.*[/\\]res[/\\]/;
-    const outputDir = path.dirname(resourcePath).replace(prefix, "");
+function getAssetOutputPath(url, resourcePath) {
+    // `res` is the parent dir for our own assets in various layers
+    // `dist` is the parent dir for KaTeX assets
+    const prefix = /^.*[/\\](dist|res)[/\\]/;
+    if (!resourcePath.match(prefix)) {
+        throw new Error(`Unexpected asset path: ${resourcePath}`);
+    }
+    let outputDir = path.dirname(resourcePath).replace(prefix, "");
+    if (resourcePath.includes("KaTeX")) {
+        // Add a clearly named directory segment, rather than leaving the KaTeX
+        // assets loose in each asset type directory.
+        outputDir = path.join(outputDir, "KaTeX");
+    }
    return path.join(outputDir, path.basename(url));
 }

--- a/yarn.lock
+++ b/yarn.lock