From 6fa5591cfe47bf3106fc13cdc9752686a4e0dd01 Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Thu, 25 Mar 2021 08:05:44 +0000
Subject: [PATCH 01/86] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 89f8c8769..807bc5b2b 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -6,7 +6,7 @@
     "Welcome to Element": "欢迎来到 Element",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化、加密聊天与协作，由 [matrix] 驱动",
     "Sign In": "登录",
-    "Create Account": "创建账户",
+    "Create Account": "创建账号",
     "Explore rooms": "探索聊天室",
     "The message from the parser is: %(message)s": "语法分析器的信息：%(message)s",
     "Invalid JSON": "无效的 JSON",

From 83ebda350a9ec8e62a485eb55e3ef67a36b7352b Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Sun, 28 Mar 2021 11:58:17 +0000
Subject: [PATCH 02/86] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hans/
---
 src/i18n/strings/zh_Hans.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 807bc5b2b..a06537a4a 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1,5 +1,5 @@
 {
-    "Dismiss": "标记为已读",
+    "Dismiss": "忽略",
     "powered by Matrix": "由 Matrix 驱动",
     "Unknown device": "未知设备",
     "You need to be using HTTPS to place a screen-sharing call.": "您需要使用 HTTPS 以进行共享屏幕通话。",

From 46082f63b3f160596b58c04eba46bc5b3bde45aa Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali@protonmail.com>
Date: Sun, 4 Apr 2021 00:41:52 +0000
Subject: [PATCH 03/86] Translated using Weblate (Central Atlas Tamazight)

Currently translated at 39.3% (13 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/
---
 src/i18n/strings/tzm.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json
index 80f2451a9..d97f87582 100644
--- a/src/i18n/strings/tzm.json
+++ b/src/i18n/strings/tzm.json
@@ -10,5 +10,6 @@
     "Unknown device": "Allal arussin",
     "Open user settings": "Ṛẓem tisɣal n unessemres",
     "Dismiss": "Nexxel",
-    "Open": "Ṛẓem"
+    "Open": "Ṛẓem",
+    "The message from the parser is: %(message)s": "Tuzint seg tasna: %(message)s"
 }

From 97a43d058dc42bc804611511c6f1e879fa87729a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 6 Apr 2021 19:39:26 -0600
Subject: [PATCH 04/86] Support a config option to skip login/welcome and go to
 SSO

For deployments which want this sort of functionality for their users. Ideal for self-hosted deployments.
---
 docs/config.md     |  7 +++++--
 src/vector/app.tsx | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index 77467eff1..f93b3448e 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -22,9 +22,12 @@ For a good example, see https://develop.element.io/config.json.
      `default_hs_url` is specified. When multiple sources are specified, it is unclear
      which should take priority and therefore the application cannot continue.
    * As of Element 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below.
+1. `sso_immediate_redirect`: When `true`, Element will assume the default server supports SSO
+   and attempt to send the user there to continue (if they aren't already logged in). Default
+   `false`. Note that this disables all usage of the welcome page.
 1. `features`: Lookup of optional features that may be force-enabled (`true`) or force-disabled (`false`).
    When features are not listed here, their defaults will be used, and users can turn them on/off if `showLabsSettings`
-   allows them to. The available optional experimental features vary from release to release and are 
+   allows them to. The available optional experimental features vary from release to release and are
    [documented](labs.md). The feature flag process is [documented](feature-flags.md) as well.
 1. `showLabsSettings`: Shows the "labs" tab of user settings. Useful to allow users to turn on experimental features
    they might not otherwise have access to.
@@ -73,7 +76,7 @@ For a good example, see https://develop.element.io/config.json.
        not selected. By default, no home page is configured. If one is set, a
        button to access it will be shown in the top left menu.
     1. `loginForWelcome`: Overrides `welcomeUrl` to make the welcome page be the
-       same page as the login page when `true`. This effectively disables the 
+       same page as the login page when `true`. This effectively disables the
        welcome page.
 1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
    country selectors, like the phone number input on the registration page.
diff --git a/src/vector/app.tsx b/src/vector/app.tsx
index a0e4ee50c..c0f1e2dcd 100644
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -35,6 +35,7 @@ import SdkConfig from "matrix-react-sdk/src/SdkConfig";
 
 import {parseQs, parseQsFromFragment} from './url_utils';
 import VectorBasePlatform from "./platform/VectorBasePlatform";
+import {createClient} from "matrix-js-sdk/src/matrix";
 
 let lastLocationHashSet: string = null;
 
@@ -153,6 +154,22 @@ export async function loadApp(fragParams: {}) {
 
     // Don't bother loading the app until the config is verified
     const config = await verifyServerConfig();
+
+    // Before we continue, let's see if we're supposed to do an SSO redirect
+    const [userId] = await Lifecycle.getStoredSessionOwner();
+    const hasPossibleToken = !!userId;
+    const isReturningFromSso = !!params.loginToken;
+    const autoRedirect = config['sso_immediate_redirect'] === true;
+    if (!hasPossibleToken && !isReturningFromSso && autoRedirect) {
+        console.log("Bypassing app load to redirect to SSO");
+        const tempCli = createClient({
+            baseUrl: config['validated_server_config'].hsUrl,
+            idBaseUrl: config['validated_server_config'].isUrl,
+        });
+        PlatformPeg.get().startSingleSignOn(tempCli, "sso", `/${getScreenFromLocation(window.location).screen}`);
+        return;
+    }
+
     const MatrixChat = sdk.getComponent('structures.MatrixChat');
     return <MatrixChat
         onNewScreen={onNewScreen}

From 5642fc4026f4b8523781108e4d1a6f82266a9562 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 6 Apr 2021 19:43:24 -0600
Subject: [PATCH 05/86] Doc the return

---
 src/vector/app.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vector/app.tsx b/src/vector/app.tsx
index c0f1e2dcd..1fc856c01 100644
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -167,6 +167,10 @@ export async function loadApp(fragParams: {}) {
             idBaseUrl: config['validated_server_config'].isUrl,
         });
         PlatformPeg.get().startSingleSignOn(tempCli, "sso", `/${getScreenFromLocation(window.location).screen}`);
+
+        // We return here because startSingleSignOn() will asynchronously redirect us. We don't
+        // care to wait for it, and don't want to show any UI while we wait (not even half a welcome
+        // page). As such, just don't even bother loading the MatrixChat component.
         return;
     }
 

From 9400bd1fd23de0dca451fb774c710b7508aab320 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 7 Apr 2021 13:07:02 +0100
Subject: [PATCH 06/86] Upgrade matrix-js-sdk to 9.11.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 63f5a9d85..a903ae063 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "9.11.0-rc.1",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/yarn.lock b/yarn.lock
index 2f5914322..e9e932867 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7506,6 +7506,21 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+matrix-js-sdk@9.11.0-rc.1:
+  version "9.11.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0-rc.1.tgz#c1bcc5d749ef6b78673ab48e2db30f4e8b56768d"
+  integrity sha512-1U7l9FgWVWghTRRhU0A7zdniXS7mZ2Zr7H/lFUp5V3SVK62K7s3mKmFlGnuBNODnWYv4ZVKvlkCNaYYLSGw6/g==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "9.10.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4204b2170a1e04f20067b87636bb2eddf95194c4"

From c7d34ae92642dfe7c0aad01299359373deb325d4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 7 Apr 2021 13:09:19 +0100
Subject: [PATCH 07/86] Upgrade matrix-react-sdk to 3.18.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 23 +++++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index a903ae063..c35b307e9 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "9.11.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.18.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index e9e932867..c1e2ee35d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,20 +7521,6 @@ matrix-js-sdk@9.11.0-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "9.10.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/4204b2170a1e04f20067b87636bb2eddf95194c4"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7543,9 +7529,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.17.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/5df4ad2db0fed4bd96c73fa5b13cd4994c3a96c7"
+matrix-react-sdk@3.18.0-rc.1:
+  version "3.18.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0-rc.1.tgz#2a41f302d898ca02b97da027b9c60d8b24722215"
+  integrity sha512-tIZniXw/2fHdBrSNzy6DmXVNE0+uko5svajQHM0a9wteBhNTap+MtoAbV0QWCpF6/NsLMsjmpxbUUfRkhFZzzQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7573,7 +7560,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "9.11.0-rc.1"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 74b4c91d58c72e6bd4c9f4b2e61a710d0cda6f2a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 7 Apr 2021 13:11:54 +0100
Subject: [PATCH 08/86] Prepare changelog for v1.7.25-rc.1

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9225a9e5..4da277d6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+Changes in [1.7.25-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.25-rc.1) (2021-04-07)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24...v1.7.25-rc.1)
+
+ * Upgrade to React SDK 3.18.0-rc.1 and JS SDK 9.11.0-rc.1
+ * Translations update from Weblate
+   [\#16882](https://github.com/vector-im/element-web/pull/16882)
+ * Revert "Docker image: serve pre-compressed assets using gzip_static"
+   [\#16838](https://github.com/vector-im/element-web/pull/16838)
+ * Move native node modules documentation to element-desktop
+   [\#16814](https://github.com/vector-im/element-web/pull/16814)
+ * Add user settings for warn before exit
+   [\#16781](https://github.com/vector-im/element-web/pull/16781)
+ * Change ISSUE_TEMPLATE bold lines to proper headers
+   [\#16768](https://github.com/vector-im/element-web/pull/16768)
+ * Add example for deployment into Kubernetes
+   [\#16447](https://github.com/vector-im/element-web/pull/16447)
+ * Create bare-bones `PULL_REQUEST_TEMPLATE.md`
+   [\#16770](https://github.com/vector-im/element-web/pull/16770)
+ * Add webpack config and labs flag docs for voice messages
+   [\#16705](https://github.com/vector-im/element-web/pull/16705)
+
 Changes in [1.7.24](https://github.com/vector-im/element-web/releases/tag/v1.7.24) (2021-03-29)
 ===============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24-rc.1...v1.7.24)

From 11ce4fa41bc3e3e4618fe3ab129fc48da56c84fc Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 7 Apr 2021 13:11:55 +0100
Subject: [PATCH 09/86] v1.7.25-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c35b307e9..79228dd63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.7.24",
+  "version": "1.7.25-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 5207e354881367548a308d155aad5066fe7f5f02 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 7 Apr 2021 10:20:16 -0600
Subject: [PATCH 10/86] Switch develop to not-staging Scalar by default

---
 element.io/develop/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/element.io/develop/config.json b/element.io/develop/config.json
index 13eac7945..1e1e3ed02 100644
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -1,8 +1,8 @@
 {
     "default_server_name": "matrix.org",
     "brand": "Element",
-    "integrations_ui_url": "https://scalar-staging.vector.im/",
-    "integrations_rest_url": "https://scalar-staging.vector.im/api",
+    "integrations_ui_url": "https://scalar.vector.im/",
+    "integrations_rest_url": "https://scalar.vector.im/api",
     "integrations_widgets_urls": [
         "https://scalar.vector.im/_matrix/integrations/v1",
         "https://scalar.vector.im/api",

From c580148bb73047854668a8a40107535e1e05df6d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 8 Apr 2021 18:39:09 -0600
Subject: [PATCH 11/86] Add mobile download link configuration

This is similar to the desktopBuilds config option.

The mobile setup guide and static incompatible browser pages are not touched by these options given they are static assets and easily replaced.
---
 docs/config.md                                |  7 ++
 .../structures/CompatibilityView.tsx          | 77 +++++++++++++------
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index f93b3448e..3694ec00b 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -116,6 +116,13 @@ For a good example, see https://develop.element.io/config.json.
    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.
+1. `mobileBuilds`: Used to alter promotional links to the mobile app. By default the
+   builds are considered available and accessible from https://element.io. This config
+   option is typically used in a context of encouraging the user to try the mobile app
+   instead of a mobile/incompatible browser. There are 3 possible fields for this config
+   option: `ios`, `android`, `fdroid`. For all 3, when set to a string then that URL will
+   be used. When not defined, the default element.io apps will be used. When explicitly
+   set to `null`, that platform will be considered unavailable.
 1. `mobileGuideToast`: Whether to show a toast a startup which nudges users on
    iOS and Android towards the native mobile apps. The toast redirects to the
    mobile guide if they accept. Defaults to false.
diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx
index 05a09c6b8..b83608074 100644
--- a/src/async-components/structures/CompatibilityView.tsx
+++ b/src/async-components/structures/CompatibilityView.tsx
@@ -27,7 +27,55 @@ interface IProps {
 }
 
 const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
-    const brand = SdkConfig.get().brand;
+    const {brand, mobileBuilds} = SdkConfig.get();
+
+    let ios = null;
+    const iosCustomUrl = mobileBuilds?.ios;
+    if (iosCustomUrl !== null) { // could be undefined or a string
+        ios = <>
+            <p><strong>iOS</strong> (iPhone or iPad)</p>
+            <a
+                href={iosCustomUrl || "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>
+        </>;
+    }
+
+    let android = [<p className="mx_Spacer" key="header"><strong>Android</strong></p>];
+    const andCustomUrl = mobileBuilds?.android;
+    const fdroidCustomUrl = mobileBuilds?.fdroid;
+    if (andCustomUrl !== null) { // undefined or string
+        android.push(<a
+            href={andCustomUrl || "https://play.google.com/store/apps/details?id=im.vector.app"}
+            target="_blank"
+            className="mx_ClearDecoration"
+            key="android"
+        >
+            <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
+        </a>);
+    }
+    if (fdroidCustomUrl !== null) { // undefined or string
+        android.push(<a
+            href={fdroidCustomUrl || "https://f-droid.org/repository/browse/?fdid=im.vector.app"}
+            target="_blank"
+            className="mx_ClearDecoration"
+            key="fdroid"
+        >
+            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid"/>
+        </a>);
+    }
+    if (android.length === 1) { // just a header, meaning no links
+        android = [];
+    }
+
+    let mobileHeader = <h2 id="step2_heading">{_t("Use %(brand)s on mobile", {brand})}</h2>;
+    if (!android.length && !ios) {
+        mobileHeader = null;
+    }
+
     return <div className="mx_ErrorView">
         <div className="mx_ErrorView_container">
             <div className="mx_HomePage_header">
@@ -76,30 +124,9 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
             <div className="mx_HomePage_col">
                 <div className="mx_HomePage_row">
                     <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"
-                        >
-                            <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"
-                        >
-                            <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"
-                        >
-                            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
-                        </a>
+                        {mobileHeader}
+                        {ios}
+                        {android}
                     </div>
                 </div>
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9c71b8584..892ab66ca 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -19,6 +19,7 @@
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
     "Powered by Matrix": "Powered by Matrix",
+    "Use %(brand)s on mobile": "Use %(brand)s on mobile",
     "Unsupported browser": "Unsupported browser",
     "Your browser can't run %(brand)s": "Your browser can't run %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uses advanced browser features which aren't supported by your current browser.",

From 1952cf65635c944b7a37871d0bd9220d70b1e98d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 8 Apr 2021 18:43:15 -0600
Subject: [PATCH 12/86] Add missing closing tag in guide

---
 src/vector/mobile_guide/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html
index da49907f9..3960c4391 100644
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -152,7 +152,7 @@ body {
                 <path fill-rule="evenodd" clip-rule="evenodd" d="M20.92 33.32C20.92 34.2478 20.1679 35 19.24 35C13.0544 35 8.04001 29.9856 8.04001 23.8C8.04001 22.8722 8.79217 22.12 9.72001 22.12C10.6478 22.12 11.4 22.8722 11.4 23.8C11.4 28.1299 14.9101 31.64 19.24 31.64C20.1679 31.64 20.92 32.3922 20.92 33.32Z" fill="#0DBD8B"/>
                 <path fill-rule="evenodd" clip-rule="evenodd" d="M4.68 24.9199C3.75216 24.9199 3 24.1678 3 23.2399C3 17.0543 8.01441 12.0399 14.2 12.0399C15.1278 12.0399 15.88 12.7921 15.88 13.7199C15.88 14.6478 15.1278 15.3999 14.2 15.3999C9.87009 15.3999 6.36 18.91 6.36 23.2399C6.36 24.1678 5.60784 24.9199 4.68 24.9199Z" fill="#0DBD8B"/>
                 <path fill-rule="evenodd" clip-rule="evenodd" d="M29.32 17.0801C30.2478 17.0801 31 17.8322 31 18.7601C31 24.9457 25.9856 29.9601 19.8 29.9601C18.8722 29.9601 18.12 29.2079 18.12 28.2801C18.12 27.3522 18.8722 26.6001 19.8 26.6001C24.1299 26.6001 27.64 23.09 27.64 18.7601C27.64 17.8322 28.3922 17.0801 29.32 17.0801Z" fill="#0DBD8B"/>
-            </svg>    
+            </svg>
           </span>
           <p>Set up Element on iOS or Android</p>
       </div>
@@ -260,6 +260,7 @@ body {
                         </g>
                     </g>
                 </svg>
+              </a>
               <a href="https://f-droid.org/repository/browse/?fdid=im.vector.app" target="_blank" class="mx_ClearDecoration">
                 <svg width="164px" height="48px" viewBox="0 0 157 46" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
                     <desc>Get it on F-Droid.</desc>

From bd38ad5166788b715d8e4f7dfe0be1ef32ccbfea Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 8 Apr 2021 18:43:50 -0600
Subject: [PATCH 13/86] Appease the linter

---
 src/async-components/structures/CompatibilityView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx
index b83608074..d8b5f0be8 100644
--- a/src/async-components/structures/CompatibilityView.tsx
+++ b/src/async-components/structures/CompatibilityView.tsx
@@ -64,7 +64,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
             className="mx_ClearDecoration"
             key="fdroid"
         >
-            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid"/>
+            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
         </a>);
     }
     if (android.length === 1) { // just a header, meaning no links

From c6e9aba3085fb8cecbd5a14d2918b902398d3c23 Mon Sep 17 00:00:00 2001
From: Qt Resynth <resynth1943@tutanota.com>
Date: Sat, 10 Apr 2021 03:38:08 +0000
Subject: [PATCH 14/86] Translated using Weblate (English (United States))

Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/en_US/
---
 src/i18n/strings/en_US.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 8b47936fb..96cf509f6 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -31,6 +31,6 @@
     "Download Completed": "Download Completed",
     "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
-    "Your Element is misconfigured": "Your Element is misconfigured",
+    "Your Element is misconfigured": "Your Element is misconfigured.",
     "Missing indexeddb worker script!": "Missing indexeddb worker script!"
 }

From d1d6ef55ff3fc0fe170e3bb7bbc6f3c9f5bd0f37 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Apr 2021 15:26:37 +0100
Subject: [PATCH 15/86] Upgrade matrix-js-sdk to 9.11.0

---
 package.json |  2 +-
 yarn.lock    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 79228dd63..72f1c1f81 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "9.11.0-rc.1",
+    "matrix-js-sdk": "9.11.0",
     "matrix-react-sdk": "3.18.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/yarn.lock b/yarn.lock
index c1e2ee35d..4c262f916 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7506,6 +7506,21 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+matrix-js-sdk@9.11.0:
+  version "9.11.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0.tgz#57ba60dfbcf2b32917eb6d7232d0e81cf0de0d3a"
+  integrity sha512-wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-js-sdk@9.11.0-rc.1:
   version "9.11.0-rc.1"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0-rc.1.tgz#c1bcc5d749ef6b78673ab48e2db30f4e8b56768d"

From 19748762a59cb49911dc1e6447d28ed9b9b229b8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Apr 2021 15:27:10 +0100
Subject: [PATCH 16/86] Upgrade matrix-react-sdk to 3.18.0

---
 package.json |  2 +-
 yarn.lock    | 25 +++++--------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 72f1c1f81..f49fb9b0d 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "9.11.0",
-    "matrix-react-sdk": "3.18.0-rc.1",
+    "matrix-react-sdk": "3.18.0",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 4c262f916..e4ae37fe2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,21 +7521,6 @@ matrix-js-sdk@9.11.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@9.11.0-rc.1:
-  version "9.11.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0-rc.1.tgz#c1bcc5d749ef6b78673ab48e2db30f4e8b56768d"
-  integrity sha512-1U7l9FgWVWghTRRhU0A7zdniXS7mZ2Zr7H/lFUp5V3SVK62K7s3mKmFlGnuBNODnWYv4ZVKvlkCNaYYLSGw6/g==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7544,10 +7529,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.18.0-rc.1:
-  version "3.18.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0-rc.1.tgz#2a41f302d898ca02b97da027b9c60d8b24722215"
-  integrity sha512-tIZniXw/2fHdBrSNzy6DmXVNE0+uko5svajQHM0a9wteBhNTap+MtoAbV0QWCpF6/NsLMsjmpxbUUfRkhFZzzQ==
+matrix-react-sdk@3.18.0:
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0.tgz#119b0a908974e46ad9973aa7c4ea10ee06fab2b4"
+  integrity sha512-RkivwI4Rv+l93tmj3GK1XDK9hGAoIILcQZ+rr1cQ1AymmFSwF/mQLVJICewLZCcp2FP9osJg75/JbmPBaurxdw==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7575,7 +7560,7 @@ matrix-react-sdk@3.18.0-rc.1:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "9.11.0-rc.1"
+    matrix-js-sdk "9.11.0"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 95fb11a2b97241b3a15de1201d8a06eb952d583b Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Apr 2021 15:29:40 +0100
Subject: [PATCH 17/86] Prepare changelog for v1.7.25

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4da277d6a..bfd055700 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.7.25](https://github.com/vector-im/element-web/releases/tag/v1.7.25) (2021-04-12)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25-rc.1...v1.7.25)
+
+ * Upgrade to React SDK 3.18.0 and JS SDK 9.11.0
+
 Changes in [1.7.25-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.25-rc.1) (2021-04-07)
 =========================================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.24...v1.7.25-rc.1)

From 0bc5a012284a89481fbb00f5646f4b84a13474ee Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Apr 2021 15:29:40 +0100
Subject: [PATCH 18/86] v1.7.25

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f49fb9b0d..f6faed57c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.7.25-rc.1",
+  "version": "1.7.25",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From f38aedae859dc8eed0937318c0727cfe4e4d983c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Apr 2021 15:32:56 +0100
Subject: [PATCH 19/86] Reset matrix-js-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f6faed57c..88d4b1ada 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "9.11.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "3.18.0",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/yarn.lock b/yarn.lock
index e4ae37fe2..1ebbcc7de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,6 +7521,20 @@ matrix-js-sdk@9.11.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "9.11.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"

From fb0bc34042436bf75cdeb08154c8202aea62e8eb Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 12 Apr 2021 15:33:08 +0100
Subject: [PATCH 20/86] Reset matrix-react-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 22 +++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 88d4b1ada..4f6a78b78 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "3.18.0",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 1ebbcc7de..2cc67987b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7506,21 +7506,6 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@9.11.0:
-  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.11.0.tgz#57ba60dfbcf2b32917eb6d7232d0e81cf0de0d3a"
-  integrity sha512-wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "9.11.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad"
@@ -7543,10 +7528,9 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.18.0:
+"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.18.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.18.0.tgz#119b0a908974e46ad9973aa7c4ea10ee06fab2b4"
-  integrity sha512-RkivwI4Rv+l93tmj3GK1XDK9hGAoIILcQZ+rr1cQ1AymmFSwF/mQLVJICewLZCcp2FP9osJg75/JbmPBaurxdw==
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f74300733455e4d0c4eb9359dcce880092286b74"
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7574,7 +7558,7 @@ matrix-react-sdk@3.18.0:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "9.11.0"
+    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From 1de7828e4dde308dc8af53153fade2a664314ddf Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 12 Apr 2021 14:59:56 -0600
Subject: [PATCH 21/86] Write out docs explicitly.

---
 docs/config.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index 3694ec00b..27b4797f0 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -119,10 +119,13 @@ For a good example, see https://develop.element.io/config.json.
 1. `mobileBuilds`: Used to alter promotional links to the mobile app. By default the
    builds are considered available and accessible from https://element.io. This config
    option is typically used in a context of encouraging the user to try the mobile app
-   instead of a mobile/incompatible browser. There are 3 possible fields for this config
-   option: `ios`, `android`, `fdroid`. For all 3, when set to a string then that URL will
-   be used. When not defined, the default element.io apps will be used. When explicitly
-   set to `null`, that platform will be considered unavailable.
+   instead of a mobile/incompatible browser.
+   1. `ios`: The URL to the iOS build. If `null`, it will be assumed to be not available.
+       If not set, the default element.io builds will be used.
+   1. `android`: The URL to the Android build. If `null`, it will be assumed to be not available.
+       If not set, the default element.io builds will be used.
+   1. `fdroid`: The URL to the FDroid build. If `null`, it will be assumed to be not available.
+      If not set, the default element.io builds will be used.
 1. `mobileGuideToast`: Whether to show a toast a startup which nudges users on
    iOS and Android towards the native mobile apps. The toast redirects to the
    mobile guide if they accept. Defaults to false.

From cd7fd24b1a3100201e3cec44655f8560649f4798 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 11 Apr 2021 17:04:55 +0000
Subject: [PATCH 22/86] Translated using Weblate (English (United States))

Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/en_US/
---
 src/i18n/strings/en_US.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 96cf509f6..8b47936fb 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -31,6 +31,6 @@
     "Download Completed": "Download Completed",
     "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
-    "Your Element is misconfigured": "Your Element is misconfigured.",
+    "Your Element is misconfigured": "Your Element is misconfigured",
     "Missing indexeddb worker script!": "Missing indexeddb worker script!"
 }

From b744e97fd05c8d11113cf13a4e83981eb1dcf03a Mon Sep 17 00:00:00 2001
From: Thai Localization <thailocalization@protonmail.com>
Date: Mon, 12 Apr 2021 08:12:35 +0000
Subject: [PATCH 23/86] Translated using Weblate (Thai)

Currently translated at 45.4% (15 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/th/
---
 src/i18n/strings/th.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index d9740a9aa..b5770a49b 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -1,13 +1,18 @@
 {
     "powered by Matrix": "ใช้เทคโนโลยี Matrix",
-    "Dismiss": "ไม่สนใจ",
+    "Dismiss": "ยกเลิก",
     "Unknown device": "อุปกรณ์ที่ไม่รู้จัก",
     "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]",
-    "The message from the parser is: %(message)s": "ข้อความจากparserคือ:%(message)s",
+    "The message from the parser is: %(message)s": "ข้อความจากตัวแยกวิเคราะห์คือ: %(message)s",
     "Invalid JSON": "JSON ไม่ถูกต้อง",
-    "Sign In": "เข้าสู่ระบบ",
+    "Sign In": "ลงชื่อเข้า",
     "Create Account": "สร้างบัญชี",
-    "Explore rooms": "สำรวจห้อง"
+    "Explore rooms": "สำรวจห้อง",
+    "Download Completed": "การดาวน์โหลดเสร็จสมบูรณ์",
+    "Open user settings": "เปิดการตั้งค่าผู้ใช้",
+    "Go to element.io": "ไปยัง element.io",
+    "Failed to start": "ไม่สามารถเริ่ม",
+    "Open": "เปิด"
 }

From 3228a3abd1d51fd9236cea4d02b18acd1854d78d Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Wed, 14 Apr 2021 12:43:49 +0100
Subject: [PATCH 24/86] Update security notice

New information came to light after the original report, so this updates the
notice to match the latest details.
---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfd055700..b9a381ce4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,12 +90,12 @@ Changes in [1.7.22](https://github.com/vector-im/element-web/releases/tag/v1.7.2
 
 ## Security notice
 
-Element Web 1.7.22 fixes (by upgrading to matrix-react-sdk 3.15.0) a low
+Element Web 1.7.22 fixes (by upgrading to matrix-react-sdk 3.15.0) a moderate
 severity issue (CVE-2021-21320) where the user content sandbox can be abused to
-trick users into opening unexpected documents. The content is opened with a
-`blob` origin that cannot access Matrix user data, so messages and secrets are
-not at risk.  Thanks to @keerok for responsibly disclosing this via Matrix's
-Security Disclosure Policy.
+trick users into opening unexpected documents after several user interactions.
+The content can be opened with a `blob` origin from the Matrix client, so it is
+possible for a malicious document to access user messages and secrets. Thanks to
+@keerok for responsibly disclosing this via Matrix's Security Disclosure Policy.
 
 ## All changes
 

From 4c96b7826ccecf391d85a20f8a793871f7691d46 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 15 Apr 2021 00:50:35 -0600
Subject: [PATCH 25/86] Labs documentation for DND mode

---
 docs/labs.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/labs.md b/docs/labs.md
index 887ce93d5..3dff4474c 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -130,3 +130,8 @@ An in-progress implementation of [MSC2516](https://github.com/matrix-org/matrix-
 [voice messages](https://github.com/vector-im/element-web/issues/1358) to Element. Note that this feature
 is currently under active development and therefore is entirely incomplete and may not work at all - it
 is not recommended for general use at this time.
+
+## Do not disturb (`feature_dnd`)
+
+Enables UI for turning on "do not disturb" mode for the current device. When DND mode is engaged, popups
+and notification noises are suppressed. Not perfect, but can help reduce noise.

From 325cf2c08be07d2aa1dea38aa6d8ec946df2da7d Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 15 Apr 2021 08:39:34 +0100
Subject: [PATCH 26/86] remove velocity animate from lockfile

---
 yarn.lock | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 2f5914322..8b0eec0a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7580,7 +7580,6 @@ matrix-mock-request@^1.2.3:
     tar-js "^0.3.0"
     text-encoding-utf-8 "^1.0.2"
     url "^0.11.0"
-    velocity-animate "^2.0.6"
     what-input "^5.2.10"
     zxcvbn "^4.4.2"
 

From 72f987a42b33b4f2ea84b9536fec8f516515e1c9 Mon Sep 17 00:00:00 2001
From: Germain <germain@souquet.com>
Date: Thu, 15 Apr 2021 10:57:54 +0100
Subject: [PATCH 27/86] Rename blackboxing to new option ignore list

---
 src/vector/rageshakesetup.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vector/rageshakesetup.ts b/src/vector/rageshakesetup.ts
index e2c293d34..02161331f 100644
--- a/src/vector/rageshakesetup.ts
+++ b/src/vector/rageshakesetup.ts
@@ -36,7 +36,7 @@ export function initRageshake() {
     prom.then(() => {
         console.log("Initialised rageshake.");
         console.log("To fix line numbers in Chrome: " +
-            "Meatball menu → Settings → Blackboxing → Add /rageshake\\.js$");
+            "Meatball menu → Settings → Ignore list → Add /rageshake\\.js$");
 
         window.addEventListener('beforeunload', (e) => {
             console.log('element-web closing');

From f06eb14c48bb01fa09b1da9b4a5f34460b62b9a9 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 15 Apr 2021 15:15:48 +0100
Subject: [PATCH 28/86] Linter recommendations

---
 webpack.config.js | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 2335ea9a0..cf1db3f98 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,8 +5,8 @@ const TerserPlugin = require('terser-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const webpack = require("webpack");
 
-let og_image_url = process.env.RIOT_OG_IMAGE_URL;
-if (!og_image_url) og_image_url = 'https://app.element.io/themes/element/img/logos/opengraph.png';
+let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
+if (!ogImageUrl) ogImageUrl = 'https://app.element.io/themes/element/img/logos/opengraph.png';
 
 const additionalPlugins = [
     // This is where you can put your customisation replacements.
@@ -124,11 +124,11 @@ module.exports = (env, argv) => {
                 // overflows (https://github.com/webpack/webpack/issues/1721), and
                 // there is no need for webpack to parse them - they can just be
                 // included as-is.
-                /highlight\.js[\\\/]lib[\\\/]languages/,
+                /highlight\.js[\\/]lib[\\/]languages/,
 
                 // olm takes ages for webpack to process, and it's already heavily
                 // optimised, so there is little to gain by us uglifying it.
-                /olm[\\\/](javascript[\\\/])?olm\.js$/,
+                /olm[\\/](javascript[\\/])?olm\.js$/,
             ],
             rules: [
                 {
@@ -152,8 +152,8 @@ module.exports = (env, argv) => {
                     },
                     loader: 'babel-loader',
                     options: {
-                        cacheDirectory: true
-                    }
+                        cacheDirectory: true,
+                    },
                 },
                 {
                     test: /\.css$/,
@@ -164,14 +164,14 @@ module.exports = (env, argv) => {
                             options: {
                                 importLoaders: 1,
                                 sourceMap: true,
-                            }
+                            },
                         },
                         {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                sourceMap: true,
-                                plugins: () => [
+                                "sourceMap": true,
+                                "plugins": () => [
                                     // Note that we use significantly fewer plugins on the plain
                                     // CSS parser. If we start to parse plain CSS, we end with all
                                     // kinds of nasty problems (like stylesheets not loading).
@@ -198,11 +198,11 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                parser: "postcss-scss",
+                                "parser": "postcss-scss",
                                 "local-plugins": true,
                             },
                         },
-                    ]
+                    ],
                 },
                 {
                     test: /\.scss$/,
@@ -213,14 +213,14 @@ module.exports = (env, argv) => {
                             options: {
                                 importLoaders: 1,
                                 sourceMap: true,
-                            }
+                            },
                         },
                         {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                sourceMap: true,
-                                plugins: () => [
+                                "sourceMap": true,
+                                "plugins": () => [
                                     // Note that we use slightly different plugins for SCSS.
 
                                     require('postcss-import')(),
@@ -237,11 +237,11 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                parser: "postcss-scss",
+                                "parser": "postcss-scss",
                                 "local-plugins": true,
                             },
                         },
-                    ]
+                    ],
                 },
                 {
                     test: /\.wasm$/,
@@ -311,7 +311,7 @@ module.exports = (env, argv) => {
                         },
                     ],
                 },
-            ]
+            ],
         },
 
         plugins: [
@@ -332,7 +332,7 @@ module.exports = (env, argv) => {
                 excludeChunks: ['mobileguide', 'usercontent', 'jitsi'],
                 minify: argv.mode === 'production',
                 vars: {
-                    og_image_url: og_image_url,
+                    og_image_url: ogImageUrl,
                 },
             }),
 
@@ -438,6 +438,7 @@ function getAssetOutputPath(url, resourcePath) {
  * be placed directly into things like CSS files.
  *
  * @param {string} path Some path to a file.
+ * @returns {string} converted path
  */
 function toPublicPath(path) {
     return path.replace(/\\/g, '/');

From 0532c9c37bf5e881671275f194df0b8faadf1ec1 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 15 Apr 2021 15:17:24 +0100
Subject: [PATCH 29/86] Use React production for CI builds

When running Nightly build we want to benefit from the fast runtime that React production offers and get rid of the runtime overhead that comes with development.

We are setting NODE_ENV and not "webpack.mode" to not loose sourcemaps and have minified sources in that environment
---
 webpack.config.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/webpack.config.js b/webpack.config.js
index cf1db3f98..a3d067d5a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -18,6 +18,20 @@ module.exports = (env, argv) => {
         // We override this via environment variable to avoid duplicating the scripts
         // in `package.json` just for a different mode.
         argv.mode = "development";
+
+        // More and more people are using nightly build as their main client
+        // Libraries like React have a development build that is useful
+        // when working on the app but adds significant runtime overhead
+        // We want to use the React production build but not compile the whole
+        // application to productions standards
+        additionalPlugins.concat([
+            new webpack.EnvironmentPlugin({
+                "NODE_ENV": "production",
+            }),
+            new webpack.DefinePlugin({
+                "process.env.NODE_ENV": "production",
+            }),
+        ]);
     }
 
     const development = {};

From 84d6dcf49846778bd90f839252a3e182029da60f Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Fri, 16 Apr 2021 09:18:32 +0100
Subject: [PATCH 30/86] Revert overzealous ESLint updates

---
 webpack.config.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index a3d067d5a..7bb3e696a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -138,11 +138,11 @@ module.exports = (env, argv) => {
                 // overflows (https://github.com/webpack/webpack/issues/1721), and
                 // there is no need for webpack to parse them - they can just be
                 // included as-is.
-                /highlight\.js[\\/]lib[\\/]languages/,
+                /highlight\.js[\\\/]lib[\\\/]languages/,
 
                 // olm takes ages for webpack to process, and it's already heavily
                 // optimised, so there is little to gain by us uglifying it.
-                /olm[\\/](javascript[\\/])?olm\.js$/,
+                /olm[\\\/](javascript[\\\/])?olm\.js$/,
             ],
             rules: [
                 {
@@ -184,8 +184,8 @@ module.exports = (env, argv) => {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                "sourceMap": true,
-                                "plugins": () => [
+                                sourceMap: true,
+                                plugins: () => [
                                     // Note that we use significantly fewer plugins on the plain
                                     // CSS parser. If we start to parse plain CSS, we end with all
                                     // kinds of nasty problems (like stylesheets not loading).
@@ -212,7 +212,7 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                "parser": "postcss-scss",
+                                parser: "postcss-scss",
                                 "local-plugins": true,
                             },
                         },
@@ -233,8 +233,8 @@ module.exports = (env, argv) => {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                "sourceMap": true,
-                                "plugins": () => [
+                                sourceMap: true,
+                                plugins: () => [
                                     // Note that we use slightly different plugins for SCSS.
 
                                     require('postcss-import')(),
@@ -251,7 +251,7 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                "parser": "postcss-scss",
+                                parser: "postcss-scss",
                                 "local-plugins": true,
                             },
                         },

From 001b15b856d41ecdc3b9b66e9d05b751e6844d77 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 16 Apr 2021 16:02:46 +0100
Subject: [PATCH 31/86] Rewrap review guide

---
 docs/review.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/review.md b/docs/review.md
index c08ab1081..8e6dd7584 100644
--- a/docs/review.md
+++ b/docs/review.md
@@ -79,5 +79,5 @@ 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
-[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before you
-start so we can ensure it's something we'd be willing to merge.
+[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before
+you start so we can ensure it's something we'd be willing to merge.

From c2e87dde85e0929bc5e01180e26074a5b70b3a9e Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 16 Apr 2021 18:53:18 +0100
Subject: [PATCH 32/86] Add code quality review policy

This adds a new review policy which encourages tests for new features. As with
everything, we'll continue to tune this based on feedback.
---
 docs/review.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/docs/review.md b/docs/review.md
index 8e6dd7584..36ca1ffcc 100644
--- a/docs/review.md
+++ b/docs/review.md
@@ -58,6 +58,35 @@ When reviewing code, here are some things we look for and also things we avoid:
 * Assign issues only when in progress to indicate to others what can be picked
   up
 
+## Code Quality
+
+In the past, we have occasionally written different kinds of tests for
+Element and the SDKs, but it hasn't been a consistent focus. Going forward, we'd
+like to change that.
+
+* For new features, code reviewers will expect some form of automated testing to
+  be included by default
+* For bug fixes, regression tests are of course great to have, but we don't want
+  to block fixes on this, so we won't require them at this time
+
+The above policy is not a strict rule, but instead it's meant to be a
+conversation between the author and reviewer. As an author, try to think about
+writing a test when making your next change. As a reviewer, try to think about
+how you might test the area of code you are reviewing. If the reviewer agrees
+it would be quite difficult to test some new feature, then it's okay for them to
+accept the change without tests for now, but we'd eventually like to be more
+strict about this further down the road.
+
+If you do spot areas that are quite hard to test today, please let us know in
+#element-dev:matrix.org. We can work on improving the app architecture and
+testing helpers so that future tests are easier for everyone to write, but we
+won't know which parts are difficult unless people shout when stumbling through
+them.
+
+We recognise that this testing policy will slow things down a bit, but overall
+it should encourage better long-term health of the app and give everyone more
+confidence when making changes as coverage increases over time.
+
 ## Design and Product Review
 
 We want to ensure that all changes to Element fit with our design and product

From ed4c6a77d1182c277d1e56220c794565e08ed1b1 Mon Sep 17 00:00:00 2001
From: Thai Localization <thailocalization@protonmail.com>
Date: Wed, 14 Apr 2021 07:03:06 +0000
Subject: [PATCH 33/86] Translated using Weblate (Thai)

Currently translated at 48.4% (16 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/th/
---
 src/i18n/strings/th.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index b5770a49b..e0c1f9c56 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -1,6 +1,6 @@
 {
     "powered by Matrix": "ใช้เทคโนโลยี Matrix",
-    "Dismiss": "ยกเลิก",
+    "Dismiss": "ปิด",
     "Unknown device": "อุปกรณ์ที่ไม่รู้จัก",
     "You need to be using HTTPS to place a screen-sharing call.": "คุณต้องใช้ HTTPS เพื่อเริ่มติดต่อแบบแบ่งปันหน้าจอ",
     "Welcome to Element": "ยินดีต้อนรับสู่ Element",
@@ -14,5 +14,6 @@
     "Open user settings": "เปิดการตั้งค่าผู้ใช้",
     "Go to element.io": "ไปยัง element.io",
     "Failed to start": "ไม่สามารถเริ่ม",
-    "Open": "เปิด"
+    "Open": "เปิด",
+    "Powered by Matrix": "ขับเคลื่อนโดย Matrix"
 }

From 2ffb9e8438e7f534d2000ae0f2b1bf5dfab891e2 Mon Sep 17 00:00:00 2001
From: Sagititi <sagititi.3400@gmail.com>
Date: Fri, 16 Apr 2021 16:32:33 +0000
Subject: [PATCH 34/86] Translated using Weblate (Occitan)

Currently translated at 63.6% (21 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/oc/
---
 src/i18n/strings/oc.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/oc.json b/src/i18n/strings/oc.json
index 002f260cb..ffe8b038f 100644
--- a/src/i18n/strings/oc.json
+++ b/src/i18n/strings/oc.json
@@ -10,5 +10,27 @@
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Messatjariá chifrada, descentralizada e collaborativa propulsada per [matrix]",
     "Sign In": "Se connectar",
     "Create Account": "Crear un compte",
-    "Explore rooms": "Percórrer las salas"
+    "Explore rooms": "Percórrer las salas",
+    "Missing indexeddb worker script!": "Lo worker script IndexedDB manca !",
+    "Invalid configuration: no default server specified.": "Configuracion invalida : pas de servidor per defauta especificat.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuracion invalida : podètz unicament especificar un camp entre default_server_config, default_server_name, o default_hs_url.",
+    "Failed to start": "Non se pòt pas lançar",
+    "Go to element.io": "Anar a element.io",
+    "I understand the risks and wish to continue": "Compréni los risques e vòli contunhar",
+    "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.": "Podètz contunhar a utilizar lo vòstre navigator actual, mas qualques o totes las foncionalitats o/e l'apparéncia poirián mal foncionar .",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Si vos plai installatz <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per una melhora experiéncia.",
+    "Your browser can't run %(brand)s": "Lo vòstre navigator non pòt pas executar %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza de foncions avançadas que lo vòstre navigator non suporta pas.",
+    "Unsupported browser": "Navigator incompatible",
+    "Powered by Matrix": "Fonciona ambé Matrix",
+    "You need to be using HTTPS to place a screen-sharing call.": "Devetz utilizar HTTPS per apelar ambé partatge d'ecran.",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s de burèu (%(platformName)s)",
+    "Previous/next recently visited room or community": "Sala o comunautat recentament visitada precedenta/seguenta",
+    "Open user settings": "Dobrir los paramètres utilizaire",
+    "Open": "Dobrir",
+    "Download Completed": "Descargament acabat",
+    "Unable to load config file: please refresh the page to try again.": "Se pòt pas cargar lo fichièr de configuracion : si vos plai actualizatz la pagina per tornar ensajar.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuracion d'Element conténe de JSON invalid. Si vos plai corregitz lo problème e actualizatz la pagina.",
+    "Your Element is misconfigured": "Lo vòstre Element es mal configurat"
 }

From 5e86344293b717206435c93a8c9cb267636b1992 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Wed, 14 Apr 2021 20:37:15 +0000
Subject: [PATCH 35/86] Translated using Weblate (German)

Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/
---
 src/i18n/strings/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a5b006697..6342a0c20 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -24,7 +24,7 @@
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
-    "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 kannst deinen aktuellen Browser weiterhin verwenden, es kann aber sein, dass einige oder alle Funktionen nicht verfügbar sind oder dass Aussehen und Bedienung der Anwendung nicht korrekt ist.",
+    "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 kannst deinen aktuellen Browser weiterhin verwenden. Es ist aber möglich, dass nicht alles richtig funktioniert oder das Aussehen der App inkorrekt ist.",
     "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
     "Your Element is misconfigured": "Dein Element ist falsch konfiguriert",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Element-Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",

From cddbe8648190f7b4bfb314f84a2a50d73bd72001 Mon Sep 17 00:00:00 2001
From: Sven Grewe <svengrewe@posteo.de>
Date: Wed, 14 Apr 2021 20:35:57 +0000
Subject: [PATCH 36/86] Translated using Weblate (German)

Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/
---
 src/i18n/strings/de_DE.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6342a0c20..8183384ac 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -16,7 +16,7 @@
     "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen",
     "Open user settings": "Benutzereinstellungen öffnen",
     "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!",
+    "Missing indexeddb worker script!": "Fehlendes indexeddb-Arbeitsskript!",
     "Previous/next recently visited room or community": "Vorheriger/nächster kürzlich besuchter Raum oder Community",
     "Unsupported browser": "Nicht unterstützter Browser",
     "Go to element.io": "Gehe zu element.io",
@@ -27,8 +27,8 @@
     "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 kannst deinen aktuellen Browser weiterhin verwenden. Es ist aber möglich, dass nicht alles richtig funktioniert oder das Aussehen der App inkorrekt ist.",
     "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
     "Your Element is misconfigured": "Dein Element ist falsch konfiguriert",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Element-Konfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
-    "Download Completed": "Download fertiggestellt",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Elementkonfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
+    "Download Completed": "Herunterladen fertiggestellt",
     "Open": "Öffnen",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem Browser nicht unterstützt werden.",
     "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",

From 14c23f13873d25c16c610f20fa45f4826d550d17 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Apr 2021 15:45:16 +0100
Subject: [PATCH 37/86] Remove old `-d` argument when packaging on CI

This `-d` argument was removed from `package.sh` ages ago
(ec66069e96ac8534999782aac65f12a6a4ecfcf0), but we seem to have missed removing
it here.
---
 scripts/ci_package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci_package.sh b/scripts/ci_package.sh
index 2b82db737..41d82016e 100755
--- a/scripts/ci_package.sh
+++ b/scripts/ci_package.sh
@@ -14,4 +14,4 @@ JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
 
 VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
 
-CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh -d
+CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh

From 53f9895901fb6b2777e8bafa9332174fadcbe7be Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Apr 2021 15:49:05 +0100
Subject: [PATCH 38/86] Set `NODE_ENV` in a different way

With the approach in https://github.com/vector-im/element-web/pull/16969,
Webpack seems to sometimes do what we want, sometimes not... I haven't quite
worked out why. Perhaps there's some conflict or race in Webpack's defaults...?

This new approach seems to work as expected when running
`./scripts/ci_package.sh`, which matches what development deployments are doing.
---
 webpack.config.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 7bb3e696a..57b1e4d28 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,6 +13,7 @@ const additionalPlugins = [
 ];
 
 module.exports = (env, argv) => {
+    let nodeEnv = argv.mode;
     if (process.env.CI_PACKAGE) {
         // Don't run minification for CI builds (this is only set for runs on develop)
         // We override this via environment variable to avoid duplicating the scripts
@@ -24,14 +25,7 @@ module.exports = (env, argv) => {
         // when working on the app but adds significant runtime overhead
         // We want to use the React production build but not compile the whole
         // application to productions standards
-        additionalPlugins.concat([
-            new webpack.EnvironmentPlugin({
-                "NODE_ENV": "production",
-            }),
-            new webpack.DefinePlugin({
-                "process.env.NODE_ENV": "production",
-            }),
-        ]);
+        nodeEnv = "production";
     }
 
     const development = {};
@@ -94,6 +88,10 @@ module.exports = (env, argv) => {
             // we use a CSS optimizer too and need to manage it ourselves.
             minimize: argv.mode === 'production',
             minimizer: argv.mode === 'production' ? [new TerserPlugin({}), new OptimizeCSSAssetsPlugin({})] : [],
+
+            // Set the value of `process.env.NODE_ENV` for libraries like React
+            // See also https://v4.webpack.js.org/configuration/optimization/#optimizationnodeenv
+            nodeEnv,
         },
 
         resolve: {

From b0c43890af364db2b0a0c2ef6ff85900d984f023 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Apr 2021 17:02:11 +0100
Subject: [PATCH 39/86] Change `#element-dev` reference to a link

---
 docs/review.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/review.md b/docs/review.md
index 36ca1ffcc..2aab77ddb 100644
--- a/docs/review.md
+++ b/docs/review.md
@@ -78,10 +78,10 @@ accept the change without tests for now, but we'd eventually like to be more
 strict about this further down the road.
 
 If you do spot areas that are quite hard to test today, please let us know in
-#element-dev:matrix.org. We can work on improving the app architecture and
-testing helpers so that future tests are easier for everyone to write, but we
-won't know which parts are difficult unless people shout when stumbling through
-them.
+[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org). We can
+work on improving the app architecture and testing helpers so that future tests
+are easier for everyone to write, but we won't know which parts are difficult
+unless people shout when stumbling through them.
 
 We recognise that this testing policy will slow things down a bit, but overall
 it should encourage better long-term health of the app and give everyone more

From c98ca42bbdaa61633642511a80fbc90bdfe4ebed Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Apr 2021 20:31:55 +0100
Subject: [PATCH 40/86] Document option for obeying asserted identity

---
 docs/config.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/config.md b/docs/config.md
index 27b4797f0..514e46a06 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -132,6 +132,9 @@ For a good example, see https://develop.element.io/config.json.
 1. `audioStreamUrl`: If supplied, show an option on Jitsi widgets to stream
    audio using Jitsi's live streaming feature. This option is experimental and
    may be removed at any time without notice.
+1. `voipObeyAssertedIdentity`: If set, MSC3086 asserted identity messages sent
+   on VoIP calls will cause the call to appear in the room corresponding to the
+   asserted identity. This *must* only be set in trusted environments.
 
 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

From 0fa062ccf6724b3e792693894ee7fc61c82e0398 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 21:57:14 +0000
Subject: [PATCH 41/86] Bump ssri from 6.0.1 to 6.0.2

Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3b07227e9..3d48c75e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11056,9 +11056,9 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
+  integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
   dependencies:
     figgy-pudding "^3.5.1"
 
@@ -12100,11 +12100,6 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-velocity-animate@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-2.0.6.tgz#1811ca14df7fbbef05740256f6cec0fd1b76575f"
-  integrity sha512-tU+/UtSo3GkIjEfk2KM4e24DvpgX0+FzfLr7XqNwm9BCvZUtbCHPq/AFutx/Mkp2bXlUS9EcX8yxu8XmzAv2Kw==
-
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"

From 9c3627dca915113aa2ffe64779ad11e8851bd735 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 19 Apr 2021 21:51:25 -0600
Subject: [PATCH 42/86] Register RecorderWorklet from react-sdk

---
 src/vector/index.html | 6 +++++-
 webpack.config.js     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vector/index.html b/src/vector/index.html
index 4cda4b37a..b273de79a 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -50,7 +50,11 @@
         <% }
     } %>
   </head>
-  <body style="height: 100%; margin: 0;" data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.chunks['indexeddb-worker'].entry %>">
+  <body
+      style="height: 100%; margin: 0;"
+      data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.chunks['indexeddb-worker'].entry %>"
+      data-vector-recorder-worklet-script="<%= htmlWebpackPlugin.files.chunks['recorder-worklet'].entry %>"
+  >
     <noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
     <section id="matrixchat" style="height: 100%; overflow: auto;" class="notranslate"></section>
     <script src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
diff --git a/webpack.config.js b/webpack.config.js
index 57b1e4d28..ce12bcb75 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -52,6 +52,7 @@ module.exports = (env, argv) => {
             "mobileguide": "./src/vector/mobile_guide/index.js",
             "jitsi": "./src/vector/jitsi/index.ts",
             "usercontent": "./node_modules/matrix-react-sdk/src/usercontent/index.js",
+            "recorder-worklet": "./node_modules/matrix-react-sdk/src/voice/RecorderWorklet.ts",
 
             // CSS themes
             "theme-legacy": "./node_modules/matrix-react-sdk/res/themes/legacy-light/css/legacy-light.scss",

From 9960277ad00a641c995fb765b63560d3741c64fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= <riot@joeruut.com>
Date: Wed, 21 Apr 2021 15:21:21 +0000
Subject: [PATCH 43/86] Translated using Weblate (Estonian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/et/
---
 src/i18n/strings/et.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index 12ed46820..acaaf562b 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -32,5 +32,6 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sinu Element'i seadistustes on vigased JSON-vormingus andmed. Palun paranda see viga ja laadi leht uuesti.",
     "Your browser can't run %(brand)s": "%(brand)s ei toimi sinu brauseris",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
-    "Powered by Matrix": "Põhineb Matrix'il"
+    "Powered by Matrix": "Põhineb Matrix'il",
+    "Use %(brand)s on mobile": "Kasuta %(brand)s rakendust nutiseadmes"
 }

From ea8989816fec5b7fc2e308b5b883c34902d153e8 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 21 Apr 2021 16:55:51 +0100
Subject: [PATCH 44/86] Upgrade matrix-js-sdk to 10.0.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4f6a78b78..614b92726 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "10.0.0-rc.1",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/yarn.lock b/yarn.lock
index 3d48c75e3..15df6eb06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7506,6 +7506,21 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+matrix-js-sdk@10.0.0-rc.1:
+  version "10.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0-rc.1.tgz#e99ff19fa02ad6526cd62a20767104591b4e0720"
+  integrity sha512-3dwM9BFFAW1RC55+XHUpSfV4lQmyrx8peLW+3p+uIbZNgtPV/+h2X0ja281SVipdePJ50gYF9Iif+UkLkXXuug==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "9.11.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad"
@@ -7580,6 +7595,7 @@ matrix-mock-request@^1.2.3:
     tar-js "^0.3.0"
     text-encoding-utf-8 "^1.0.2"
     url "^0.11.0"
+    velocity-animate "^2.0.6"
     what-input "^5.2.10"
     zxcvbn "^4.4.2"
 

From 42067f9fd5e4410dbf9a044179b834d94e3e6e37 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 21 Apr 2021 16:56:32 +0100
Subject: [PATCH 45/86] Upgrade matrix-react-sdk to 3.19.0-rc.1

---
 package.json |  2 +-
 yarn.lock    | 24 +++++-------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 614b92726..eb866f8ac 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "10.0.0-rc.1",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-react-sdk": "3.19.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 15df6eb06..6a4ec406e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,20 +7521,6 @@ matrix-js-sdk@10.0.0-rc.1:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
-  version "9.11.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1dddcd49251f750cd2ff44e084c666290ffb17ad"
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7543,9 +7529,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.18.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f74300733455e4d0c4eb9359dcce880092286b74"
+matrix-react-sdk@3.19.0-rc.1:
+  version "3.19.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0-rc.1.tgz#2b31aa8788f286989777445b8c4fd47fc1eeeef9"
+  integrity sha512-3lggmukp/o/gbHt6UIWG5t/rEt26TuksL3TyewH0ykr9vZ8j+es+573ixRujyaKIaALE0XcFm/XyHFyWZDzeZg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7573,7 +7560,7 @@ matrix-mock-request@^1.2.3:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
+    matrix-js-sdk "10.0.0-rc.1"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"
@@ -7595,7 +7582,6 @@ matrix-mock-request@^1.2.3:
     tar-js "^0.3.0"
     text-encoding-utf-8 "^1.0.2"
     url "^0.11.0"
-    velocity-animate "^2.0.6"
     what-input "^5.2.10"
     zxcvbn "^4.4.2"
 

From 29528eaed4703119c665b5842283ba7fd98bd926 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 21 Apr 2021 17:19:47 +0100
Subject: [PATCH 46/86] Prepare changelog for v1.7.26-rc.1

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9a381ce4..ac0ef7113 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+Changes in [1.7.26-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.26-rc.1) (2021-04-21)
+=========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25...v1.7.26-rc.1)
+
+ * Upgrade to React SDK 3.19.0-rc.1 and JS SDK 10.0.0-rc.1
+ * Translations update from Weblate
+   [\#17031](https://github.com/vector-im/element-web/pull/17031)
+ * Bump ssri from 6.0.1 to 6.0.2
+   [\#17010](https://github.com/vector-im/element-web/pull/17010)
+ * Fix `NODE_ENV` value for CI environments
+   [\#17003](https://github.com/vector-im/element-web/pull/17003)
+ * Use React production mode in CI builds
+   [\#16969](https://github.com/vector-im/element-web/pull/16969)
+ * Labs documentation for DND mode
+   [\#16962](https://github.com/vector-im/element-web/pull/16962)
+ * Rename blackboxing to new option ignore list
+   [\#16965](https://github.com/vector-im/element-web/pull/16965)
+ * Remove velocity-animate from lockfile
+   [\#16963](https://github.com/vector-im/element-web/pull/16963)
+ * Add mobile download link configuration
+   [\#16890](https://github.com/vector-im/element-web/pull/16890)
+ * Switch develop to not-staging Scalar by default
+   [\#16883](https://github.com/vector-im/element-web/pull/16883)
+ * Support a config option to skip login/welcome and go to SSO
+   [\#16880](https://github.com/vector-im/element-web/pull/16880)
+
 Changes in [1.7.25](https://github.com/vector-im/element-web/releases/tag/v1.7.25) (2021-04-12)
 ===============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25-rc.1...v1.7.25)

From 1a7cfc67d9aa667891ed624b61066594af8f05d4 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Wed, 21 Apr 2021 17:19:47 +0100
Subject: [PATCH 47/86] v1.7.26-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb866f8ac..3b40d9525 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.7.25",
+  "version": "1.7.26-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 708f6a26b1128f7371daff017bc777c2712889bb Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 22 Apr 2021 10:22:52 +0100
Subject: [PATCH 48/86] Upgrade html-webpack-plugin to v4.5.2

---
 package.json          |   2 +-
 src/vector/index.html |   9 +-
 webpack.config.js     |  14 +--
 yarn.lock             | 226 ++++++++++++++++++++++++------------------
 4 files changed, 141 insertions(+), 110 deletions(-)

diff --git a/package.json b/package.json
index 4f6a78b78..4faf9c5db 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "fake-indexeddb": "^3.1.2",
     "file-loader": "^5.1.0",
     "fs-extra": "^0.30.0",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^4.5.2",
     "jest": "^26.6.3",
     "jest-environment-jsdom-sixteen": "^1.0.3",
     "json-loader": "^0.5.7",
diff --git a/src/vector/index.html b/src/vector/index.html
index 4cda4b37a..208d517a6 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -22,7 +22,7 @@
     <meta name="msapplication-TileImage" content="<%= require('../../res/vector-icons/mstile-150.png') %>">
     <meta name="msapplication-config" content="<%= require('../../res/vector-icons/browserconfig.xml') %>">
     <meta name="theme-color" content="#ffffff">
-    <meta property="og:image" content="<%= htmlWebpackPlugin.options.vars.og_image_url %>" />
+    <meta property="og:image" content="<%= og_image_url %>" />
     <meta http-equiv="Content-Security-Policy" content="
         default-src 'none';
         style-src 'self' 'unsafe-inline';
@@ -50,10 +50,13 @@
         <% }
     } %>
   </head>
-  <body style="height: 100%; margin: 0;" data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.chunks['indexeddb-worker'].entry %>">
+
+
+
+  <body style="height: 100%; margin: 0;" data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.js.find(entry => entry.includes("indexeddb-worker.js")) %>">
     <noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
     <section id="matrixchat" style="height: 100%; overflow: auto;" class="notranslate"></section>
-    <script src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
+    <script src="<%= htmlWebpackPlugin.files.js.find(entry => entry.includes("bundle.js")) %>"></script>
 
     <!-- Legacy supporting Prefetch images -->
     <img src="<%= require('matrix-react-sdk/res/img/warning.svg') %>" width="24" height="23" style="visibility: hidden; position: absolute; top: 0px; left: 0px;"/>
diff --git a/webpack.config.js b/webpack.config.js
index 57b1e4d28..ff918f0f5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -182,8 +182,8 @@ module.exports = (env, argv) => {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                sourceMap: true,
-                                plugins: () => [
+                                "sourceMap": true,
+                                "plugins": () => [
                                     // Note that we use significantly fewer plugins on the plain
                                     // CSS parser. If we start to parse plain CSS, we end with all
                                     // kinds of nasty problems (like stylesheets not loading).
@@ -210,7 +210,7 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                parser: "postcss-scss",
+                                "parser": "postcss-scss",
                                 "local-plugins": true,
                             },
                         },
@@ -231,8 +231,8 @@ module.exports = (env, argv) => {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                sourceMap: true,
-                                plugins: () => [
+                                "sourceMap": true,
+                                "plugins": () => [
                                     // Note that we use slightly different plugins for SCSS.
 
                                     require('postcss-import')(),
@@ -249,7 +249,7 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                parser: "postcss-scss",
+                                "parser": "postcss-scss",
                                 "local-plugins": true,
                             },
                         },
@@ -343,7 +343,7 @@ module.exports = (env, argv) => {
                 inject: false,
                 excludeChunks: ['mobileguide', 'usercontent', 'jitsi'],
                 minify: argv.mode === 'production',
-                vars: {
+                templateParameters: {
                     og_image_url: ogImageUrl,
                 },
             }),
diff --git a/yarn.lock b/yarn.lock
index 3d48c75e3..c9ce47e58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1292,6 +1292,11 @@
     remark "^13.0.0"
     unist-util-find-all-after "^3.0.2"
 
+"@types/anymatch@*":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
+  integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
+
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
   version "7.1.12"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"
@@ -1358,6 +1363,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/html-minifier-terser@^5.0.0":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"
+  integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
@@ -1469,6 +1479,11 @@
   dependencies:
     htmlparser2 "^4.1.0"
 
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -1479,11 +1494,44 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
+"@types/tapable@^1", "@types/tapable@^1.0.5":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz#545158342f949e8fd3bfd813224971ecddc3fac4"
+  integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ==
+
+"@types/uglify-js@*":
+  version "3.13.0"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz#1cad8df1fb0b143c5aba08de5712ea9d1ff71124"
+  integrity sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q==
+  dependencies:
+    source-map "^0.6.1"
+
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
+"@types/webpack-sources@*":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"
+  integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==
+  dependencies:
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.7.3"
+
+"@types/webpack@^4.41.8":
+  version "4.41.27"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz#f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc"
+  integrity sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA==
+  dependencies:
+    "@types/anymatch" "*"
+    "@types/node" "*"
+    "@types/tapable" "^1"
+    "@types/uglify-js" "*"
+    "@types/webpack-sources" "*"
+    source-map "^0.6.0"
+
 "@types/yargs-parser@*":
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"
@@ -2270,11 +2318,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -2658,13 +2701,13 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
+camel-case@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
+  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
   dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
+    pascal-case "^3.1.2"
+    tslib "^2.0.3"
 
 camelcase-css@^2.0.1:
   version "2.0.1"
@@ -2906,7 +2949,7 @@ classnames@^2.2.6:
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
   integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
-clean-css@4.2.x:
+clean-css@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
   integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
@@ -3039,20 +3082,15 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.17.x:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
 commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+commander@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -3955,6 +3993,14 @@ domutils@^2.0.0, domutils@^2.4.3, domutils@^2.4.4:
     domelementtype "^2.0.1"
     domhandler "^4.0.0"
 
+dot-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -4033,11 +4079,6 @@ emojibase-regex@^4.1.1:
   resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.1.1.tgz#6e781aca520281600fe7a177f1582c33cf1fc545"
   integrity sha512-KSigB1zQkNKFygLZ5bAfHs87LJa1ni8QTQtq8lc53Y74NF3Dk2r7kfa8MpooTO8JBb5Xz660X4tSjDB+I+7elA==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -5576,7 +5617,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.2.x:
+he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -5668,35 +5709,37 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-minifier@^3.2.3:
-  version "3.5.21"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
-  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
+html-minifier-terser@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
+  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
   dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
+    camel-case "^4.1.1"
+    clean-css "^4.2.3"
+    commander "^4.1.1"
+    he "^1.2.0"
+    param-case "^3.0.3"
+    relateurl "^0.2.7"
+    terser "^4.6.3"
 
 html-tags@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
   integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
 
-html-webpack-plugin@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
-  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
+html-webpack-plugin@^4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12"
+  integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==
   dependencies:
-    html-minifier "^3.2.3"
-    loader-utils "^0.2.16"
-    lodash "^4.17.3"
-    pretty-error "^2.0.2"
-    tapable "^1.0.0"
-    toposort "^1.0.0"
+    "@types/html-minifier-terser" "^5.0.0"
+    "@types/tapable" "^1.0.5"
+    "@types/webpack" "^4.41.8"
+    html-minifier-terser "^5.0.1"
+    loader-utils "^1.2.3"
+    lodash "^4.17.20"
+    pretty-error "^2.1.1"
+    tapable "^1.1.3"
     util.promisify "1.0.0"
 
 htmlparser2@^3.10.0, htmlparser2@^3.10.1:
@@ -7136,11 +7179,6 @@ json3@^3.3.3:
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -7304,16 +7342,6 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@^0.2.16:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
 loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
@@ -7386,7 +7414,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.1:
+lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5, lodash@^4.2.1:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -7422,10 +7450,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+lower-case@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+  dependencies:
+    tslib "^2.0.3"
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -7580,6 +7610,7 @@ matrix-mock-request@^1.2.3:
     tar-js "^0.3.0"
     text-encoding-utf-8 "^1.0.2"
     url "^0.11.0"
+    velocity-animate "^2.0.6"
     what-input "^5.2.10"
     zxcvbn "^4.4.2"
 
@@ -8050,12 +8081,13 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+no-case@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
   dependencies:
-    lower-case "^1.1.1"
+    lower-case "^2.0.2"
+    tslib "^2.0.3"
 
 node-fetch@^1.0.1:
   version "1.7.3"
@@ -8596,12 +8628,13 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
+param-case@^3.0.3:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
+  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
   dependencies:
-    no-case "^2.2.0"
+    dot-case "^3.0.4"
+    tslib "^2.0.3"
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -8695,6 +8728,14 @@ parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+pascal-case@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
+  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
+  dependencies:
+    no-case "^3.0.4"
+    tslib "^2.0.3"
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -9666,7 +9707,7 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-pretty-error@^2.0.2:
+pretty-error@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
   integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
@@ -10237,7 +10278,7 @@ regjsparser@^0.6.4:
   dependencies:
     jsesc "~0.5.0"
 
-relateurl@0.2.x:
+relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
@@ -11543,7 +11584,7 @@ terser-webpack-plugin@^2.3.8:
     terser "^4.6.12"
     webpack-sources "^1.4.3"
 
-terser@^4.1.2, terser@^4.6.12:
+terser@^4.1.2, terser@^4.6.12, terser@^4.6.3:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
   integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -11670,11 +11711,6 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-toposort@^1.0.0:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
-  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
-
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -11729,6 +11765,11 @@ tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslib@^2.0.3:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+
 tsutils@^3.17.1:
   version "3.20.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.20.0.tgz#ea03ea45462e146b53d70ce0893de453ff24f698"
@@ -11841,14 +11882,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
-  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
-  dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
-
 unhomoglyph@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.6.tgz#ea41f926d0fcf598e3b8bb2980c2ddac66b081d3"
@@ -11965,11 +11998,6 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"

From 417835fcca3a133fad71d3869f72cc1d7ebeae8e Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 22 Apr 2021 12:09:50 +0100
Subject: [PATCH 49/86] Preload Inter font to avoid FOIT on slow connections

---
 package.json          |  1 +
 src/vector/index.html |  9 +++++++++
 webpack.config.js     |  8 ++++++++
 yarn.lock             | 10 ++++++++++
 4 files changed, 28 insertions(+)

diff --git a/package.json b/package.json
index 4faf9c5db..8e4ea1fd4 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.10",
     "@babel/runtime": "^7.12.5",
+    "@principalstudio/html-webpack-inject-preload": "^1.2.7",
     "@types/flux": "^3.1.9",
     "@types/modernizr": "^3.5.3",
     "@types/node": "^14.14.22",
diff --git a/src/vector/index.html b/src/vector/index.html
index 208d517a6..64650305c 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -49,6 +49,15 @@
            <link rel="stylesheet" href="<%= file %>">
         <% }
     } %>
+
+    <% for (var i=0; i < htmlWebpackPlugin.tags.headTags.length; i++) {
+        var tag = htmlWebpackPlugin.tags.headTags[i];
+        var path = tag.attributes && tag.attributes.href;
+        if (path.indexOf("Inter") !== -1) { %>
+            <link rel="preload" as="font" href="<%= path %>" crossorigin="anonymous"/>
+        <% }
+    } %>
+
   </head>
 
 
diff --git a/webpack.config.js b/webpack.config.js
index ff918f0f5..f2b4549c9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -4,6 +4,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const webpack = require("webpack");
+const HtmlWebpackInjectPreload = require('@principalstudio/html-webpack-inject-preload');
 
 let ogImageUrl = process.env.RIOT_OG_IMAGE_URL;
 if (!ogImageUrl) ogImageUrl = 'https://app.element.io/themes/element/img/logos/opengraph.png';
@@ -386,6 +387,10 @@ module.exports = (env, argv) => {
                 chunks: ['usercontent'],
             }),
 
+            new HtmlWebpackInjectPreload({
+                files: [{ match: /.*\.(woff2?|ttf|eot)$/ }],
+            }),
+
             ...additionalPlugins,
         ],
 
@@ -418,6 +423,9 @@ module.exports = (env, argv) => {
             hot: false,
             inline: false,
         },
+        stats: {
+            warnings: false,
+        },
     };
 };
 
diff --git a/yarn.lock b/yarn.lock
index c9ce47e58..cd7364d18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1263,6 +1263,11 @@
     "@nodelib/fs.scandir" "2.1.4"
     fastq "^1.6.0"
 
+"@principalstudio/html-webpack-inject-preload@^1.2.7":
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/@principalstudio/html-webpack-inject-preload/-/html-webpack-inject-preload-1.2.7.tgz#0c1f0b32a34d814b36ce84111f89990441cc64e8"
+  integrity sha512-KJKkiKG63ugBjf8U0e9jUcI9CLPTFIsxXplEDE0oi3mPpxd90X9SJovo3W2l7yh/ARKIYXhQq8fSXUN7M29TzQ==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b"
@@ -12128,6 +12133,11 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
+velocity-animate@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-2.0.6.tgz#1811ca14df7fbbef05740256f6cec0fd1b76575f"
+  integrity sha512-tU+/UtSo3GkIjEfk2KM4e24DvpgX0+FzfLr7XqNwm9BCvZUtbCHPq/AFutx/Mkp2bXlUS9EcX8yxu8XmzAv2Kw==
+
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"

From 87806b8a672d503a83a42230ebf7dc2a9fa4e2ac Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 22 Apr 2021 12:22:10 +0100
Subject: [PATCH 50/86] Remove overzealous linter fixes

---
 webpack.config.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index f2b4549c9..d2ba9192f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -183,8 +183,8 @@ module.exports = (env, argv) => {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                "sourceMap": true,
-                                "plugins": () => [
+                                sourceMap: true,
+                                plugins: () => [
                                     // Note that we use significantly fewer plugins on the plain
                                     // CSS parser. If we start to parse plain CSS, we end with all
                                     // kinds of nasty problems (like stylesheets not loading).
@@ -211,7 +211,7 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                "parser": "postcss-scss",
+                                parser: "postcss-scss",
                                 "local-plugins": true,
                             },
                         },
@@ -232,8 +232,8 @@ module.exports = (env, argv) => {
                             loader: 'postcss-loader',
                             ident: 'postcss',
                             options: {
-                                "sourceMap": true,
-                                "plugins": () => [
+                                sourceMap: true,
+                                plugins: () => [
                                     // Note that we use slightly different plugins for SCSS.
 
                                     require('postcss-import')(),
@@ -250,7 +250,7 @@ module.exports = (env, argv) => {
                                     // up with broken CSS.
                                     require('postcss-preset-env')({stage: 3, browsers: 'last 2 versions'}),
                                 ],
-                                "parser": "postcss-scss",
+                                parser: "postcss-scss",
                                 "local-plugins": true,
                             },
                         },
@@ -423,9 +423,6 @@ module.exports = (env, argv) => {
             hot: false,
             inline: false,
         },
-        stats: {
-            warnings: false,
-        },
     };
 };
 

From 9cf35ab19929504cf7bf23b24a7ef206c5616c81 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 22 Apr 2021 13:05:02 +0100
Subject: [PATCH 51/86] Disable `postcss-calc`'s noisy `warnWhenCannotResolve`
 option

While it sounds like a useful warning at first, it turns out the warnings it
prints are ones we're unlike to ever act on, such as adding percentages and
pixels, which seem fine to have. This resets to default behaviour, which leaves
the warning off.
---
 webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 57b1e4d28..fd4c4e49d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -243,7 +243,7 @@ module.exports = (env, argv) => {
                                     require("postcss-easings")(),
                                     require("postcss-strip-inline-comments")(),
                                     require("postcss-hexrgba")(),
-                                    require("postcss-calc")({warnWhenCannotResolve: true}),
+                                    require("postcss-calc")(),
 
                                     // It's important that this plugin is last otherwise we end
                                     // up with broken CSS.

From 8abc7cd87c0b29a3e8722703534df0236217f1e1 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 22 Apr 2021 14:31:06 +0100
Subject: [PATCH 52/86] Only inject Inter fonts to HtmlWebpackPlugin

---
 src/vector/index.html | 3 ---
 webpack.config.js     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/vector/index.html b/src/vector/index.html
index 64650305c..91b14da5c 100644
--- a/src/vector/index.html
+++ b/src/vector/index.html
@@ -59,9 +59,6 @@
     } %>
 
   </head>
-
-
-
   <body style="height: 100%; margin: 0;" data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.js.find(entry => entry.includes("indexeddb-worker.js")) %>">
     <noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
     <section id="matrixchat" style="height: 100%; overflow: auto;" class="notranslate"></section>
diff --git a/webpack.config.js b/webpack.config.js
index d2ba9192f..687ea2917 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -388,7 +388,7 @@ module.exports = (env, argv) => {
             }),
 
             new HtmlWebpackInjectPreload({
-                files: [{ match: /.*\.(woff2?|ttf|eot)$/ }],
+                files: [{ match: /.*Inter.*\.woff2?$/ }],
             }),
 
             ...additionalPlugins,

From 83359afe5dbc0b4e56ab16e43ee726cf3ccc12ed Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Thu, 22 Apr 2021 16:28:21 +0100
Subject: [PATCH 53/86] Remove deprecated velocity-animate dependency from lock
 file

---
 yarn.lock | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index cd7364d18..ae11a3d73 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7565,7 +7565,7 @@ matrix-mock-request@^1.2.3:
 
 "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.18.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f74300733455e4d0c4eb9359dcce880092286b74"
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/21e7847686a18f90b0b19ac72ca937055d948ba7"
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7615,7 +7615,6 @@ matrix-mock-request@^1.2.3:
     tar-js "^0.3.0"
     text-encoding-utf-8 "^1.0.2"
     url "^0.11.0"
-    velocity-animate "^2.0.6"
     what-input "^5.2.10"
     zxcvbn "^4.4.2"
 
@@ -12133,11 +12132,6 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-velocity-animate@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-2.0.6.tgz#1811ca14df7fbbef05740256f6cec0fd1b76575f"
-  integrity sha512-tU+/UtSo3GkIjEfk2KM4e24DvpgX0+FzfLr7XqNwm9BCvZUtbCHPq/AFutx/Mkp2bXlUS9EcX8yxu8XmzAv2Kw==
-
 vendors@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"

From f5c2d51f1e8c80c0c966ae52876b6b3281eae46f Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Fri, 23 Apr 2021 17:14:40 +0100
Subject: [PATCH 54/86] Implement IPC call to Electron to set language

---
 src/vector/platform/ElectronPlatform.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
index 74317e77d..449ca7954 100644
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -510,6 +510,10 @@ export default class ElectronPlatform extends VectorBasePlatform {
         return this.eventIndexManager;
     }
 
+    async setLanguage(language: string) {
+        return this._ipcCall('setLanguage', language);
+    }
+
     setSpellCheckLanguages(preferredLangs: string[]) {
         this._ipcCall('setSpellCheckLanguages', preferredLangs).catch(error => {
             console.log("Failed to send setSpellCheckLanguages IPC to Electron");

From 15fe7091ff0adb7416968ed720c49b89cf9f510a Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 23 Apr 2021 17:46:08 +0100
Subject: [PATCH 55/86] Add section on quality when guarded by a feature flag

---
 docs/review.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/review.md b/docs/review.md
index 2aab77ddb..b84f422dc 100644
--- a/docs/review.md
+++ b/docs/review.md
@@ -87,6 +87,14 @@ We recognise that this testing policy will slow things down a bit, but overall
 it should encourage better long-term health of the app and give everyone more
 confidence when making changes as coverage increases over time.
 
+For changes guarded by a feature flag, we currently lean towards prioritising
+our ability to evolve quickly using such flags and thus we will not currently
+require tests to appear at the same time as the initial landing of features
+guarded by flags, as long as (for new flagged features going forward) the
+feature author understands that they are effectively deferring part of their
+work (adding tests) until later and tests are expected to appear before the
+feature can be enabled by default.
+
 ## Design and Product Review
 
 We want to ensure that all changes to Element fit with our design and product

From 47f1d2fb9837db00f4775a5d2c14ab6cc699c723 Mon Sep 17 00:00:00 2001
From: Thibault Martin <mail@thibaultmart.in>
Date: Wed, 21 Apr 2021 18:51:51 +0000
Subject: [PATCH 56/86] Translated using Weblate (French)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/
---
 src/i18n/strings/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7b76c1688..a64ffb3c9 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -32,5 +32,6 @@
     "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 prend pas en charge.",
-    "Powered by Matrix": "Propulsé par Matrix"
+    "Powered by Matrix": "Propulsé par Matrix",
+    "Use %(brand)s on mobile": "Utiliser %(brand)s sur téléphone"
 }

From 26a229d74557ecd56a1d25a9d7ce922a25733542 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 23 Apr 2021 06:06:04 +0000
Subject: [PATCH 57/86] Translated using Weblate (Hungarian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/hu/
---
 src/i18n/strings/hu.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d090dcef4..7f9087954 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -32,5 +32,6 @@
     "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"
+    "Powered by Matrix": "A gépházban: Matrix",
+    "Use %(brand)s on mobile": "Mobilon használd ezt: %(brand)s"
 }

From bd888ff7c9b5a30bcfdc9829d826aa8f2b59073a Mon Sep 17 00:00:00 2001
From: LinAGKar <linus.kardell@gmail.com>
Date: Thu, 22 Apr 2021 12:46:09 +0000
Subject: [PATCH 58/86] Translated using Weblate (Swedish)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sv/
---
 src/i18n/strings/sv.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 6f88bb93b..3bb712a9f 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -32,5 +32,6 @@
     "Open": "Öppna",
     "Powered by Matrix": "Drivs av Matrix",
     "Your browser can't run %(brand)s": "Din webbläsare kan inte köra %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s använder avancerade webbläsarfunktioner som inte stöds av din aktuella webbläsare."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s använder avancerade webbläsarfunktioner som inte stöds av din aktuella webbläsare.",
+    "Use %(brand)s on mobile": "Använd %(brand)s på mobilen"
 }

From 296e5913b7edd0dffb7f79bdd109a1fc23b16e95 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Wed, 21 Apr 2021 19:03:38 +0000
Subject: [PATCH 59/86] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/
---
 src/i18n/strings/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index c97006b30..1a77e28d4 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -32,5 +32,6 @@
     "%(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 використовує передові властивості, які ваш браузер не підтримує.",
+    "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному"
 }

From cb625469a501d1f0a2b35fe33913bd22ade630d5 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 22 Apr 2021 02:36:51 +0000
Subject: [PATCH 60/86] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/zh_Hant/
---
 src/i18n/strings/zh_Hant.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f9eca46ba..3cd811820 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -32,5 +32,6 @@
     "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 提供",
+    "Use %(brand)s on mobile": "在行動裝置上使用 %(brand)s"
 }

From f7180853fc3d4d0b7a340fd9287128f738734b44 Mon Sep 17 00:00:00 2001
From: XoseM <correoxm@disroot.org>
Date: Thu, 22 Apr 2021 19:06:13 +0000
Subject: [PATCH 61/86] Translated using Weblate (Galician)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/gl/
---
 src/i18n/strings/gl.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 15f9284e5..17b229a35 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -32,5 +32,6 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuración de Element contén JSON non válido. Corrixe o problema e recarga a páxina.",
     "Your browser can't run %(brand)s": "O teu navegador non pode executar %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza características avanzadas do navegador que non están dispoñibles no teu navegador.",
-    "Powered by Matrix": "Funciona grazas a Matrix"
+    "Powered by Matrix": "Funciona grazas a Matrix",
+    "Use %(brand)s on mobile": "Utiliza %(brand)s no móbil"
 }

From b2683fb6757be024a54550daedeb4a9965f176b1 Mon Sep 17 00:00:00 2001
From: libexus <Asterixeins324@gmail.com>
Date: Sat, 24 Apr 2021 18:44:40 +0000
Subject: [PATCH 62/86] Translated using Weblate (German)

Currently translated at 97.0% (33 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/
---
 src/i18n/strings/de_DE.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 8183384ac..56a226e56 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -32,5 +32,6 @@
     "Open": "Öffnen",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem Browser nicht unterstützt werden.",
     "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
-    "Powered by Matrix": "Betrieben mit Matrix"
+    "Powered by Matrix": "Betrieben mit Matrix",
+    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy"
 }

From 2976d4c0cfac5a7ea455768ec2cbae0220188a38 Mon Sep 17 00:00:00 2001
From: Nikita Epifanov <NikGreens@protonmail.com>
Date: Sat, 24 Apr 2021 07:33:33 +0000
Subject: [PATCH 63/86] Translated using Weblate (Russian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ru/
---
 src/i18n/strings/ru.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index fed1c23a1..361cd53e9 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -32,5 +32,6 @@
     "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": "На технологии Matrix"
+    "Powered by Matrix": "На технологии Matrix",
+    "Use %(brand)s on mobile": "Воспользуйтесь %(brand)s на мобильном телефоне"
 }

From 94d05c7e25b306eacbe925974c85cd12334635c0 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Sat, 24 Apr 2021 20:18:37 +0000
Subject: [PATCH 64/86] Translated using Weblate (Albanian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/sq/
---
 src/i18n/strings/sq.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 3e4987bc2..de1b03509 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -32,5 +32,6 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Formësimi juaj i Element-it përmban JSON të pavlefshëm. Ju lutemi, ndreqeni problemin dhe ringarkoni faqen.",
     "Your browser can't run %(brand)s": "Shfletuesi juaj s’mund të xhirojë %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s përdor veçori të thelluara të shfletuesit, të cilat shfletuesi juaj i tanishëm s’i mbulon.",
-    "Powered by Matrix": "Bazuar në Matrix"
+    "Powered by Matrix": "Bazuar në Matrix",
+    "Use %(brand)s on mobile": "Përdor %(brand)s në celular"
 }

From 3343d143238a3b3652cbaf4d5814b7b67a0dcea4 Mon Sep 17 00:00:00 2001
From: Robert M Campbell <robert.rcampbell@gmail.com>
Date: Mon, 26 Apr 2021 07:22:19 +0000
Subject: [PATCH 65/86] Added translation using Weblate (Lao)

---
 src/i18n/strings/lo.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/lo.json

diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/src/i18n/strings/lo.json
@@ -0,0 +1 @@
+{}

From a8429f3e1d148dbfcdc5e11d722fe217267a479c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 26 Apr 2021 09:49:21 +0100
Subject: [PATCH 66/86] Convert Vector skin react components to Typescript

---
 .../{VectorEmbeddedPage.js => VectorEmbeddedPage.tsx}     | 2 +-
 .../auth/{VectorAuthFooter.js => VectorAuthFooter.tsx}    | 0
 .../{VectorAuthHeaderLogo.js => VectorAuthHeaderLogo.tsx} | 5 -----
 .../views/auth/{VectorAuthPage.js => VectorAuthPage.tsx}  | 8 ++++----
 4 files changed, 5 insertions(+), 10 deletions(-)
 rename src/components/structures/{VectorEmbeddedPage.js => VectorEmbeddedPage.tsx} (98%)
 rename src/components/views/auth/{VectorAuthFooter.js => VectorAuthFooter.tsx} (100%)
 rename src/components/views/auth/{VectorAuthHeaderLogo.js => VectorAuthHeaderLogo.tsx} (92%)
 rename src/components/views/auth/{VectorAuthPage.js => VectorAuthPage.tsx} (93%)

diff --git a/src/components/structures/VectorEmbeddedPage.js b/src/components/structures/VectorEmbeddedPage.tsx
similarity index 98%
rename from src/components/structures/VectorEmbeddedPage.js
rename to src/components/structures/VectorEmbeddedPage.tsx
index 2397eef14..85adb2fb3 100644
--- a/src/components/structures/VectorEmbeddedPage.js
+++ b/src/components/structures/VectorEmbeddedPage.tsx
@@ -24,7 +24,7 @@ export default class VectorEmbeddedPage extends EmbeddedPage {
     static replaces = 'EmbeddedPage';
 
     // we're overriding the base component here, for Element-specific tweaks
-    translate(s) {
+    translate(s: string) {
         s = sanitizeHtml(_t(s));
         // ugly fix for https://github.com/vector-im/element-web/issues/4243
         // eslint-disable-next-line max-len
diff --git a/src/components/views/auth/VectorAuthFooter.js b/src/components/views/auth/VectorAuthFooter.tsx
similarity index 100%
rename from src/components/views/auth/VectorAuthFooter.js
rename to src/components/views/auth/VectorAuthFooter.tsx
diff --git a/src/components/views/auth/VectorAuthHeaderLogo.js b/src/components/views/auth/VectorAuthHeaderLogo.tsx
similarity index 92%
rename from src/components/views/auth/VectorAuthHeaderLogo.js
rename to src/components/views/auth/VectorAuthHeaderLogo.tsx
index 73f952e52..d3bf32341 100644
--- a/src/components/views/auth/VectorAuthHeaderLogo.js
+++ b/src/components/views/auth/VectorAuthHeaderLogo.tsx
@@ -16,16 +16,11 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
 
 export default class VectorAuthHeaderLogo extends React.PureComponent {
     static replaces = 'AuthHeaderLogo'
 
-    static propTypes = {
-        icon: PropTypes.string,
-    }
-
     render() {
         const brandingConfig = SdkConfig.get().branding;
         let logoUrl = "themes/element/img/logos/element-logo.svg";
diff --git a/src/components/views/auth/VectorAuthPage.js b/src/components/views/auth/VectorAuthPage.tsx
similarity index 93%
rename from src/components/views/auth/VectorAuthPage.js
rename to src/components/views/auth/VectorAuthPage.tsx
index 19fd61807..b50c401f9 100644
--- a/src/components/views/auth/VectorAuthPage.js
+++ b/src/components/views/auth/VectorAuthPage.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
+import React, { CSSProperties } from 'react';
 import * as sdk from 'matrix-react-sdk/src/index';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
 
@@ -48,12 +48,12 @@ export default class VectorAuthPage extends React.PureComponent {
             background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
         };
 
-        const modalStyle = {
+        const modalStyle: CSSProperties = {
             position: 'relative',
             background: 'initial',
         };
 
-        const blurStyle = {
+        const blurStyle: CSSProperties = {
             position: 'absolute',
             top: 0,
             right: 0,
@@ -63,7 +63,7 @@ export default class VectorAuthPage extends React.PureComponent {
             background: pageStyle.background,
         };
 
-        const modalContentStyle = {
+        const modalContentStyle: CSSProperties = {
             display: 'flex',
             zIndex: 1,
             background: 'rgba(255, 255, 255, 0.59)',

From dc4cc026828ac9cd5058c88c36ef63c4969fdd47 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Mon, 26 Apr 2021 13:54:17 +0100
Subject: [PATCH 67/86] Change lang type to allow for multiple locales

---
 src/vector/platform/ElectronPlatform.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
index 449ca7954..7ec8147ed 100644
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -510,8 +510,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
         return this.eventIndexManager;
     }
 
-    async setLanguage(language: string) {
-        return this._ipcCall('setLanguage', language);
+    async setLanguage(preferredLangs: string[]) {
+        return this._ipcCall('setLanguage', preferredLangs);
     }
 
     setSpellCheckLanguages(preferredLangs: string[]) {

From 982b10464f4ec41fa8f1d9fdb97cfdd253fe6f61 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 26 Apr 2021 14:14:28 +0000
Subject: [PATCH 68/86] Translated using Weblate (Italian)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/it/
---
 src/i18n/strings/it.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d503c07aa..c14e74c63 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -32,5 +32,6 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configurazione del tuo elemento contiene un JSON non valido. Correggi il problema e ricarica la pagina.",
     "Your browser can't run %(brand)s": "Il tuo browser non può eseguire %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funzionalità avanzate del browser che non sono supportate dal tuo browser attuale.",
-    "Powered by Matrix": "Offerto da Matrix"
+    "Powered by Matrix": "Offerto da Matrix",
+    "Use %(brand)s on mobile": "Usa %(brand)s su mobile"
 }

From e30137ce68540d4c7f60879c3312ee185641f5ed Mon Sep 17 00:00:00 2001
From: Robert M Campbell <robert.rcampbell@gmail.com>
Date: Mon, 26 Apr 2021 07:23:36 +0000
Subject: [PATCH 69/86] Translated using Weblate (Lao)

Currently translated at 2.9% (1 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/lo/
---
 src/i18n/strings/lo.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/lo.json b/src/i18n/strings/lo.json
index 0967ef424..a5dec9164 100644
--- a/src/i18n/strings/lo.json
+++ b/src/i18n/strings/lo.json
@@ -1 +1,3 @@
-{}
+{
+    "Open": "ເປີດ"
+}

From 86c61cab339977e8b6262bbb83acc442e9779c1f Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Mon, 26 Apr 2021 16:52:11 +0100
Subject: [PATCH 70/86] Move i18n utils to its own module

---
 package.json            |   7 +--
 scripts/compare-file.js |  10 ----
 yarn.lock               | 104 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 13 deletions(-)
 delete mode 100644 scripts/compare-file.js

diff --git a/package.json b/package.json
index 8e4ea1fd4..61be8522f 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,9 @@
   ],
   "style": "bundle.css",
   "scripts": {
-    "i18n": "matrix-gen-i18n",
-    "prunei18n": "matrix-prune-i18n",
-    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+    "i18n": "gen-i18n",
+    "prunei18n": "prune-i18n",
+    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && gen-i18n && compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
     "reskindex": "reskindex -h src/header",
     "reskindex:watch": "reskindex -h src/header -w",
     "reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
@@ -119,6 +119,7 @@
     "loader-utils": "^1.4.0",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
+    "matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
     "mini-css-extract-plugin": "^0.12.0",
     "minimist": "^1.2.5",
     "mkdirp": "^1.0.4",
diff --git a/scripts/compare-file.js b/scripts/compare-file.js
deleted file mode 100644
index f53275ebf..000000000
--- a/scripts/compare-file.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const fs = require("fs");
-
-if (process.argv.length < 4) throw new Error("Missing source and target file arguments");
-
-const sourceFile = fs.readFileSync(process.argv[2], 'utf8');
-const targetFile = fs.readFileSync(process.argv[3], 'utf8');
-
-if (sourceFile !== targetFile) {
-    throw new Error("Files do not match");
-}
diff --git a/yarn.lock b/yarn.lock
index ae11a3d73..ea7dae9bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,6 +9,13 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+  dependencies:
+    "@babel/highlight" "^7.12.13"
+
 "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
@@ -44,6 +51,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
+  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
+  dependencies:
+    "@babel/types" "^7.13.16"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.10":
   version "7.12.10"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz#54ab9b000e60a93644ce17b3f37d313aaf1d115d"
@@ -113,6 +129,15 @@
     "@babel/template" "^7.12.7"
     "@babel/types" "^7.12.11"
 
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-get-function-arity@^7.12.10":
   version "7.12.10"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf"
@@ -120,6 +145,13 @@
   dependencies:
     "@babel/types" "^7.12.10"
 
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-hoist-variables@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
@@ -208,6 +240,13 @@
   dependencies:
     "@babel/types" "^7.12.11"
 
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
@@ -246,11 +285,25 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.12.13":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.11.tgz#9ce3595bcd74bc5c466905e86c535b8b25011e79"
   integrity sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==
 
+"@babel/parser@^7.12.13", "@babel/parser@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
+  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
+
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz#04b8f24fd4532008ab4e79f788468fd5a8476566"
@@ -963,6 +1016,15 @@
     "@babel/parser" "^7.12.7"
     "@babel/types" "^7.12.7"
 
+"@babel/template@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
 "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4":
   version "7.12.12"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.12.tgz#d0cd87892704edd8da002d674bc811ce64743376"
@@ -978,6 +1040,20 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
+"@babel/traverse@^7.13.17":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
+  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.16"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.16"
+    "@babel/types" "^7.13.17"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.11", "@babel/types@^7.12.12", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.12.12"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.12.tgz#4608a6ec313abbd87afa55004d373ad04a96c299"
@@ -987,6 +1063,14 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.12.13", "@babel/types@^7.13.16", "@babel/types@^7.13.17":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
+  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -5166,6 +5250,11 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
+foreachasync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
+  integrity sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -7623,6 +7712,14 @@ matrix-react-test-utils@^0.2.2:
   resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.2.2.tgz#c87144d3b910c7edc544a6699d13c7c2bf02f853"
   integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
 
+"matrix-web-i18n@github:matrix-org/matrix-web-i18n":
+  version "1.1.1"
+  resolved "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/68ea0c57b6c74c40df6419eb5ac0fa8945ff8a75"
+  dependencies:
+    "@babel/parser" "^7.13.16"
+    "@babel/traverse" "^7.13.17"
+    walk "^2.3.14"
+
 matrix-widget-api@^0.1.0-beta.13:
   version "0.1.0-beta.13"
   resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-0.1.0-beta.13.tgz#ebddc83eaef39bbb87b621a02a35902e1a29b9ef"
@@ -12183,6 +12280,13 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
+walk@^2.3.14:
+  version "2.3.14"
+  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz#60ec8631cfd23276ae1e7363ce11d626452e1ef3"
+  integrity sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==
+  dependencies:
+    foreachasync "^3.0.0"
+
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"

From 535ca49479f9ea7e192a6c215fc1289501a0fe7c Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 26 Apr 2021 17:51:43 +0100
Subject: [PATCH 71/86] Upgrade matrix-js-sdk to 10.0.0

---
 package.json |  2 +-
 yarn.lock    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3b40d9525..005a18ba1 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "10.0.0-rc.1",
+    "matrix-js-sdk": "10.0.0",
     "matrix-react-sdk": "3.19.0-rc.1",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/yarn.lock b/yarn.lock
index 6a4ec406e..734a23584 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7506,6 +7506,21 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
+matrix-js-sdk@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0.tgz#571e97c8d8351715ac609ccedd38cad79d0b752e"
+  integrity sha512-40QN9HITqWBSYi/e8QQidDL6UOhWBpst437i+lHIqQ8a7SQtbcquDSRXWR22BjM2qbssR+02zfrLI/Kez7IoBQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-js-sdk@10.0.0-rc.1:
   version "10.0.0-rc.1"
   resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0-rc.1.tgz#e99ff19fa02ad6526cd62a20767104591b4e0720"

From 0c8fee3528561ac037f24655fc94715fe23e8b66 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 26 Apr 2021 17:52:34 +0100
Subject: [PATCH 72/86] Upgrade matrix-react-sdk to 3.19.0

---
 package.json |  2 +-
 yarn.lock    | 25 +++++--------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 005a18ba1..8553af68b 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "10.0.0",
-    "matrix-react-sdk": "3.19.0-rc.1",
+    "matrix-react-sdk": "3.19.0",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 734a23584..9c0cfefb7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7521,21 +7521,6 @@ matrix-js-sdk@10.0.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
-matrix-js-sdk@10.0.0-rc.1:
-  version "10.0.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0-rc.1.tgz#e99ff19fa02ad6526cd62a20767104591b4e0720"
-  integrity sha512-3dwM9BFFAW1RC55+XHUpSfV4lQmyrx8peLW+3p+uIbZNgtPV/+h2X0ja281SVipdePJ50gYF9Iif+UkLkXXuug==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"
@@ -7544,10 +7529,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.19.0-rc.1:
-  version "3.19.0-rc.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0-rc.1.tgz#2b31aa8788f286989777445b8c4fd47fc1eeeef9"
-  integrity sha512-3lggmukp/o/gbHt6UIWG5t/rEt26TuksL3TyewH0ykr9vZ8j+es+573ixRujyaKIaALE0XcFm/XyHFyWZDzeZg==
+matrix-react-sdk@3.19.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0.tgz#45e5794f9dae9b8fd6bdc2862ffd6e3a6650e282"
+  integrity sha512-xCRtq0u+qyYIAU/rUt7oQU0+sQboT1q1RRBzEvKca2usQRFH+EV4ahh97GCgg+u2IDiYb83bcVPcB4lGcCVLjg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7575,7 +7560,7 @@ matrix-react-sdk@3.19.0-rc.1:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "10.0.0-rc.1"
+    matrix-js-sdk "10.0.0"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From d22e1fff1655b06ff388333c07f6cc30d80a71e7 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 26 Apr 2021 17:55:53 +0100
Subject: [PATCH 73/86] Prepare changelog for v1.7.26

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac0ef7113..9e5516a32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.7.26](https://github.com/vector-im/element-web/releases/tag/v1.7.26) (2021-04-26)
+===============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.26-rc.1...v1.7.26)
+
+ * Upgrade to React SDK 3.19.0 and JS SDK 10.0.0
+
 Changes in [1.7.26-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.26-rc.1) (2021-04-21)
 =========================================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.25...v1.7.26-rc.1)

From 6d056d7a084dd4f2e3cc2621c974e5e4af76af8f Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 26 Apr 2021 17:55:54 +0100
Subject: [PATCH 74/86] v1.7.26

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8553af68b..b528fbadf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.7.26-rc.1",
+  "version": "1.7.26",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 7e6ce7fb7654b8b1281823be87ca12c382967f59 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 26 Apr 2021 18:04:54 +0100
Subject: [PATCH 75/86] Reset matrix-js-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b4262f8f5..c4081c638 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "highlight.js": "^10.5.0",
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "10.0.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "3.19.0",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/yarn.lock b/yarn.lock
index 1f0a8a1e0..74ef0dede 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7556,6 +7556,20 @@ matrix-js-sdk@10.0.0:
     request "^2.88.2"
     unhomoglyph "^1.0.6"
 
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
+  version "10.0.0"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b911a890cff5ac4d10a4f3a94b43276caeedca83"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    another-json "^0.2.0"
+    browser-request "^0.3.3"
+    bs58 "^4.0.1"
+    content-type "^1.0.4"
+    loglevel "^1.7.1"
+    qs "^6.9.6"
+    request "^2.88.2"
+    unhomoglyph "^1.0.6"
+
 matrix-mock-request@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8"

From 4b3ba43f387cba6424578bc24d43fce08123350a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Mon, 26 Apr 2021 18:05:19 +0100
Subject: [PATCH 76/86] Reset matrix-react-sdk back to develop branch

---
 package.json |  2 +-
 yarn.lock    | 22 +++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index c4081c638..974d7113c 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jsrsasign": "^10.1.5",
     "katex": "^0.12.0",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "3.19.0",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^0.1.0-beta.13",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
     "prop-types": "^15.7.2",
diff --git a/yarn.lock b/yarn.lock
index 74ef0dede..d0f4688bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7541,21 +7541,6 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-10.0.0.tgz#571e97c8d8351715ac609ccedd38cad79d0b752e"
-  integrity sha512-40QN9HITqWBSYi/e8QQidDL6UOhWBpst437i+lHIqQ8a7SQtbcquDSRXWR22BjM2qbssR+02zfrLI/Kez7IoBQ==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    another-json "^0.2.0"
-    browser-request "^0.3.3"
-    bs58 "^4.0.1"
-    content-type "^1.0.4"
-    loglevel "^1.7.1"
-    qs "^6.9.6"
-    request "^2.88.2"
-    unhomoglyph "^1.0.6"
-
 "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
   version "10.0.0"
   resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b911a890cff5ac4d10a4f3a94b43276caeedca83"
@@ -7578,10 +7563,9 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@3.19.0:
+"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
   version "3.19.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.19.0.tgz#45e5794f9dae9b8fd6bdc2862ffd6e3a6650e282"
-  integrity sha512-xCRtq0u+qyYIAU/rUt7oQU0+sQboT1q1RRBzEvKca2usQRFH+EV4ahh97GCgg+u2IDiYb83bcVPcB4lGcCVLjg==
+  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3817aaeaca9622c56894df4092b5ce727b943f64"
   dependencies:
     "@babel/runtime" "^7.12.5"
     await-lock "^2.1.0"
@@ -7609,7 +7593,7 @@ matrix-react-sdk@3.19.0:
     katex "^0.12.0"
     linkifyjs "^2.1.9"
     lodash "^4.17.20"
-    matrix-js-sdk "10.0.0"
+    matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
     matrix-widget-api "^0.1.0-beta.13"
     minimist "^1.2.5"
     opus-recorder "^8.0.3"

From bf305f76a74d51fd74fa67809a068942e54f1708 Mon Sep 17 00:00:00 2001
From: Germain Souquet <germain@souquet.com>
Date: Tue, 27 Apr 2021 15:07:48 +0100
Subject: [PATCH 77/86] Upgrade matrix-web-i18n to use matrix prefixed binaries

---
 package.json | 6 +++---
 yarn.lock    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 61be8522f..03e8e05b6 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,9 @@
   ],
   "style": "bundle.css",
   "scripts": {
-    "i18n": "gen-i18n",
-    "prunei18n": "prune-i18n",
-    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && gen-i18n && compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+    "i18n": "matrix-gen-i18n",
+    "prunei18n": "matrix-prune-i18n",
+    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
     "reskindex": "reskindex -h src/header",
     "reskindex:watch": "reskindex -h src/header -w",
     "reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
diff --git a/yarn.lock b/yarn.lock
index ea7dae9bc..2104ccd0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7713,8 +7713,8 @@ matrix-react-test-utils@^0.2.2:
   integrity sha512-49+7gfV6smvBIVbeloql+37IeWMTD+fiywalwCqk8Dnz53zAFjKSltB3rmWHso1uecLtQEcPtCijfhzcLXAxTQ==
 
 "matrix-web-i18n@github:matrix-org/matrix-web-i18n":
-  version "1.1.1"
-  resolved "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/68ea0c57b6c74c40df6419eb5ac0fa8945ff8a75"
+  version "1.1.2"
+  resolved "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/63f9119bc0bc304e83d4e8e22364caa7850e7671"
   dependencies:
     "@babel/parser" "^7.13.16"
     "@babel/traverse" "^7.13.17"

From d03032b8089b61b0e5881cfd8a8881f90ede2f95 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 27 Apr 2021 19:34:21 +0100
Subject: [PATCH 78/86] Put asserted identity under voip section

---
 docs/config.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index 514e46a06..1ca4bf48f 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -132,9 +132,10 @@ For a good example, see https://develop.element.io/config.json.
 1. `audioStreamUrl`: If supplied, show an option on Jitsi widgets to stream
    audio using Jitsi's live streaming feature. This option is experimental and
    may be removed at any time without notice.
-1. `voipObeyAssertedIdentity`: If set, MSC3086 asserted identity messages sent
-   on VoIP calls will cause the call to appear in the room corresponding to the
-   asserted identity. This *must* only be set in trusted environments.
+1. `voip`: Behaviour related to calls
+   1. `obeyAssertedIdentity`: If set, MSC3086 asserted identity messages sent
+      on VoIP calls will cause the call to appear in the room corresponding to the
+      asserted identity. This *must* only be set in trusted environments.
 
 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

From 9ef7507750e903c71c7f7125dbe430ee7dc1e69f Mon Sep 17 00:00:00 2001
From: jelv <post@jelv.nl>
Date: Tue, 27 Apr 2021 11:09:15 +0000
Subject: [PATCH 79/86] Translated using Weblate (Dutch)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
---
 src/i18n/strings/nl.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 386458974..c7250c046 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -32,5 +32,6 @@
     "Your Element is misconfigured": "Je Element is verkeerd geconfigureerd",
     "Your browser can't run %(brand)s": "Je browser kan %(brand)s niet draaien",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in je huidige browser.",
-    "Powered by Matrix": "Gebruikt Matrix technologie"
+    "Powered by Matrix": "Gebruikt Matrix technologie",
+    "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel"
 }

From 3df2616f4e55e47c318b6888a1c9a91f427bf807 Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali@protonmail.com>
Date: Tue, 27 Apr 2021 09:37:03 +0000
Subject: [PATCH 80/86] Translated using Weblate (Central Atlas Tamazight)

Currently translated at 41.1% (14 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/
---
 src/i18n/strings/tzm.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json
index d97f87582..3945eb729 100644
--- a/src/i18n/strings/tzm.json
+++ b/src/i18n/strings/tzm.json
@@ -1,5 +1,5 @@
 {
-    "Create Account": "Ssenflul amiḍan",
+    "Create Account": "senflul amiḍan",
     "Download Completed": "Ittusmed wagam",
     "Powered by Matrix": "Ittusker s Matrix",
     "Sign In": "Kcem",
@@ -11,5 +11,6 @@
     "Open user settings": "Ṛẓem tisɣal n unessemres",
     "Dismiss": "Nexxel",
     "Open": "Ṛẓem",
-    "The message from the parser is: %(message)s": "Tuzint seg tasna: %(message)s"
+    "The message from the parser is: %(message)s": "Tuzint seg tasna: %(message)s",
+    "Use %(brand)s on mobile": "Semres %(brand)s g utilifun"
 }

From 427ca9d92df68de69714a46906cfb93a145c2bc9 Mon Sep 17 00:00:00 2001
From: "@a2sc:matrix.org" <a0_r@a2sc.eu>
Date: Wed, 28 Apr 2021 20:51:56 +0000
Subject: [PATCH 81/86] Translated using Weblate (German)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/
---
 src/i18n/strings/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 56a226e56..0052218a9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -33,5 +33,5 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem Browser nicht unterstützt werden.",
     "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
     "Powered by Matrix": "Betrieben mit Matrix",
-    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy"
+    "Use %(brand)s on mobile": "Verwende %(brand)s auf dem Handy"
 }

From 889ed4541b0885d4c3f4db7f01ecd6214fb2ab98 Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali@protonmail.com>
Date: Thu, 29 Apr 2021 11:51:21 +0000
Subject: [PATCH 82/86] Translated using Weblate (Central Atlas Tamazight)

Currently translated at 41.1% (14 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/
---
 src/i18n/strings/tzm.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/tzm.json b/src/i18n/strings/tzm.json
index 3945eb729..3a4a09f4e 100644
--- a/src/i18n/strings/tzm.json
+++ b/src/i18n/strings/tzm.json
@@ -11,6 +11,6 @@
     "Open user settings": "Ṛẓem tisɣal n unessemres",
     "Dismiss": "Nexxel",
     "Open": "Ṛẓem",
-    "The message from the parser is: %(message)s": "Tuzint seg tasna: %(message)s",
+    "The message from the parser is: %(message)s": "Tuzint n umeslad: %(message)s",
     "Use %(brand)s on mobile": "Semres %(brand)s g utilifun"
 }

From b98effbf320c5193ae98b9e58664fc092ac5f778 Mon Sep 17 00:00:00 2001
From: iaiz <git@iapellaniz.com>
Date: Sat, 1 May 2021 10:41:54 +0000
Subject: [PATCH 83/86] Translated using Weblate (Spanish)

Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/es/
---
 src/i18n/strings/es.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 69534b8fb..ff1f8b51a 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -32,5 +32,6 @@
     "Open": "Abrir",
     "Your browser can't run %(brand)s": "Tu navegador no es compatible 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": "Funciona con Matrix"
+    "Powered by Matrix": "Funciona con Matrix",
+    "Use %(brand)s on mobile": "Usar %(brand)s en modo móvil"
 }

From 28fb9bfc75005bcb62dc467c91bf5d8bbb88f873 Mon Sep 17 00:00:00 2001
From: liimee <alt3753.7@gmail.com>
Date: Sat, 1 May 2021 10:44:49 +0000
Subject: [PATCH 84/86] Translated using Weblate (Indonesian)

Currently translated at 23.5% (8 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/
---
 src/i18n/strings/id.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 86cd1a41c..1b1b09541 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -4,5 +4,8 @@
     "Unknown device": "Perangkat Tidak Diketahui",
     "You need to be using HTTPS to place a screen-sharing call.": "Anda perlu menggunakan HTTPS untuk melakukan panggilan berbagi-layar.",
     "Welcome to Element": "Selamat datang di Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Obrolan terenkripsi, terdesentralisasi &amp; kolaborasi didukung oleh [matrix]"
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Obrolan terenkripsi, terdesentralisasi &amp; kolaborasi didukung oleh [matrix]",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurasi Element Anda mengandung JSON yang tidak valid. Mohon perbaiki masalahnya dan muat ulang halaman nya.",
+    "Invalid configuration: no default server specified.": "Konfigurasi tidak valid: server default belum ditentukan.",
+    "Missing indexeddb worker script!": "Tidak ada script worker indexeddb!"
 }

From 90825eac792dce7371f4e950dd0a9deb8d7f93ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 22:24:19 +0000
Subject: [PATCH 85/86] Bump ua-parser-js from 0.7.23 to 0.7.24

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.23 to 0.7.24.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.23...0.7.24)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c11256e1a..cb629f17b 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "sanitize-html": "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db",
-    "ua-parser-js": "^0.7.23"
+    "ua-parser-js": "^0.7.24"
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
diff --git a/yarn.lock b/yarn.lock
index ee50155c3..1a5c74f0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11973,10 +11973,10 @@ typeson@^5.18.2, typeson@^5.8.2:
   resolved "https://registry.yarnpkg.com/typeson/-/typeson-5.18.2.tgz#0d217fc0e11184a66aa7ca0076d9aa7707eb7bc2"
   integrity sha512-Vetd+OGX05P4qHyHiSLdHZ5Z5GuQDrHHwSdjkqho9NSCYVSLSfRMjklD/unpHH8tXBR9Z/R05rwJSuMpMFrdsw==
 
-ua-parser-js@^0.7.18, ua-parser-js@^0.7.23:
-  version "0.7.23"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.23.tgz#704d67f951e13195fbcd3d78818577f5bc1d547b"
-  integrity sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==
+ua-parser-js@^0.7.18, ua-parser-js@^0.7.24:
+  version "0.7.24"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c"
+  integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From b260621afffdb79efcea534ab070d32f7efaf931 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Thu, 6 May 2021 21:51:43 -0600
Subject: [PATCH 86/86] Disable host checking on the webpack dev server

This is useful when you're doing cross-browser testing on a service which demands you use "localhost.com" for reasons.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb629f17b..2a92db953 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "dist": "scripts/package.sh",
     "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",
+    "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 --disable-host-check",
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
     "lint:js": "eslint src",
     "lint:types": "tsc --noEmit --jsx react",