v1.7.8-rc.1

Prepare changelog for v1.7.8-rc.1
Add sanitize-html types
2020-09-23 15:45:46 +01:00 · 2020-09-23 15:45:45 +01:00 · 2020-09-23 15:43:53 +01:00 · 2020-09-23 15:35:23 +01:00 · 2020-09-23 15:35:02 +01:00 · 2020-09-23 14:46:52 +01:00
41 changed files with 727 additions and 281 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,7 +8,7 @@ module.exports = {
        "quotes": "off",
    },
    "overrides": [{
-        "files": ["src/**/*.{ts, tsx}"],
+        "files": ["src/**/*.{ts,tsx}"],
        "extends": ["matrix-org/ts", "matrix-org/react"],
        "env": {
            "browser": true,
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,140 @@
+Changes in [1.7.8-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.8-rc.1) (2020-09-23)
+=======================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.7...v1.7.8-rc.1)
+
+ * Upgrade to React SDK 3.5.0-rc.1 and JS SDK 8.4.0-rc.1
+ * Update from Weblate
+   [\#15262](https://github.com/vector-im/element-web/pull/15262)
+ * Upgrade sanitize-html
+   [\#15260](https://github.com/vector-im/element-web/pull/15260)
+ * Document config for preferring Secure Backup setup methods
+   [\#15251](https://github.com/vector-im/element-web/pull/15251)
+ * Add end-user documentation for UI features
+   [\#15190](https://github.com/vector-im/element-web/pull/15190)
+ * Update git checkout instructions
+   [\#15218](https://github.com/vector-im/element-web/pull/15218)
+ * If no bug_report_endpoint_url, hide rageshaking from the App
+   [\#15201](https://github.com/vector-im/element-web/pull/15201)
+ * Bump node-fetch from 2.6.0 to 2.6.1
+   [\#15153](https://github.com/vector-im/element-web/pull/15153)
+ * Remove references to Travis CI
+   [\#15137](https://github.com/vector-im/element-web/pull/15137)
+ * Fix onNewScreen to use replace when going from roomId->roomAlias
+   [\#15127](https://github.com/vector-im/element-web/pull/15127)
+ * Enable Estonian in language menu
+   [\#15136](https://github.com/vector-im/element-web/pull/15136)
+
+Changes in [1.7.7](https://github.com/vector-im/element-web/releases/tag/v1.7.7) (2020-09-14)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6...v1.7.7)
+
+ * Upgrade to React SDK 3.4.1
+
+Changes in [1.7.6](https://github.com/vector-im/element-web/releases/tag/v1.7.6) (2020-09-14)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6-rc.1...v1.7.6)
+
+ * Upgrade to React SDK 3.4.0 and JS SDK 8.3.0
+
+Changes in [1.7.6-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.6-rc.1) (2020-09-09)
+=======================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5...v1.7.6-rc.1)
+
+ * Upgrade to React SDK 3.4.0-rc.1 and JS SDK 8.3.0-rc.1
+ * Update from Weblate
+   [\#15125](https://github.com/vector-im/element-web/pull/15125)
+ * Support usage of Jitsi widgets with "openidtoken-jwt" auth
+   [\#15114](https://github.com/vector-im/element-web/pull/15114)
+ * Fix eslint ts override tsx matching and delint
+   [\#15064](https://github.com/vector-im/element-web/pull/15064)
+ * Add testing to review guidelines
+   [\#15050](https://github.com/vector-im/element-web/pull/15050)
+
+Changes in [1.7.5](https://github.com/vector-im/element-web/releases/tag/v1.7.5) (2020-09-01)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5-rc.1...v1.7.5)
+
+## Security notice
+
+Element Web 1.7.5 fixes an issue where encrypted state events could break incoming call handling.
+Thanks to @awesome-michael from Awesome Technologies for responsibly disclosing this via Matrix's
+Security Disclosure Policy.
+
+## All changes
+
+ * Upgrade to React SDK 3.3.0 and JS SDK 8.2.0
+
+Changes in [1.7.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.5-rc.1) (2020-08-26)
+=======================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4...v1.7.5-rc.1)
+
+ * Upgrade to React SDK 3.3.0-rc.1 and JS SDK 8.2.0-rc.1
+ * Update from Weblate
+   [\#15045](https://github.com/vector-im/element-web/pull/15045)
+ * Document .well-known E2EE secure backup setting
+   [\#15003](https://github.com/vector-im/element-web/pull/15003)
+ * Add docs for communities v2 prototyping feature flag
+   [\#15013](https://github.com/vector-im/element-web/pull/15013)
+ * Update links in README.md to point to Element
+   [\#14973](https://github.com/vector-im/element-web/pull/14973)
+ * Make kabyle translation available
+   [\#15027](https://github.com/vector-im/element-web/pull/15027)
+ * Change Riot to Element in readme
+   [\#15016](https://github.com/vector-im/element-web/pull/15016)
+ * Update links to element in the readme
+   [\#15014](https://github.com/vector-im/element-web/pull/15014)
+ * Link to Element in F-Droid as well
+   [\#15002](https://github.com/vector-im/element-web/pull/15002)
+ * Settings v3: Update documentation and configs for new feature flag behaviour
+   [\#14986](https://github.com/vector-im/element-web/pull/14986)
+ * Update jitsi.md with Element Android details
+   [\#14952](https://github.com/vector-im/element-web/pull/14952)
+ * TypeScript: enable es2019 lib for newer definitions
+   [\#14983](https://github.com/vector-im/element-web/pull/14983)
+ * Add reaction preview labs flags to develop
+   [\#14979](https://github.com/vector-im/element-web/pull/14979)
+ * Document new labs tweaks
+   [\#14958](https://github.com/vector-im/element-web/pull/14958)
+
+Changes in [1.7.4](https://github.com/vector-im/element-web/releases/tag/v1.7.4) (2020-08-17)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4-rc.1...v1.7.4)
+
+ * Upgrade to React SDK 3.2.0 and JS SDK 8.1.0
+
+Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13)
+=======================================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1)
+
+ * Upgrade to React SDK 3.2.0-rc.1 and JS SDK 8.1.0-rc.1
+ * Update policy links to element.io
+   [\#14905](https://github.com/vector-im/element-web/pull/14905)
+ * Update from Weblate
+   [\#14949](https://github.com/vector-im/element-web/pull/14949)
+ * Try to close notification on all platforms which support it, not just
+   electron
+   [\#14939](https://github.com/vector-im/element-web/pull/14939)
+ * Update bug report submission URL
+   [\#14903](https://github.com/vector-im/element-web/pull/14903)
+ * Fix arm docker build
+   [\#14522](https://github.com/vector-im/element-web/pull/14522)
+
 Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05)
 =============================================================================================
+
+## Security notice
+
+Element Web 1.7.3 (as well as the earlier release 1.7.2) fixes an issue where
+replying to a specially formatted message would make it seem like the replier
+said something they did not. Thanks to Sorunome for responsibly disclosing this
+via Matrix's Security Disclosure Policy.
+
+Element Web 1.7.3 (as well as the earlier release 1.7.2) fixes an issue where an
+unexpected language ID in a code block could cause Element to crash. Thanks to
+SakiiR for responsibly disclosing this via Matrix's Security Disclosure Policy.
+
+## All changes
+
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3-rc.1...v1.7.3)

 * Upgrade to React SDK 3.1.0 and JS SDK 8.0.1
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,4 +1,4 @@
-Contributing code to Riot
-=========================
+Contributing code to Element
+============================

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

 # Support custom branches of the react-sdk and js-sdk. This also helps us build
 # images of riot-web develop.
@@ -9,7 +9,10 @@ ARG REACT_SDK_BRANCH="master"
 ARG JS_SDK_REPO="https://github.com/matrix-org/matrix-js-sdk.git"
 ARG JS_SDK_BRANCH="master"

-RUN apt-get update && apt-get install -y git dos2unix
+RUN apt-get update && apt-get install -y git dos2unix \
+# These packages are required for building Canvas on architectures like Arm
+# See https://www.npmjs.com/package/canvas#compiling
+  build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev

 WORKDIR /src

--- a/README.md
+++ b/README.md
@@ -24,8 +24,8 @@ Element has several tiers of support for different environments:
  * Everything else

 For accessing Element on an Android or iOS device, we currently recommend the
-native apps [riot-android](https://github.com/vector-im/riot-android)
-and [riot-ios](https://github.com/vector-im/riot-ios).
+native apps [element-android](https://github.com/vector-im/element-android)
+and [element-ios](https://github.com/vector-im/element-ios).

 Getting Started
 ===============
@@ -37,7 +37,7 @@ for those who like living dangerously.
 To host your own copy of Element, the quickest bet is to use a pre-built
 released version of Element:

-1. Download the latest version from https://github.com/vector-im/riot-web/releases
+1. Download the latest version from https://github.com/vector-im/element-web/releases
 1. Untar the tarball on your web server
 1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name
 1. Configure the correct caching headers in your webserver (see below)
@@ -69,7 +69,7 @@ access to Element (or other apps) due to sharing the same domain.

 We have put some coarse mitigations into place to try to protect against this
 situation, but it's still not good practice to do it in the first place.  See
-https://github.com/vector-im/riot-web/issues/1977 for more details.
+https://github.com/vector-im/element-web/issues/1977 for more details.

 Building From Source
 ====================
@@ -82,8 +82,8 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread

 1. Install or update `node.js` so that your `node` is at least v10.x.
 1. Install `yarn` if not present already.
-1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`.
-1. Switch to the riot-web directory: `cd riot-web`.
+1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`.
+1. Switch to the element-web directory: `cd element-web`.
 1. Install the prerequisites: `yarn install`.
   *  If you're using the `develop` branch, then it is recommended to set up a
      proper development environment (see [Setting up a dev
@@ -105,10 +105,10 @@ Running as a Desktop app
 ========================

 Element can also be run as a desktop app, wrapped in Electron. You can download a
-pre-built version from https://riot.im/download/desktop/ or, if you prefer,
+pre-built version from https://element.io/get-started or, if you prefer,
 build it yourself.

-To build it yourself, follow the instructions at https://github.com/vector-im/riot-desktop.
+To build it yourself, follow the instructions at https://github.com/vector-im/element-desktop.

 Many thanks to @aviraldg for the initial work on the Electron integration.

@@ -126,31 +126,31 @@ override the desktop app's default settings if desired.
 Running from Docker
 ===================

-The Docker image can be used to serve riot-web as a web server. The easiest way to use
+The Docker image can be used to serve element-web as a web server. The easiest way to use
 it is to use the prebuilt image:
 ```bash
 docker run -p 80:80 vectorim/riot-web
 ```

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

 To build the image yourself:
 ```bash
-git clone https://github.com/vector-im/riot-web.git riot-web
-cd riot-web
+git clone https://github.com/vector-im/element-web.git element-web
+cd element-web
 git checkout master
-docker build -t vectorim/riot-web .
+docker build .
 ```

 If you're building a custom branch, or want to use the develop branch, check out the appropriate
-riot-web branch and then run:
+element-web branch and then run:
 ```bash
-docker build -t vectorim/riot-web:develop \
+docker build -t \
    --build-arg USE_CUSTOM_SDKS=true \
    --build-arg REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git" \
    --build-arg REACT_SDK_BRANCH="develop" \
@@ -169,7 +169,7 @@ Labs Features
 =============

 Some features of Element may be enabled by flags in the `Labs` section of the settings.
-Some of these features are described in [labs.md](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md).
+Some of these features are described in [labs.md](https://github.com/vector-im/element-web/blob/develop/docs/labs.md).

 Caching requirements
 ====================
@@ -186,13 +186,13 @@ Element requires the following URLs not to be cached, when/if you are serving El
 Development
 ===========

-Before attempting to develop on Riot you **must** read the [developer guide
+Before attempting to develop on Element you **must** read the [developer guide
 for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk#developer-guide), which
 also defines the design, architecture and style for Element too.

 Before starting work on a feature, it's best to ensure your plan aligns well
-with our vision for Riot. Please chat with the team in
-[#riot-dev:matrix.org](https://matrix.to/#/#riot-dev:matrix.org) before you
+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.

 You should also familiarise yourself with the ["Here be Dragons" guide
@@ -225,7 +225,6 @@ First clone and build `matrix-js-sdk`:
 ``` bash
 git clone https://github.com/matrix-org/matrix-js-sdk.git
 pushd matrix-js-sdk
-git checkout develop
 yarn link
 yarn install
 popd
@@ -236,7 +235,6 @@ Then similarly with `matrix-react-sdk`:
 ```bash
 git clone https://github.com/matrix-org/matrix-react-sdk.git
 pushd matrix-react-sdk
-git checkout develop
 yarn link
 yarn link matrix-js-sdk
 yarn install
@@ -246,9 +244,8 @@ popd
 Finally, build and start Element itself:

 ```bash
-git clone https://github.com/vector-im/riot-web.git
-cd riot-web
-git checkout develop
+git clone https://github.com/vector-im/element-web.git
+cd element-web
 yarn link matrix-js-sdk
 yarn link matrix-react-sdk
 yarn install
@@ -275,7 +272,7 @@ bundle.css.map   116 kB       0  [emitted]  main
 Configure the app by copying `config.sample.json` to `config.json` and
 modifying it. See the [configuration docs](docs/config.md) for details.

-Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
+Open http://127.0.0.1:8080/ in your browser to see your newly built Element.

 **Note**: The build script uses inotify by default on Linux to monitor directories
 for changes. If the inotify watch limit is too low your build will silently fail.
@@ -336,7 +333,7 @@ To add a new translation, head to the [translating doc](docs/translating.md).

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

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

 Triaging issues
 ===============
--- a/config.sample.json
+++ b/config.sample.json
@@ -22,15 +22,11 @@
        "https://scalar-staging.vector.im/api",
        "https://scalar-staging.riot.im/scalar/api"
    ],
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
    "defaultCountryCode": "GB",
    "showLabsSettings": false,
    "features": {
-        "feature_new_spinner": "labs",
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs"
+        "feature_new_spinner": false
    },
    "default_federate": true,
    "default_theme": "light",
--- a/docs/config.md
+++ b/docs/config.md
@@ -22,12 +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. `features`: Lookup of optional features that may be `enable`d, `disable`d, or
-   exposed to the user in the `labs` section of settings. The available
-   optional experimental features vary from release to release 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 even when no `features` are enabled
-   or present. Useful for getting at settings which may be otherwise hidden.
+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 
+   [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.
 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
   homeserver know what email template to use when talking to you.
 1. `branding`: Configures various branding and logo details, such as:
@@ -48,7 +48,7 @@ For a good example, see https://develop.element.io/config.json.
 1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
 1. `bug_report_endpoint_url`: endpoint to send bug reports to (must be running a
   https://github.com/matrix-org/rageshake server). Bug reports are sent when a user clicks
-   "Send Logs" within the application. Bug reports can be disabled by leaving the
+   "Send Logs" within the application. Bug reports can be disabled/hidden by leaving the
   `bug_report_endpoint_url` out of your config file.
 1. `roomDirectory`: config for the public room directory. This section is optional.
 1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
@@ -101,6 +101,15 @@ For a good example, see https://develop.element.io/config.json.
    Defaults to false (3rd party identity options are shown).
 1. `default_federate`: Default option for room federation when creating a room
    Defaults to true (room federation enabled).
+1. `desktopBuilds`: Used to alter promotional links to the desktop app. By default
+   the builds are considered available and accessible from https://element.io. This
+   config option is typically used in the context of encouraging encrypted message
+   search capabilities (Seshat). All the options listed below are required if this
+   option is specified.
+   1. `available`: When false, the desktop app will not be promoted to the user.
+   1. `logo`: An HTTP URL to the avatar for the desktop build. Should be 24x24, ideally
+      an SVG.
+   1. `url`: An HTTP URL for where to send the user to download the desktop build.

 Note that `index.html` also has an og:image meta tag that is set to an image
 hosted on riot.im. This is the image used if links to your copy of Element
@@ -144,3 +153,42 @@ Desktop app configuration
 =========================

 See https://github.com/vector-im/riot-desktop#user-specified-configjson
+
+UI Features
+===========
+
+Parts of the UI can be disabled using UI features. These are settings which appear
+under `settingDefaults` and can only be `true` (default) or `false`. When `false`,
+parts of the UI relating to that feature will be disabled regardless of the user's
+preferences.
+
+Currently, the following UI feature flags are supported:
+
+* `UIFeature.urlPreviews` - Whether URL previews are enabled across the entire application.
+* `UIFeature.feedback` - Whether prompts to supply feedback are shown.
+* `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
+  Jitsi widgets will still work though they cannot easily be added.
+* `UIFeature.widgets` - Whether or not widgets will be shown.
+* `UIFeature.flair` - Whether or not community flair is shown in rooms.
+* `UIFeature.communities` - Whether or not to show any UI related to communities. Implicitly
+  disables `UIFeature.flair` when disabled.
+* `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
+  user settings are shown to the user.
+* `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog
+  is shown.
+* `UIFeature.shareSocial` - Whether or not the social icons on the share room/event dialog
+  are shown.
+* `UIFeature.identityServer` - Whether or not functionality requiring an identity server
+  is shown. When disabled, the user will not be able to interact with the identity
+  server (sharing email addresses, 3PID invites, etc).
+* `UIFeature.thirdPartyId` - Whether or not UI relating to third party identifiers (3PIDs)
+  is shown. Typically this is considered "contact information" on the homeserver, and is
+  not directly related to the identity server.
+* `UIFeature.registration` - Whether or not the registration page is accessible. Typically
+  useful if accounts are managed externally.
+* `UIFeature.passwordReset` - Whether or not the password reset page is accessible. Typically
+  useful if accounts are managed externally.
+* `UIFeature.deactivate` - Whether or not the deactivate account button is accessible. Typically
+  useful if accounts are managed externally.
+* `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
+  user.
--- a/docs/e2ee.md
+++ b/docs/e2ee.md
@@ -7,10 +7,57 @@ For private room creation, Element will default to encryption on but give you th

 Set the following on your homeserver's
 `/.well-known/matrix/client` config:
+
 ```json
 {
-  "im.vector.riot.e2ee": {
+  "io.element.e2ee": {
    "default": false
  }
 }
 ```
+
+# Secure backup
+
+By default, Element strongly encourages (but does not require) users to set up
+Secure Backup so that cross-signing identity key and message keys can be
+recovered in case of a disaster where you lose access to all active devices.
+
+## Requiring secure backup
+
+To require Secure Backup to be configured before Element can be used, set the
+following on your homeserver's `/.well-known/matrix/client` config:
+
+```json
+{
+  "io.element.e2ee": {
+    "secure_backup_required": true
+  }
+}
+```
+
+## Preferring setup methods
+
+By default, Element offers users a choice of a random key or user-chosen
+passphrase when setting up Secure Backup. If a homeserver admin would like to
+only offer one of these, you can signal this via the
+`/.well-known/matrix/client` config, for example:
+
+```json
+{
+  "io.element.e2ee": {
+    "secure_backup_setup_methods": ["passphrase"]
+  }
+}
+```
+
+The field `secure_backup_setup_methods` is an array listing the methods the
+client should display. Supported values currently include `key` and
+`passphrase`. If the `secure_backup_setup_methods` field is not present or
+exists but does not contain any supported methods, Element will fallback to the
+default value of: `["key", "passphrase"]`.
+
+# Compatibility
+
+The settings above were first proposed under a `im.vector.riot.e2ee` key, which
+is now deprecated. Element will check for either key, preferring
+`io.element.e2ee` if both exist.
--- a/docs/feature-flags.md
+++ b/docs/feature-flags.md
@@ -35,7 +35,7 @@ clients commit to doing the associated clean up work once a feature stabilises.
 When starting work on a feature, we should create a matching feature flag:

 1. Add a new
-   [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js)
+   [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
   of the form:
 ```js
    "feature_cats": {
@@ -47,17 +47,9 @@ When starting work on a feature, we should create a matching feature flag:
 ```
 2. Check whether the feature is enabled as appropriate:
 ```js
-    SettingsStore.isFeatureEnabled("feature_cats")
+    SettingsStore.getValue("feature_cats")
 ```
-3. Add the feature to the set of labs on
-   [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json)
-   and [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json):
-```json
-    "features": {
-        "feature_cats": "labs"
-    },
-```
-4. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+3. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)

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

 ## Enabling by default on develop and nightly

-Set the feature to `enable` in the
+Set the feature to `true` in the
 [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json)
 and
 [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json)
@@ -75,34 +67,37 @@ configs:

 ```json
    "features": {
-        "feature_cats": "enable"
+        "feature_cats": true
    },
 ```

 ## Enabling by default on staging, app, and release

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

-**Warning:** While this does mean the feature is enabled by default for
-https://app.element.io and official Element Desktop builds, it will not be enabled by
-default for self-hosted installs, custom desktop builds, etc. To cover those
-cases as well, the best options at the moment are converting to a regular
-setting defaulted on or to remove the flag. Simply enabling the existing flag by
-default in `Settings.js`
-[does not work currently](https://github.com/vector-im/riot-web/issues/10360).
+**Note:** The above will only enable the feature for https://app.element.io and official Element
+Desktop builds. It will not be enabled for self-hosted installed, custom desktop builds, etc. To
+cover these cases, change the setting's `default` in `Settings.ts` to `true`.

 ## Feature deployed successfully

-Once we're confident that a feature is working well, we should remove the flag:
+Once we're confident that a feature is working well, we should remove or convert the flag.

-1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js)
-2. Remove all `isFeatureEnabled` lines that test for the feature's setting
+If the feature is meant to be turned off/on by the user:
+1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
+2. Change the `default` to `true` (if desired).
 3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
-4. Remove feature state from
+4. Celebrate! 🥳
+
+If the feature is meant to be forced on (non-configurable):
+1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
+2. Remove all `getValue` lines that test for the feature.
+3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
+4. If applicable, remove the feature state from
   [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json),
   [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json),
   [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json),
@@ -110,26 +105,3 @@ Once we're confident that a feature is working well, we should remove the flag:
   [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json)
   configs
 5. Celebrate! 🥳
-
-## Convert to a regular setting (optional)
-
-Sometimes we decide a feature should always be user-controllable as a setting
-even after it has been fully deployed. In that case, we would craft a new,
-regular setting:
-
-1. Remove the feature flag from
-   [settings](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js)
-   and add a regular setting with the appropriate levels for your feature
-2. Replace the `isFeatureEnabled` lines with `getValue` or similar calls
-   according to the [settings
-   docs](https://github.com/matrix-org/matrix-react-sdk/blob/develop/docs/settings.md)
-   (checking carefully, as we may want a different mix of code paths when the
-   feature is always present but gated by a setting)
-3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
-4. Remove feature state from
-   [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json),
-   [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json),
-   [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json),
-   and
-   [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json)
-   configs
--- a/docs/jitsi.md
+++ b/docs/jitsi.md
@@ -50,7 +50,22 @@ default, and you are using riot-web 1.6 or newer, set the following on your home
 }
 ```

-## Mobile app support
+## Element Android
+
+Element Android (1.0.5+) supports custom Jitsi domains, similar to Element Web above.
+
+1:1 calls, or calls between you and one other person, do not use Jitsi. Instead, those
+calls work directly between clients or via TURN servers configured on the respective 
+homeservers.
+
+For rooms with more than 2 joined members, when creating a Jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using the [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) hosted on `app.element.io`.
+The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `config.xml` (jitsi.riot.im)
+
+For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data.
+
+Element Android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different and never shared with the widget URL). For Jitsi widgets, permissions are requested only once per domain (consent saved in account data).
+
+## Element iOS

 Currently the Element mobile apps do not support custom Jitsi servers and will instead
 use the default `jitsi.riot.im` server. When users on the mobile apps join the call,
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -94,3 +94,15 @@ adds an ability for end users to add themes themselves by using a URL to the JSO
 theme definition.

 For some sample themes, check out [aaronraimist/element-themes](https://github.com/aaronraimist/element-themes).
+
+## Message preview tweaks
+
+To enable message previews for reactions in all rooms, enable `feature_roomlist_preview_reactions_all`.
+To enable message previews for reactions in DMs, enable `feature_roomlist_preview_reactions_dms`, ignored when it is enabled for all rooms.
+
+## Communities v2 prototyping (`feature_communities_v2_prototypes`) [In Development]
+
+**This is a highly experimental implementation for parts of the communities v2 experience.** It does not
+represent what communities v2 will look/feel like and can/will change without notice. Due to the early
+stages this feature is in and the requirement for a compatible homeserver, we will not be accepting issues
+or feedback for this functionality at this time.
--- a/docs/review.md
+++ b/docs/review.md
@@ -14,6 +14,7 @@ When reviewing code, here are some things we look for and also things we avoid:
 * Performance
 * Accessibility
 * Security
+* Quality via automated and manual testing
 * Comments and documentation where needed
 * Sharing knowledge of different areas among the team
 * Ensuring it's something we're comfortable maintaining for the long term
@@ -34,6 +35,7 @@ When reviewing code, here are some things we look for and also things we avoid:
 * Reviewers should be explicit about required versus optional changes
  * Reviews are conversations and the PR author should feel comfortable
    discussing and pushing back on changes before making them
+* Reviewers are encouraged to ask for tests where they believe it is reasonable
 * Core team should lead by example through their tone and language
 * Take the time to thank and point out good code changes
 * Using softer language like "please" and "what do you think?" goes a long way
--- a/element.io/app/config.json
+++ b/element.io/app/config.json
@@ -11,13 +11,12 @@
        "https://scalar-staging.riot.im/scalar/api"
    ],
    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "features": {
-    },
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "showLabsSettings": false,
    "piwik": {
        "url": "https://piwik.riot.im/",
        "siteId": 1,
-        "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
+        "policyUrl": "https://element.io/cookie-policy"
    },
    "roomDirectory": {
        "servers": [
@@ -30,11 +29,11 @@
    },
    "terms_and_conditions_links": [
        {
-            "url": "https://riot.im/privacy",
+            "url": "https://element.io/privacy",
            "text": "Privacy Policy"
        },
        {
-            "url": "https://matrix.org/legal/riot-im-cookie-policy",
+            "url": "https://element.io/cookie-policy",
            "text": "Cookie Policy"
        }
    ]
--- a/element.io/develop/config.json
+++ b/element.io/develop/config.json
@@ -11,24 +11,12 @@
        "https://scalar-staging.riot.im/scalar/api"
    ],
    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "features": {
-        "feature_new_spinner": "labs",
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs",
-        "feature_many_integration_managers": "labs",
-        "feature_mjolnir": "labs",
-        "feature_dm_verification": "labs",
-        "feature_bridge_state": "labs",
-        "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs"
-    },
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "showLabsSettings": true,
    "piwik": {
        "url": "https://piwik.riot.im/",
        "siteId": 1,
-        "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
+        "policyUrl": "https://element.io/cookie-policy"
    },
    "roomDirectory": {
        "servers": [
@@ -41,11 +29,11 @@
    },
    "terms_and_conditions_links": [
        {
-            "url": "https://riot.im/privacy",
+            "url": "https://element.io/privacy",
            "text": "Privacy Policy"
        },
        {
-            "url": "https://matrix.org/legal/riot-im-cookie-policy",
+            "url": "https://element.io/cookie-policy",
            "text": "Cookie Policy"
        }
    ]
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "riot-web",
  "productName": "Riot",
-  "version": "1.7.3",
+  "version": "1.7.8-rc.1",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -59,13 +59,14 @@
    "browser-request": "^0.3.3",
    "gfm.css": "^1.1.2",
    "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "8.0.1",
-    "matrix-react-sdk": "3.1.0",
+    "jsrsasign": "^9.1.5",
+    "matrix-js-sdk": "8.4.0-rc.1",
+    "matrix-react-sdk": "3.5.0-rc.1",
    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
    "prop-types": "^15.7.2",
    "react": "^16.9.0",
    "react-dom": "^16.9.0",
-    "sanitize-html": "^1.19.1",
+    "sanitize-html": "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db",
    "ua-parser-js": "^0.7.19",
    "url": "^0.11.0"
  },
@@ -91,6 +92,7 @@
    "@types/node": "^12.12.41",
    "@types/react": "16.9",
    "@types/react-dom": "^16.9.4",
+    "@types/sanitize-html": "^1.23.3",
    "autoprefixer": "^9.7.3",
    "babel-eslint": "^10.0.3",
    "babel-jest": "^24.9.0",
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -21,6 +21,7 @@ const INCLUDE_LANGS = [
    {'value': 'en_US', 'label': 'English (US)'},
    {'value': 'eo', 'label': 'Esperanto'},
    {'value': 'es', 'label': 'Español'},
+    {'value': 'et', 'label': 'Eesti'},
    {'value': 'eu', 'label': 'Euskara'},
    {'value': 'fi', 'label': 'Suomi'},
    {'value': 'fr', 'label': 'Français'},
@@ -31,6 +32,7 @@ const INCLUDE_LANGS = [
    {'value': 'it', 'label': 'Italiano'},
    {'value': 'ja', 'label': '日本語'},
    {'value': 'jbo', 'label': 'banjubu\'o'},
+    {'value': 'kab', 'label': 'Taqbaylit'},
    {'value': 'ko', 'label': '한국어'},
    {'value': 'lt', 'label': 'Lietuvių'},
    {'value': 'lv', 'label': 'Latviešu'},
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -70,7 +70,6 @@ function dodep() {

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

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

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

 yarn link matrix-js-sdk

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

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

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

 yarn link matrix-react-sdk

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

 # Link the reskindex binary in place: if we used `yarn link`,
--- a/src/async-components/structures/CompatibilityView.tsx
+++ b/src/async-components/structures/CompatibilityView.tsx
@@ -78,17 +78,26 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                    <div>
                        <h2 id="step2_heading">Use Element on mobile</h2>
                        <p><strong>iOS</strong> (iPhone or iPad)</p>
-                        <a href="https://apps.apple.com/app/vector/id1083446067" target="_blank"
-                           className="mx_ClearDecoration">
+                        <a
+                            href="https://apps.apple.com/app/vector/id1083446067"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
                            <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
                        </a>
                        <p className="mx_Spacer"><strong>Android</strong></p>
-                        <a href="https://play.google.com/store/apps/details?id=im.vector.app" target="_blank"
-                           className="mx_ClearDecoration">
+                        <a
+                            href="https://play.google.com/store/apps/details?id=im.vector.app"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
                            <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
                        </a>
-                        <a href="https://f-droid.org/repository/browse/?fdid=im.vector.alpha" target="_blank"
-                           className="mx_ClearDecoration">
+                        <a
+                            href="https://f-droid.org/repository/browse/?fdid=im.vector.app"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
                            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
                        </a>
                    </div>
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1,35 +1,36 @@
 {
-    "Dismiss": "تجاهل",
+    "Dismiss": "أهمِل",
    "Unknown device": "جهاز مجهول",
-    "You need to be using HTTPS to place a screen-sharing call.": "تحتاج الى استخدام الاتصال الآمن (HTTPS) للسماح بمشاركة الشاشة.",
+    "You need to be using HTTPS to place a screen-sharing call.": "عليك استعمال ميفاق HTTPS للاتصال بمشاركة الشاشة.",
    "powered by Matrix": "مشغل بواسطة Matrix",
-    "Welcome to Element": "مرحبا بك في Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "دردشة مشفرة غير مركزية  &amp;تطبيق تعاوني مدعوم بواسطة [matrix]",
-    "Create Account": "انشاء حساب",
-    "Explore rooms": "استكشف غرف المحادثات",
-    "Sign In": "الدخول",
-    "Missing indexeddb worker script!": "منفذ السكريبت الخاص ب Indexeddb غير موجود!",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "خطأ في الاعدادات: يمكنك فقط تحديد واحد فقط من: default_server_config، default_server_name، أو default_hs_url.",
-    "Invalid configuration: no default server specified.": "اعدادات خاطئة: لم يتم تحديد السيرفر الافتراضي.",
-    "Your Element is misconfigured": "تطبيقك معد بطريقة خاطئة",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "اعداداتك تحتوى على بنية JSON غير صحيحة. يرجى تصحيح المشكلة واعادة تحديث الصفحة.",
-    "The message from the parser is: %(message)s": "الرسالة من المدقق هي:%(message)s",
-    "Invalid JSON": "JSON خاطئ",
-    "Unable to load config file: please refresh the page to try again.": "لم نستطع تحميل ملف الاعداد: يرجى تحديث الصفحة للمحاولة مرة اخرى.",
-    "Unexpected error preparing the app. See console for details.": "حدث خطأ غير متوقع عند تجهيز التطبيق. انظر الى منصة التحكم للمزيد من التفاصيل.",
-    "Download Completed": "تم اكتمال التحميل",
-    "Open": "فتح",
-    "Open user settings": "فتح اعدادات المستخدم",
-    "Previous/next recently visited room or community": "السابقة/اللاحقة الغرفة او المجتمع الذي تمت زيارته مؤخرا",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s سطح المكتب (%(platformName)s)",
-    "Go to your browser to complete Sign In": "اذهب الى المتصفح لاكمال تسجيل الدخول",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Unsupported browser": "متصفح غير متوافق",
-    "Your browser can't run %(brand)s": "متصفحك لايمكنه تشغيل %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s يستخدم مزايا المتصفح المتقدمة والتي لا يدعمها متصفحك الحالي.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "يرجى تثبيت <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "يمكنك الاستمرار في استخدام متصفحك الحالي، ولكن بعض او كل المزايا ربما لا تعمل ويكون شكل التطبيق وشعورك تجاهه غير صحيح.",
-    "I understand the risks and wish to continue": "ادرك المخاطر وارغب في الاستمرار",
-    "Go to element.io": "اذهب الى Element.io",
-    "Failed to start": "فشل الاقلاع"
+    "Welcome to Element": "مرحبًا بك في Element",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "دردشة وتعاون غير مركزي معمّى، تدعمه [matrix]",
+    "Create Account": "أنشِئ حسابًا",
+    "Explore rooms": "استكشِف الغرف",
+    "Sign In": "لِج",
+    "Missing indexeddb worker script!": "سكربت عامل indexeddb ناقص!",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "الضبط غير صالح: يمكنك تحديد واحدًا من الآتي فقط: default_server_config أو default_server_name أو default_hs_url.",
+    "Invalid configuration: no default server specified.": "الضبط غير صالح: لم تحدّد خادومًا مبدئيًا.",
+    "Your Element is misconfigured": "لم يُضبط تطبيق Element كما ينبغي",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "يحتوي ضبط تطبيق Element على تنسيق JSON غير صالح. من فضلك صحّح المشكلة وأعِد تحميل الصفحة.",
+    "The message from the parser is: %(message)s": "الرسالة القادمة من المحلّل: %(message)s",
+    "Invalid JSON": "تنسيق JSON غير صالح",
+    "Unable to load config file: please refresh the page to try again.": "تعذّر تحميل ملف الضبط: من فضلك أنعِش الصفحة لمعاودة المحاولة.",
+    "Unexpected error preparing the app. See console for details.": "حدث عُطل غير متوقع أثناء تجهيز التطبيق. طالِع المِعراض للتفاصيل.",
+    "Download Completed": "اكتمل التنزيل",
+    "Open": "افتح",
+    "Open user settings": "افتح إعدادات المستخدم",
+    "Previous/next recently visited room or community": "الغرفة أو المجتمع التالي/السابق الذي زرته حديثًا",
+    "%(brand)s Desktop (%(platformName)s)": "‏‏%(brand)s لسطح المكتب (%(platformName)s)",
+    "Go to your browser to complete Sign In": "افتح المتصفح لإكمال الولوج",
+    "%(appName)s (%(browserName)s, %(osName)s)": "‏‏%(appName)s (‏‏%(browserName)s، ‏‏%(osName)s)",
+    "Unsupported browser": "متصفح غير مدعوم",
+    "Your browser can't run %(brand)s": "لا يمكن لمتصفحك تشغيل %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "يستعمل %(brand)s ميزات متقدمة في المتصفحات لا يدعمها متصفحك الحالي.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "من فضلك ثبّت <chromeLink>كروم</chromeLink> أو <firefoxLink>فَيَرفُكس</firefoxLink> أو <safariLink>سفاري</safariLink> لأفضل تجربة.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "يمكنك مواصل استعمال متصفحك الحالي ولكن قد لا تعمل بعض المزايا (أو كلها) وقد لا يظهر التطبيق كما ينبغي له أن يظهر.",
+    "I understand the risks and wish to continue": "أفهم المخاطرة وأود المواصلة",
+    "Go to element.io": "انتقل إلى element.io",
+    "Failed to start": "فشل البدء",
+    "Powered by Matrix": "تدعمه «ماترِكس»"
 }
--- a/src/i18n/strings/bs.json
+++ b/src/i18n/strings/bs.json
@@ -1 +1,35 @@
-{}
+{
+    "Missing indexeddb worker script!": "Nedostaje indexeddb radna skripta!",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neispravna konfiguracija: navesti se samo može jedan od default_server_config, default_server_name ili default_hs_url.",
+    "Invalid configuration: no default server specified.": "Neispravna konfiguracija: nije naveden zadani server.",
+    "Your Element is misconfigured": "Vaš element je pogrešno konfiguriran",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracija vašeg elementa sadrži nevažeći JSON. Ispravite problem i ponovo učitajte stranicu.",
+    "The message from the parser is: %(message)s": "Poruka parsera je: %(message)s",
+    "Invalid JSON": "Nevažeći JSON",
+    "Unable to load config file: please refresh the page to try again.": "Nije moguće učitati konfiguracijsku datoteku: osvježite stranicu i pokušajte ponovo.",
+    "Unexpected error preparing the app. See console for details.": "Neočekivana greška prilikom pripreme aplikacije. Pogledajte konzolu za detalje.",
+    "Download Completed": "Preuzimanje završeno",
+    "Open": "Otvori",
+    "Dismiss": "Odbaci",
+    "Open user settings": "Otvori korisničke postavke",
+    "Previous/next recently visited room or community": "Prethodna / sljedeća nedavno posjećena soba ili zajednica",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Radna povrsina (%(platformName)s)",
+    "Go to your browser to complete Sign In": "Idite na svoj pretraživač da biste dovršili prijavu",
+    "Unknown device": "Nepoznat uređaj",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "You need to be using HTTPS to place a screen-sharing call.": "Morate koristiti HTTPS za upućivanje poziva za dijeljenje ekrana.",
+    "Powered by Matrix": "Pokretano uz Matrix",
+    "Unsupported browser": "Nepodržani pretraživač",
+    "Your browser can't run %(brand)s": "Vaš pretraživač ne može pokretati %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s koristi napredne funkcije pretraživača koje vaš trenutni pretraživač ne podržava.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Molimo instalirajte <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ili <safariLink>Safari</safariLink> za najbolje iskustvo.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Možete nastaviti koristiti svoj trenutni pretraživač, ali neke ili sve funkcije možda neće raditi, a izgled i dojam aplikacije mogu biti neispravani.",
+    "I understand the risks and wish to continue": "Razumijem rizike i želim nastaviti",
+    "Go to element.io": "Idite na element.io",
+    "Failed to start": "Pokretanje nije uspjelo",
+    "Welcome to Element": "Dobrodošli u Element",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizirani, šifrirani razgovor &amp; suradnja pokrenuta [matrix]",
+    "Sign In": "Prijavite se",
+    "Create Account": "Otvori račun",
+    "Explore rooms": "Istražite sobe"
+}
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1,6 +1,6 @@
 {
    "powered by Matrix": "betrieben mit Matrix",
-    "Dismiss": "Ablehnen",
+    "Dismiss": "Ausblenden",
    "Unknown device": "Unbekanntes Gerät",
    "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.",
    "Welcome to Element": "Willkommen bei Element",
@@ -15,8 +15,8 @@
    "Invalid JSON": "Ungültiges JSON",
    "Go to your browser to complete Sign In": "Gehe zu deinem Browser, um die Anmeldung abzuschließen",
    "Open user settings": "Öffne Nutzer-Einstellungen",
-    "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisieren Sie die Seite, um es erneut zu versuchen.",
-    "Missing indexeddb worker script!": "Indexeddb worker Skript fehlt!",
+    "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisiere die Seite, um es erneut zu versuchen.",
+    "Missing indexeddb worker script!": "Fehlendes indexeddb Worker-Skript!",
    "Previous/next recently visited room or community": "Vorheriger/nächster kürzlich besuchter Raum oder Community",
    "Unsupported browser": "Nicht unterstützter Browser",
    "Go to element.io": "Gehe zu element.io",
@@ -29,8 +29,8 @@
    "Your Element is misconfigured": "Dein Element ist fehlkonfiguriert",
    "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",
-    "Open": "Offen",
+    "Open": "Öffnen",
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von Ihrem aktuellen Browser nicht unterstützt werden.",
    "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
-    "Powered by Matrix": "Powered by Matrix"
+    "Powered by Matrix": "Betrieben mit Matrix"
 }
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -10,7 +10,11 @@
    "The message from the parser is: %(message)s": "Το μήνυμα από τον αναλυτή είναι: %(message)s",
    "Invalid JSON": "Μη έγκυρο JSON",
    "Unexpected error preparing the app. See console for details.": "Απρόοπτο σφάλμα κατά την προετοιμασία της εφαρμογής. Δείτε το τερματικό για λεπτομέρειες.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Μη έγκυρη ρύθμιση παραμέτρων: δυνατότητα ορισμού μόνο ένα από τα default_server_config, default_server_name, ή default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Μη έγκυρη ρύθμιση: δυνατότητα ορισμού μόνο ένα από τα default_server_config, default_server_name, ή default_hs_url.",
    "Invalid configuration: no default server specified.": "Μη έγκυρη ρύθμιση παραμέτρων: δεν έχει οριστεί προκαθορισμένος διακομιστής.",
-    "Explore rooms": "Εξερευνήστε δωμάτια"
+    "Explore rooms": "Εξερευνήστε δωμάτια",
+    "Open": "Άνοιγμα",
+    "Go to your browser to complete Sign In": "Επισκεφτείτε τον browser σας για να ολοκληρωθεί η είσοδος",
+    "Powered by Matrix": "Παρέχεται από το Matrix",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Παρακαλούμε εγκαταστήστε <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ή <safariLink>Safari</safariLink> για καλύτερη εμπειρία χρήσης."
 }
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -4,7 +4,7 @@
    "powered by Matrix": "con el poder de Matrix",
    "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
    "Welcome to Element": "Bienvenido a Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas &amp; colaboración impulsada por [matrix]",
    "Sign In": "Iniciar sesión",
    "Create Account": "Crear cuenta",
    "Explore rooms": "Explorar salas",
@@ -15,10 +15,10 @@
    "Invalid JSON": "JSON inválido",
    "Open user settings": "Abrir opciones de usuario",
    "Go to your browser to complete Sign In": "Abre tu navegador web para completar el registro",
-    "Missing indexeddb worker script!": "¡Worker script “indexeddb” faltante!",
+    "Missing indexeddb worker script!": "Falta el script de trabajo indexeddb!",
    "Unable to load config file: please refresh the page to try again.": "No se ha podido cargar el archivo de configuración. Recarga la página para intentar nuevamente.",
    "Previous/next recently visited room or community": "Anterior/siguiente sala o comunidad visitada recientemente",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Escritorio (%(platformName)s)",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Navegador no soportado",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Por favor, instale <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> para la mejor experiencia.",
@@ -26,10 +26,11 @@
    "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
    "Go to element.io": "Ir a element.io",
    "Failed to start": "Fallo al iniciar",
-    "Your Element is misconfigured": "Su Element está mal configurado",
+    "Your Element is misconfigured": "Tu elemento está mal configurado",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Su configuración de Element contiene JSON inválido. Por favor corríjalo e inténtelo de nuevo.",
    "Download Completed": "Descarga completada",
    "Open": "Abrir",
-    "Your browser can't run %(brand)s": "Su navegador es compatible con %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza funciones avanzadas no soportadas por su navegador."
+    "Your browser can't run %(brand)s": "Su navegador es incompatible con %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.",
+    "Powered by Matrix": "Desarrollado por Matrix"
 }
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -31,5 +31,6 @@
    "Your Element is misconfigured": "Votre Element est mal configuré",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuration de votre Element contient du JSON invalide. Veuillez corriger le problème et recharger la page.",
    "Your browser can't run %(brand)s": "Votre navigateur ne peut pas exécuter %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne supporte pas."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s nécessite des fonctionnalités avancées que votre navigateur actuel ne supporte pas.",
+    "Powered by Matrix": "Propulsé par Matrix"
 }
--- a/src/i18n/strings/kab.json
+++ b/src/i18n/strings/kab.json
@@ -31,5 +31,6 @@
    "Download Completed": "Asider yemmed",
    "Open": "Ldi",
    "Your browser can't run %(brand)s": "Iminig-inek·inem ur isselkan ara %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s isseqdac timahilin n yiminig leqqayen ur yessefrak ara yiminig-ik·im amiran."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s isseqdac timahilin n yiminig leqqayen ur yessefrak ara yiminig-ik·im amiran.",
+    "Powered by Matrix": "Iteddu s lmendad n Matrix"
 }
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -2,19 +2,19 @@
    "Dismiss": "Descartar",
    "powered by Matrix": "oferecido por Matrix",
    "Unknown device": "Aparelho desconhecido",
-    "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Você precisa usar HTTPS para compartilhar a tela durante uma chamada.",
    "Welcome to Element": "Seja bem-vinda(o) a Element",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo construído com [matrix]",
    "Sign In": "Entrar",
    "Create Account": "Criar Conta",
-    "Explore rooms": "Explore as salas",
+    "Explore rooms": "Explorar salas",
    "The message from the parser is: %(message)s": "A mensagem do parser é: %(message)s",
    "Invalid JSON": "JSON inválido",
    "Unexpected error preparing the app. See console for details.": "Erro inesperado preparando o aplicativo. Veja o console para mais detalhes.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: somente se pode especificar um valor entre default_server_config, default_server_name, ou default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuração inválida: você só pode especificar um valor dentre default_server_config, default_server_name, ou default_hs_url.",
    "Invalid configuration: no default server specified.": "Configuração inválida: servidor padrão não especificado.",
    "Unable to load config file: please refresh the page to try again.": "Não foi possível carregar o arquivo de configuração: por favor, atualize a página para tentar novamente.",
-    "Download Completed": "Download Concluído",
+    "Download Completed": "Download concluído",
    "Open user settings": "Abrir configurações do usuário",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Navegador não suportado",
@@ -26,11 +26,11 @@
    "Missing indexeddb worker script!": "O script indexeddb não foi encontrado!",
    "Open": "Abrir",
    "Previous/next recently visited room or community": "Anterior/Próxima sala ou comunidade visitada recentemente",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s para Computador (%(platformName)s)",
    "Go to your browser to complete Sign In": "Vá para o seu navegador para concluir o login",
    "Your Element is misconfigured": "Seu Element está desconfigurado",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração do Element contém JSON inválido. Por favor, corrija o problema e recarregue a página.",
-    "Your browser can't run %(brand)s": "Seu navegador não consegue rodar %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidades avançadas de navegador que não são suportadas pelo seu navegador atual.",
+    "Your browser can't run %(brand)s": "Seu navegador não consegue rodar o %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa recursos avançados que não são suportados pelo seu navegador de internet atual.",
    "Powered by Matrix": "Construído com tecnologia Matrix"
 }
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -29,7 +29,8 @@
    "Download Completed": "Preberanie dokončené",
    "Open": "Otvoriť",
    "Your Element is misconfigured": "Váš Element je nesprávne nastavený",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávne JSON. Prosím, opravte chybu a obnovte stránku.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Vaša konfigurácia Elementu obsahuje nesprávny údaj JSON. Prosím, opravte chybu a obnovte stránku.",
    "Your browser can't run %(brand)s": "Váš prehliadač nerozbehne %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom."
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom.",
+    "Powered by Matrix": "používa protokol Matrix"
 }
--- a/src/i18n/strings/sl.json
+++ b/src/i18n/strings/sl.json
@@ -7,5 +7,30 @@
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizirano šifrirano sporočanje &amp; sodelovanje s pomočjo [matrix]",
    "Sign In": "Prijava",
    "Create Account": "Registracija",
-    "Explore rooms": "Raziščite sobe"
+    "Explore rooms": "Raziščite sobe",
+    "Missing indexeddb worker script!": "Manjka skript za IndexDB!",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neveljavna konfiguracija: lahko izberete samo eno izmed default_server_config, default_server_name ali default_hs_url.",
+    "Invalid configuration: no default server specified.": "Neveljavna konfiguracija: privzeti strežnik ni nastavljen.",
+    "Your Element is misconfigured": "Vaš Element je napačno nastavljen",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracije vašega Elementa vsebujejo neveljaven JSON. Prosim, popravite napako in znova naložite stran.",
+    "The message from the parser is: %(message)s": "Sporočilo parserja je: %(message)s",
+    "Invalid JSON": "Neveljaven JSON",
+    "Unable to load config file: please refresh the page to try again.": "Ni uspelo naložiti konfiguracijske datoteke: prosim, ponovno naložite stran.",
+    "Unexpected error preparing the app. See console for details.": "Nepričakovana napaka pri pripravi aplikacije: Za več poglejte konzolo.",
+    "Download Completed": "Prenos zaključen",
+    "Open": "Odpri",
+    "Open user settings": "Odpri uporabniške nastavitve",
+    "Previous/next recently visited room or community": "Prejšnja/naslednja soba ali skupnost, ki je bila pred kratkim odprta",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s namizje za (%(platformName)s)",
+    "Go to your browser to complete Sign In": "Nadaljujte s prijavo v spletnem brskalniku",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
+    "Powered by Matrix": "Poganja Matrix",
+    "Unsupported browser": "Nepodprt brskalnik",
+    "Your browser can't run %(brand)s": "Vaš brskalnik ne more poganjati %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uporablja napredne lastnosti brskalnika, ki jih vaš trenutni brskalnik ne podpira.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Za najboljšo izkušnjo, prosim namestite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ali <safariLink>Safari</safariLink>.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Lahko nadaljujete z uporabo vašega trenutnega brskalnika, vendar lahko to privede do manjkajočih funkcionalnosti ali napačnega izgleda aplikacije.",
+    "I understand the risks and wish to continue": "Razumem riziko in želim vseeno nadaljevati",
+    "Go to element.io": "Pojdi na element.io",
+    "Failed to start": "Neuspel zagon"
 }
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -4,26 +4,33 @@
    "Unknown device": "Okänd enhet",
    "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att ringa med skärmdelning.",
    "Welcome to Element": "Välkommen till Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentraliserad, krypterad chatt &amp; samarbetsplattform möjliggjort med [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentraliserad, krypterad chatt &amp; samarbetsplattform baserad på [matrix]",
    "Sign In": "Logga in",
    "Create Account": "Skapa konto",
    "Explore rooms": "Utforska rum",
-    "The message from the parser is: %(message)s": "Medelandet från parsern är: %(message)s",
+    "The message from the parser is: %(message)s": "Meddelandet från parsern är: %(message)s",
    "Invalid JSON": "Ogiltig JSON",
-    "Unexpected error preparing the app. See console for details.": "Oväntat fel vid appstart. Se konsollen för mer information.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ogilitiga inställningar: enbart möjligt att specificera en default_config, default_server, eller default_hs_url.",
-    "Invalid configuration: no default server specified.": "Ogilitiga inställningar: ingen standardserver specificerad.",
+    "Unexpected error preparing the app. See console for details.": "Oväntat fel vid appstart. Se konsolen för mer information.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ogiltiga inställningar: det är enbart möjligt att specificera en default_config, default_server, eller default_hs_url.",
+    "Invalid configuration: no default server specified.": "Ogiltiga inställningar: ingen standardserver specificerad.",
    "Open user settings": "Öppna användarinställningar",
    "Go to your browser to complete Sign In": "Gå till din webbläsare för att slutföra inloggningen",
-    "Missing indexeddb worker script!": "Saknar indexeddb worker skript!",
-    "Unable to load config file: please refresh the page to try again.": "Kan inte ladda konfigurationsfilen: var god ladda om sidan för att försöka igen.",
-    "Previous/next recently visited room or community": "Föregående/nästa nyligen besökt rum eller community",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
+    "Missing indexeddb worker script!": "Saknar IndexedDB-workerscript!",
+    "Unable to load config file: please refresh the page to try again.": "Kan inte ladda konfigurationsfilen: ladda om sidan för att försöka igen.",
+    "Previous/next recently visited room or community": "Föregående/nästa nyligen besökt rum eller gemenskap",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s skrivbord (%(platformName)s)",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Unsupported browser": "Webbläsaren stöds ej",
    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installera <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> för den bästa upplevelsen.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kan fortsätta använda din nuvarande webbläsare, men vissa eller alla funktioner kanske inte fungerar och uteseendet samt känslan av applikationen kan var felaktig.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kan fortsätta använda din nuvarande webbläsare, men vissa eller alla funktioner kanske inte fungerar och utseendet och känslan av applikationen kan var felaktig.",
    "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta",
    "Go to element.io": "Gå till element.io",
-    "Failed to start": "Misslyckade att starta"
+    "Failed to start": "Misslyckade att starta",
+    "Your Element is misconfigured": "Din Element är felkonfigurerad",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Elementkonfiguration innehåller ogiltig JSON. Vänligen rätta till problemet och ladda om sidan.",
+    "Download Completed": "Nedladdning slutförd",
+    "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."
 }
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -8,9 +8,9 @@
    "Sign In": "Увійти",
    "Create Account": "Створити обліковий запис",
    "Explore rooms": "Шукати кімнати",
-    "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при підготовці програми. Дивіться деталі у виводі консолі.",
+    "Unexpected error preparing the app. See console for details.": "Неочікувана помилка при готуванні програми. Дивіться деталі у виводі консолі.",
    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Невірна конфігурація: можна вказати лише default_server_config, default_server_name або default_hs_url.",
-    "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано сервер за замовчуванням.",
+    "Invalid configuration: no default server specified.": "Невірна конфігурація: не вказано усталений сервер.",
    "The message from the parser is: %(message)s": "Аналізатор повідомляє: %(message)s",
    "Invalid JSON": "Хибний JSON",
    "Unsupported browser": "Непідтримуваний переглядач",
@@ -28,7 +28,7 @@
    "Open user settings": "Відкрити користувацькі налаштування",
    "Previous/next recently visited room or community": "Попередня/наступна нещодавно відвідана кімната чи спільнота",
    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "Go to your browser to complete Sign In": "Відкрийте переглядач щоб завершити входження",
+    "Go to your browser to complete Sign In": "Перейдіть у ваш переглядач щоб завершити входження",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
    "Powered by Matrix": "Працює на Matrix",
    "Your browser can't run %(brand)s": "Ваш переглядач неспроможний запустити %(brand)s",
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -7,7 +7,7 @@
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化、加密聊天&amp;与协作，由 [matrix] 驱动",
    "Sign In": "登入",
    "Create Account": "创建帐号",
-    "Explore rooms": "探索房间",
+    "Explore rooms": "探索聊天室",
    "The message from the parser is: %(message)s": "语法分析器的信息：%(message)s",
    "Invalid JSON": "无效的 JSON",
    "Unexpected error preparing the app. See console for details.": "软件准备时出错，详细信息请查看控制台。",
--- a/src/vector/app.tsx
+++ b/src/vector/app.tsx
@@ -71,11 +71,16 @@ function onHashChange(ev: HashChangeEvent) {

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

 // We use this to work out what URL the SDK should
--- a/src/vector/init.tsx
+++ b/src/vector/init.tsx
@@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import olmWasmPath from "olm/olm.wasm";
 import Olm from 'olm';
@@ -127,6 +128,7 @@ export async function loadSkin() {
        import(
            /* webpackChunkName: "riot-web-component-index" */
            /* webpackPreload: true */
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
            // @ts-ignore - this module is generated so may fail lint
            "../component-index"),
    ]);
--- a/src/vector/jitsi/index.html
+++ b/src/vector/jitsi/index.html
@@ -11,7 +11,9 @@
        <div class="joinConferencePrompt">
            <!-- TODO: i18n -->
            <h2>Jitsi Video Conference</h2>
-            <button type="button" id="joinButton">Join Conference</button>
+            <div id="widgetActionContainer">
+                <button type="button" id="joinButton">Join Conference</button>
+            </div>
        </div>
    </div>
 </div>
--- a/src/vector/jitsi/index.ts
+++ b/src/vector/jitsi/index.ts
@@ -18,7 +18,10 @@ limitations under the License.
 require("./index.scss");

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

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

 let widgetApi: WidgetApi;

@@ -69,40 +74,118 @@ let widgetApi: WidgetApi;
        displayName = qsParam('displayName', true);
        avatarUrl = qsParam('avatarUrl', true); // http not mxc
        userId = qsParam('userId');
+        jitsiAuth = qsParam('auth', true);
+        roomId = qsParam('roomId', true);

        if (widgetApi) {
            await widgetApi.waitReady();
            await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen
+
+            // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
+            if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
+                // Request credentials, give callback to continue when received
+                widgetApi.requestOpenIDCredentials(credentialsResponseCallback);
+            } else {
+                enableJoinButton();
+            }
+            // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795)
+        } else {
+            enableJoinButton();
        }
-
-        // TODO: register widgetApi listeners for PTT controls (https://github.com/vector-im/riot-web/issues/12795)
-
-        document.getElementById("joinButton").onclick = () => joinConference();
    } catch (e) {
        console.error("Error setting up Jitsi widget", e);
-        document.getElementById("jitsiContainer").innerText = "Failed to load Jitsi widget";
-        switchVisibleContainers();
+        document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget";
    }
 })();

+/**
+ * Enable or show error depending on what the credentials response is.
+ */
+function credentialsResponseCallback() {
+    if (widgetApi.openIDCredentials) {
+        console.info('Successfully got OpenID credentials.');
+        enableJoinButton();
+    } else {
+        console.warn('OpenID credentials request was blocked by user.');
+        document.getElementById("widgetActionContainer").innerText = "Failed to load Jitsi widget";
+    }
+}
+
+function enableJoinButton() {
+    document.getElementById("joinButton").onclick = () => joinConference();
+}
+
 function switchVisibleContainers() {
    inConference = !inConference;
    document.getElementById("jitsiContainer").style.visibility = inConference ? 'unset' : 'hidden';
    document.getElementById("joinButtonContainer").style.visibility = inConference ? 'hidden' : 'unset';
 }

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

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

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

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

        document.getElementById("jitsiContainer").innerHTML = "";
    });
--- a/src/vector/mobile_guide/index.html
+++ b/src/vector/mobile_guide/index.html
@@ -260,7 +260,7 @@ body {
                        </g>
                    </g>
                </svg>
-              <a href="https://f-droid.org/repository/browse/?fdid=im.vector.alpha" target="_blank" class="mx_ClearDecoration">
+              <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>
                    <defs>
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -27,7 +27,7 @@ import BaseEventIndexManager, {
    MatrixEvent,
    MatrixProfile,
    SearchArgs,
-    SearchResult
+    SearchResult,
 } from 'matrix-react-sdk/src/indexing/BaseEventIndexManager';
 import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
 import {_t, _td} from 'matrix-react-sdk/src/languageHandler';
@@ -99,7 +99,7 @@ interface IPCPayload {

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

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

@@ -374,10 +374,6 @@ export default class ElectronPlatform extends VectorBasePlatform {
        ipcRenderer.send('loudNotification');
    }

-    clearNotification(notif: Notification) {
-        notif.close();
-    }
-
    async getAppVersion(): Promise<string> {
        return this._ipcCall('getAppVersion');
    }
--- a/src/vector/rageshakesetup.ts
+++ b/src/vector/rageshakesetup.ts
@@ -51,12 +51,18 @@ export function initRageshake() {
 }

 window.mxSendRageshake = function(text: string, withLogs?: boolean) {
+    const url = SdkConfig.get().bug_report_endpoint_url;
+    if (!url) {
+        console.error("Cannot send a rageshake - no bug_report_endpoint_url configured");
+        return;
+    }
+
    if (withLogs === undefined) withLogs = true;
    if (!text || !text.trim()) {
        console.error("Cannot send a rageshake without a message - please tell us what went wrong");
        return;
    }
-    sendBugReport(SdkConfig.get().bug_report_endpoint_url, {
+    sendBugReport(url, {
        userText: text,
        sendLogs: withLogs,
        progressCallback: console.log.bind(console),
--- a/src/vector/static/incompatible-browser.html
+++ b/src/vector/static/incompatible-browser.html
@@ -339,7 +339,7 @@
                        </g>
                    </svg>
                </a>
-                <a href="https://f-droid.org/repository/browse/?fdid=im.vector.alpha" target="_blank"
+                <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">
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,11 @@
      "node",
      "react",
      "flux"
+    ],
+    "lib": [
+      "es2019",
+      "dom",
+      "dom.iterable"
    ]
  },
  "include": [
--- a/yarn.lock
+++ b/yarn.lock
@@ -2879,6 +2879,11 @@ color@^3.0.0:
    color-convert "^1.9.1"
    color-string "^1.5.2"

+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 combined-stream@^1.0.6, combined-stream@~1.0.6:
  version "1.0.8"
  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3160,15 +3165,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
    safe-buffer "^5.0.1"
    sha.js "^2.4.8"

-create-react-class@^15.6.3:
-  version "15.6.3"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
-  integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==
-  dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
 cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
  version "6.0.5"
  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3531,6 +3527,11 @@ deep-is@^0.1.3, deep-is@~0.1.3:
  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=

+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
 default-gateway@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -4019,6 +4020,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=

+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^1.11.0, escodegen@^1.9.1:
  version "1.14.2"
  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz#14ab71bf5026c2aa08173afba22c6f3173284a84"
@@ -4688,7 +4694,7 @@ fbjs@0.1.0-alpha.7:
    promise "^7.0.3"
    whatwg-fetch "^0.9.0"

-fbjs@^0.8.4, fbjs@^0.8.9:
+fbjs@^0.8.4:
  version "0.8.17"
  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
@@ -6196,6 +6202,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
  dependencies:
    isobject "^3.0.1"

+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-posix-bracket@^0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -6914,6 +6925,11 @@ jsprim@^1.2.2:
    json-schema "0.2.3"
    verror "1.10.0"

+jsrsasign@^9.1.5:
+  version "9.1.5"
+  resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-9.1.5.tgz#fe286425d2c05b2d0865d24ded53e34b12abd2ca"
+  integrity sha512-iJLF8FvZHlwyQudrRtQomHj1HdPAcM8QSRTt0FJo8a6iFgaGCpKUrE7lWyELpAjrFs8jUC/Azc0vfhlj3yqHPQ==
+
 jsx-ast-utils@^2.2.3:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz#edd727794ea284d7fda575015ed1b0cde0289ab6"
@@ -6971,6 +6987,11 @@ kleur@^3.0.3:
  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==

+klona@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
+  integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
+
 known-css-properties@^0.17.0:
  version "0.17.0"
  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.17.0.tgz#1c535f530ee8e9e3e27bb6a718285780e1d07326"
@@ -7024,6 +7045,14 @@ levn@^0.4.1:
    prelude-ls "^1.2.1"
    type-check "~0.4.0"

+line-column@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
+  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
+  dependencies:
+    isarray "^1.0.0"
+    isobject "^2.0.0"
+
 lines-and-columns@^1.1.6:
  version "1.1.6"
  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -7186,7 +7215,7 @@ longest-streak@^2.0.1:
  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==

-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -7312,10 +7341,10 @@ mathml-tag-names@^2.1.1:
  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==

-matrix-js-sdk@8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e"
-  integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA==
+matrix-js-sdk@8.4.0-rc.1:
+  version "8.4.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.4.0-rc.1.tgz#9547e6d0088ec22fc6463c3144aee8c03266c215"
+  integrity sha512-u5I8OesrGePVj+NoZByXwV4QBujrMPb4BlKWII4VscvVitLoD/iuz9beNvic3esNF8U3ruWVDcOwA0XQIoumQQ==
  dependencies:
    "@babel/runtime" "^7.8.3"
    another-json "^0.2.0"
@@ -7335,10 +7364,10 @@ matrix-mock-request@^1.2.3:
    bluebird "^3.5.0"
    expect "^1.20.2"

-matrix-react-sdk@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0.tgz#d8349942e6aa705195b30415c96d7576b783f011"
-  integrity sha512-LNSm4gX+c9Z2z39QyaQTSZmIAEI5nmIZ7uVq2X3ktn0NwmGwTcvC983t68ooHmIzAqVmh4JrscgzmdvPqk/YPw==
+matrix-react-sdk@3.5.0-rc.1:
+  version "3.5.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.5.0-rc.1.tgz#215de18f11e40617f62f48eed2ddca0a5fdcb54c"
+  integrity sha512-MGQEnd+7yYPUYDcAM1Ye5RcUHuQYyJjMFwA1dFAjJrgO6aq75vVB3UNuoMz1bGxP0C+hmDJtrHxEMEN72XXJeg==
  dependencies:
    "@babel/runtime" "^7.10.5"
    await-lock "^2.0.1"
@@ -7348,7 +7377,6 @@ matrix-react-sdk@3.1.0:
    classnames "^2.2.6"
    commonmark "^0.29.1"
    counterpart "^0.18.6"
-    create-react-class "^15.6.3"
    diff-dom "^4.1.6"
    diff-match-patch "^1.0.5"
    emojibase-data "^5.0.1"
@@ -7366,7 +7394,7 @@ matrix-react-sdk@3.1.0:
    is-ip "^2.0.0"
    linkifyjs "^2.1.9"
    lodash "^4.17.19"
-    matrix-js-sdk "8.0.1"
+    matrix-js-sdk "8.4.0-rc.1"
    minimist "^1.2.5"
    pako "^1.0.11"
    parse5 "^5.1.1"
@@ -7382,7 +7410,9 @@ matrix-react-sdk@3.1.0:
    react-focus-lock "^2.4.1"
    react-transition-group "^4.4.1"
    resize-observer-polyfill "^1.5.1"
-    sanitize-html "^1.27.1"
+    rfc4648 "^1.4.0"
+    sanitize-html "github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db"
+    tar-js "^0.3.0"
    text-encoding-utf-8 "^1.0.2"
    url "^0.11.0"
    velocity-animate "^1.5.2"
@@ -7763,6 +7793,11 @@ nan@^2.12.1, nan@^2.14.0:
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==

+nanoid@^3.1.12:
+  version "3.1.12"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654"
+  integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==
+
 nanomatch@^1.2.9:
  version "1.2.13"
  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -7834,9 +7869,9 @@ node-fetch@^1.0.1:
    is-stream "^1.0.1"

 node-fetch@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==

 node-forge@0.9.0:
  version "0.9.0"
@@ -9428,6 +9463,16 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.1
    source-map "^0.6.1"
    supports-color "^6.1.0"

+postcss@^8.0.2:
+  version "8.0.7"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.0.7.tgz#764d26d8bc64a87af6d945238ae6ef36bf6fc32d"
+  integrity sha512-LTCMGOjmC/CGWV/azk3h34u6TNj1s9p4XleEiW8yA3j+8k+z3mnv5V7yyREvWDKlkel8GxqhjEZJ+JXWTzKPWw==
+  dependencies:
+    colorette "^1.2.1"
+    line-column "^1.0.2"
+    nanoid "^3.1.12"
+    source-map "^0.6.1"
+
 prelude-ls@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -10290,6 +10335,11 @@ retry@^0.12.0:
  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=

+rfc4648@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.4.0.tgz#c75b2856ad2e2d588b6ddb985d556f1f7f2a2abd"
+  integrity sha512-3qIzGhHlMHA6PoT6+cdPKZ+ZqtxkIvg8DZGKA5z6PQ33/uuhoJ+Ws/D/J9rXW6gXodgH8QYlz2UCl+sdUDmNIg==
+
 rgb-regex@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -10408,27 +10458,17 @@ sane@^4.0.3:
    minimist "^1.1.1"
    walker "~1.0.5"

-sanitize-html@^1.19.1:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.26.0.tgz#ab38d671526b9b7c08aa7af7f9ad5a73fcc1bbe4"
-  integrity sha512-xriDBT2FbfN0ZKCcX6H6svkh1bZpO2e5ny05RQGZY6vFOMAU13La2L5YYf3XpcjXSksCYXzPj7YPvyGp5wbaUA==
+"sanitize-html@github:apostrophecms/sanitize-html#3c7f93f2058f696f5359e3e58d464161647226db":
+  version "2.0.0-rc.3"
+  resolved "https://codeload.github.com/apostrophecms/sanitize-html/tar.gz/3c7f93f2058f696f5359e3e58d464161647226db"
  dependencies:
-    chalk "^2.4.1"
+    deepmerge "^4.2.2"
+    escape-string-regexp "^4.0.0"
    htmlparser2 "^4.1.0"
-    lodash "^4.17.15"
-    postcss "^7.0.27"
-    srcset "^2.0.1"
-    xtend "^4.0.1"
-
-sanitize-html@^1.27.1:
-  version "1.27.1"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.27.1.tgz#ce147951aa3defba13448e2ca8a4e18d8f2e2cd7"
-  integrity sha512-C+N7E+7ikYaLHdb9lEkQaFOgmj+9ddZ311Ixs/QsBsoLD411/vdLweiFyGqrswUVgLqagOS5NCDxcEPH7trObQ==
-  dependencies:
-    htmlparser2 "^4.1.0"
-    lodash "^4.17.15"
-    postcss "^7.0.27"
-    srcset "^2.0.1"
+    is-plain-object "^5.0.0"
+    klona "^2.0.3"
+    postcss "^8.0.2"
+    srcset "^3.0.0"

 sax@^1.2.4, sax@~1.2.4:
  version "1.2.4"
@@ -10896,10 +10936,10 @@ sprintf-js@~1.0.2:
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=

-srcset@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz#8f842d357487eb797f413d9c309de7a5149df5ac"
-  integrity sha512-00kZI87TdRKwt+P8jj8UZxbfp7mK2ufxcIMWvhAOZNJTRROimpHeruWrGvCZneiuVDLqdyHefVp748ECTnyUBQ==
+srcset@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/srcset/-/srcset-3.0.0.tgz#8afd8b971362dfc129ae9c1a99b3897301ce6441"
+  integrity sha512-D59vF08Qzu/C4GAOXVgMTLfgryt5fyWo93FZyhEWANo0PokFz/iWdDe13mX3O5TRf6l8vMTqckAfR4zPiaH0yQ==

 sshpk@^1.7.0:
  version "1.16.1"
@@ -11352,6 +11392,11 @@ tapable@^1.0.0, tapable@^1.1.3:
  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==

+tar-js@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17"
+  integrity sha1-aUmqv7C6GLsVYq5RpDn9DzAYOhc=
+
 tar@^4:
  version "4.4.13"
  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"