Docs for the widget_domain_allowlist config option

.env.example

@@ -1,16 +0,0 @@
-# To enable CSS hot-reload, set the following variable to 1.
-CSS_HOT_RELOAD=1
-# To use the full page error dialog, set this to 1. Please report false positives to
-# the issue tracker for handling.
-FULL_PAGE_ERRORS=0
-# To use a single theme, uncomment the line with the theme you want to hot-reload.
-MATRIX_THEMES='light'
-#MATRIX_THEMES='dark'
-#MATRIX_THEMES='legacy-light'
-#MATRIX_THEMES='legacy-dark'
-#MATRIX_THEMES='light-custom'
-#MATRIX_THEMES='dark-custom'
-# You can also enable multiple themes by using a comma-separated list.
-# When multiple themes are enabled, switching between them may require a full page reload.
-# Note that compilation times are proportional to the number of enabled themes.
-#MATRIX_THEMES='light,dark'

.eslintrc.js

@@ -1,30 +1,23 @@
 module.exports = {
-    plugins: ["matrix-org"],
-    extends: [
-        "plugin:matrix-org/babel",
-        "plugin:matrix-org/react",
-    ],
-    env: {
-        browser: true,
-        node: true,
+    "extends": ["matrix-org", "matrix-org/react"],
+    "env": {
+        "browser": true,
+        "node": true,
     },
-    rules: {
-        // Things we do that break the ideal style
+    "rules": {
         "quotes": "off",
     },
-    overrides: [{
-        files: ["src/**/*.{ts,tsx}"],
-        extends: [
-            "plugin:matrix-org/typescript",
-            "plugin:matrix-org/react",
-        ],
-        rules: {
-            // Things we do that break the ideal style
-            "prefer-promise-reject-errors": "off",
+    "overrides": [{
+        "files": ["src/**/*.{ts,tsx}"],
+        "extends": ["matrix-org/ts", "matrix-org/react"],
+        "env": {
+            "browser": true,
+        },
+        "rules": {
             "quotes": "off",
-
-            // We disable this while we're transitioning
+            // While converting to ts we allow this
             "@typescript-eslint/no-explicit-any": "off",
+            "prefer-promise-reject-errors": "off",
         },
     }],
 };

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @vector-im/element-web

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,46 @@
+<!-- Please report security issues by email to security@matrix.org -->
+
+<!-- This is a bug report template. By following the instructions below and
+filling out the sections with your information, you will help the us to get all
+the necessary data to fix your issue.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --​> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
+link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
+file a bug here too! -->
+
+<!-- Include screenshots if possible: you can drag and drop images below. -->
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Platform**: web (in-browser) or desktop?
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 1.x.y <!-- check the user settings panel if unsure -->

.github/ISSUE_TEMPLATE/bug-desktop.yml

@@ -1,75 +0,0 @@
-name: Bug report for the Element desktop app (not in a browser)
-description: File a bug report if you are using the desktop Element application.
-labels: [T-Defect]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        Please report security issues by email to security@matrix.org
-  - type: textarea
-    id: reproduction-steps
-    attributes:
-      label: Steps to reproduce
-      description: Please attach screenshots, videos or logs if you can.
-      placeholder: Tell us what you see!
-      value: |
-        1. Where are you starting? What can you see?
-        2. What do you click?
-        3. More steps…
-    validations:
-      required: true
-  - type: textarea
-    id: result
-    attributes:
-      label: Outcome
-      placeholder: Tell us what went wrong
-      value: |
-        #### What did you expect?
-
-        #### What happened instead?
-    validations:
-      required: true
-  - type: input
-    id: os
-    attributes:
-      label: Operating system
-      placeholder: Windows, macOS, Ubuntu, Arch Linux…
-    validations:
-      required: false
-  - type: input
-    id: version
-    attributes:
-      label: Application version
-      description: You can find the version information in Settings -> Help & About. 
-      placeholder: e.g. Element version 1.7.34, olm version 3.2.3 
-    validations:
-      required: false
-  - type: input
-    id: source
-    attributes:
-      label: How did you install the app?
-      description: Where did you install the app from? Please give a link or a description.
-      placeholder: e.g. From https://element.io/get-started
-    validations:
-      required: false
-  - type: input
-    id: homeserver
-    attributes:
-      label: Homeserver
-      description: Which server is your account registered on?
-      placeholder: e.g. matrix.org
-    validations:
-      required: false
-  - type: dropdown
-    id: rageshake
-    attributes:
-      label: Will you send logs?
-      description:  |
-        Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/bug-web.yml

@@ -1,75 +0,0 @@
-name: Bug report for Element Web (in browser)
-description: File a bug report if you are using Element in a web browser like Firefox, Chrome, Edge, and so on.
-labels: [T-Defect]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-
-        Please report security issues by email to security@matrix.org
-  - type: textarea
-    id: reproduction-steps
-    attributes:
-      label: Steps to reproduce
-      description: Please attach screenshots, videos or logs if you can.
-      placeholder: Tell us what you see!
-      value: |
-        1. Where are you starting? What can you see?
-        2. What do you click?
-        3. More steps…
-    validations:
-      required: true
-  - type: textarea
-    id: result
-    attributes:
-      label: Outcome
-      placeholder: Tell us what went wrong
-      value: |
-        #### What did you expect?
-
-        #### What happened instead?
-    validations:
-      required: true
-  - type: input
-    id: os
-    attributes:
-      label: Operating system
-      placeholder: Windows, macOS, Ubuntu, Arch Linux…
-    validations:
-      required: false
-  - type: input
-    id: browser
-    attributes:
-      label: Browser information
-      description: Which browser are you using? Which version? 
-      placeholder: e.g. Chromium Version 92.0.4515.131
-    validations:
-      required: false
-  - type: input
-    id: webapp-url
-    attributes:
-      label: URL for webapp
-      description: Which URL are you using to access the webapp? If a private server, tell us what version of Element Web you are using.
-      placeholder: e.g. develop.element.io, app.element.io
-    validations:
-      required: false
-  - type: input
-    id: homeserver
-    attributes:
-      label: Homeserver
-      description: Which server is your account registered on?
-      placeholder: e.g. matrix.org
-    validations:
-      required: false
-  - type: dropdown
-    id: rageshake
-    attributes:
-      label: Will you send logs?
-      description:  |
-        Did you know that you can send a /rageshake command from the web application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
-      options:
-        - 'Yes'
-        - 'No'
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,56 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+<!-- Please report security issues by email to security@matrix.org -->
+
+<!-- This is a bug report template. By following the instructions below and
+filling out the sections with your information, you will help the us to get all
+the necessary data to fix your issue.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --​> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+<!-- Please send us logs for your bug report. They're very important for bugs
+which are hard to reproduce. To do this, create this issue then go to your
+account settings and click 'Submit Debug Logs' from the Help & About tab -->
+Logs being sent: yes/no
+
+<!-- Include screenshots if possible: you can drag and drop images below. -->
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Platform**: web (in-browser) or desktop?
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 1.x.y <!-- check the user settings panel if unsure -->

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,36 +0,0 @@
-name: Enhancement request
-description: Do you have a suggestion or feature request?
-labels: [T-Enhancement]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to propose a new feature or make a suggestion.
-  - type: textarea
-    id: usecase
-    attributes:
-      label: Your use case
-      description: What would you like to be able to do? Please feel welcome to include screenshots or mock ups.
-      placeholder: Tell us what you would like to do!
-      value: |
-        #### What would you like to do?
-
-        #### Why would you like to do it?
-
-        #### How would you like to achieve it?
-    validations:
-      required: true
-  - type: textarea
-    id: alternative
-    attributes:
-      label: Have you considered any alternatives?
-      placeholder: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      placeholder: Is there anything else you'd like to add?
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/suggestion-or-feature-request.md

@@ -0,0 +1,20 @@
+---
+name: Suggestion or Feature request
+about: Suggest an idea for this project
+title: ''
+labels: suggestion
+assignees: ''
+
+---
+
+**Is your suggestion related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md

@@ -0,0 +1,58 @@
+---
+name: User Interface or Usability Bug report
+about: Please include screenshots in UI/UX bug reports
+title: ''
+labels: bug, ui/ux
+assignees: ''
+
+---
+
+<!-- A picture's worth a thousand words: PLEASE INCLUDE A SCREENSHOT :P -->
+
+<!-- Please report security issues by email to security@matrix.org -->
+
+<!-- This is a bug report template. By following the instructions below and
+filling out the sections with your information, you will help the us to get all
+the necessary data to fix your issue.
+
+You can also preview your report before submitting it. You may remove sections
+that aren't relevant to your particular case.
+
+Text between <!-- and --​> marks will be invisible in the report.
+-->
+
+### Description
+
+Describe here the problem that you are experiencing, or the feature you are requesting.
+
+### Steps to reproduce
+
+- For bugs, list the steps
+- that reproduce the bug
+- using hyphens as bullet points
+
+Describe how what happens differs from what you expected.
+
+<!-- Please send us logs for your bug report. They're very important for bugs
+which are hard to reproduce. To do this, create this issue then go to your
+account settings and click 'Submit Debug Logs' from the Help & About tab -->
+Logs being sent: yes/no
+
+<!-- Include screenshots if possible: you can drag and drop images below. -->
+
+### Version information
+
+<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
+
+- **Platform**: web (in-browser) or desktop?
+
+For the web app:
+
+- **Browser**: Chrome, Safari, Firefox? which version?
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
+
+For the desktop app:
+
+- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
+- **Version**: 1.x.y <!-- check the user settings panel if unsure -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +0,0 @@
-<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->
-
-<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->
-
-<!-- To specify text for the changelog entry (otherwise the PR title will be used):
-Notes:
-
-Changelog entries will also appear in element-desktop. For PRs that *only* affect the desktop version:
-Notes: none
-element-desktop notes: <notes>
--->

.github/workflows/ci_package.yml

@@ -1,77 +0,0 @@
-on:
-  push:
-    branches:
-      - ci-package
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: ./scripts/fetch-develop.deps.sh --depth 1
-      - run: yarn install
-      - run: yarn lint:js
-      - run: yarn lint:types
-      - run: yarn lint:style
-  stats:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: ./scripts/fetch-develop.deps.sh --depth 1
-      - run: yarn install
-      - run: yarn build-stats
-      - uses: actions/upload-artifact@v2
-        with:
-          path: webpack-stats.json
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: ./scripts/fetch-develop.deps.sh --depth 1
-      - run: yarn install
-      - run: yarn build:genfiles
-      - run: yarn test
-  i18n:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: ./scripts/fetch-develop.deps.sh --depth 1
-      - run: yarn install
-      - run: yarn diff-i18n
-  package:
-    needs: [lint, stats, tests, i18n]
-    runs-on: ubuntu-latest
-    environment: develop
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: ./scripts/fetch-develop.deps.sh --depth 1
-      - run: yarn install
-      - run: ./scripts/ci_package.sh
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          SENTRY_URL: ${{ secrets.SENTRY_URL }}
-          SENTRY_ORG: sentry
-          SENTRY_PROJECT: riot-web
-      - uses: actions/upload-artifact@v2
-        with:
-          path: dist/*.tar.gz

.github/workflows/issues_to_projects.yaml

@@ -1,36 +0,0 @@
-on:
-    issues:
-        types: [labeled]
-jobs:
-    move_priority_design_issues:
-        name: Move priority X-Needs-Design issues to Design project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
-             (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-              contains(github.event.issue.labels.*.name, 'O-Occasional')) &&
-             (contains(github.event.issue.labels.*.name, 'S-Critical') ||
-              contains(github.event.issue.labels.*.name, 'S-Major') ||
-              contains(github.event.issue.labels.*.name, 'S-Minor'))
-        steps:
-             - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
-               with:
-                 action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-                 project-url: "https://github.com/orgs/vector-im/projects/14"
-                 column-name: "📥 Inbox"
-                 label-name: "X-Needs-Design"
-
-    move_spaces_issues:
-        name: Move Spaces issues to Delight project board
-        runs-on: ubuntu-latest
-        if: >
-            contains(github.event.issue.labels.*.name, 'A-Spaces') ||
-            contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
-            contains(github.event.issue.labels.*.name, 'A-Subspaces')
-        steps:
-             - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
-               with:
-                 action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-                 project-url: "https://github.com/orgs/vector-im/projects/6"
-                 column-name: "📥 Inbox"
-                 label-name: "A-Spaces"

.github/workflows/preview_changelog.yaml

@@ -1,12 +0,0 @@
-name: Preview Changelog
-on:
-  pull_request_target:
-    types: [ opened, edited, labeled ]
-jobs:
-    changelog:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Preview Changelog
-              uses: matrix-org/allchange@main
-              with:
-                  ghToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/triage-incoming.yml

@@ -1,15 +0,0 @@
-name: Move new issues into Issue triage board
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  automate-project-columns:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: alex-page/github-project-automation-plus@v0.8.1
-        with:
-          project: Issue triage
-          column: Incoming
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-needs-info.yml

@@ -1,16 +0,0 @@
-name: Move X-Needs-Info into Need info column in the Issue triage board
-
-on:
-  issues:
-    types: [labeled]
-    
-jobs:
-  Move_Labeled_Issue_On_Project_Board:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: konradpabjan/move-labeled-or-milestoned-issue@v2.0
-      with:
-        action-token: ${{ secrets.GITHUB_TOKEN }}
-        project-url: "https://github.com/vector-im/element-web/projects/27"
-        column-name: "Need info"
-        label-name: "X-Needs-Info"

.github/workflows/triage-priority-bugs.yml

@@ -1,25 +0,0 @@
-name: Move labelled issues into the Priority bugs column for the Web App Team
-
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  Move_high_priority_issues_to_team_workboard:
-    runs-on: ubuntu-latest
-    if: >
-        contains(github.event.issue.labels.*.name, 'T-Defect') &&
-        contains(github.event.issue.labels.*.name, 'S-Critical') &&
-        (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-         contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-        contains(github.event.issue.labels.*.name, 'S-Major') &&
-        contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-        contains(github.event.issue.labels.*.name, 'A11y') &&
-        contains(github.event.issue.labels.*.name, 'O-Frequent')
-    steps:
-      - uses: alex-page/github-project-automation-plus@v0.8.1
-        with:
-          project: Web App Team
-          column: P1
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-

.gitignore

@@ -19,6 +19,3 @@ electron/pub
 /src/component-index.js
 /.tmp
 /webpack-stats.json
-.vscode
-.vscode/
-.env

.modernizr.json

@@ -1,6 +1,9 @@
 {
   "minify": true,
-  "enableClasses": false,
+  "classPrefix": "modernizr_",
+  "options": [
+    "setClasses"
+  ],
   "feature-detects": [
     "test/css/animations",
     "test/css/displaytable",

.stylelintrc.js

@@ -19,7 +19,7 @@ module.exports = {
         "at-rule-no-unknown": null,
         "no-descending-specificity": null,
         "scss/at-rule-no-unknown": [true, {
-            // https://github.com/vector-im/element-web/issues/10544
+            // https://github.com/vector-im/riot-web/issues/10544
             "ignoreAtRules": ["define-mixin"],
         }],
     }

AUTHORS.rst

@@ -16,6 +16,3 @@ include:
 
 * Alexandr Korsak (https://github.com/oivoodoo)
   Improved multiple file uploading
-
-* Thom Cleary (https://github.com/thomcatdotrocks)
-  Small update for tarball deployment

CONTRIBUTING.md

@@ -1,4 +0,0 @@
-Contributing code to Element
-============================
-
-Element follows the same pattern as the [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md).

CONTRIBUTING.rst

@@ -0,0 +1,4 @@
+Contributing code to Riot
+=========================
+
+Riot follows the same pattern as https://github.com/matrix-org/matrix-js-sdk/blob/master/CONTRIBUTING.rst.

Dockerfile

@@ -1,15 +1,18 @@
 # Builder
-FROM node:14-buster as builder
+FROM node:12 as builder
 
 # Support custom branches of the react-sdk and js-sdk. This also helps us build
-# images of element-web develop.
+# images of riot-web develop.
 ARG USE_CUSTOM_SDKS=false
 ARG REACT_SDK_REPO="https://github.com/matrix-org/matrix-react-sdk.git"
 ARG REACT_SDK_BRANCH="master"
 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
 
@@ -33,8 +36,5 @@ COPY --from=builder /src/webapp /app
 # Insert wasm type into Nginx mime.types file so they load correctly.
 RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
 
-# Override default nginx config
-COPY /nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
-
 RUN rm -rf /usr/share/nginx/html \
-  && ln -s /app /usr/share/nginx/html
+ && ln -s /app /usr/share/nginx/html

README.md

@@ -11,7 +11,7 @@ Element has several tiers of support for different environments:
 
 * Supported
   * Definition: Issues **actively triaged**, regressions **block** the release
-  * Last 2 major versions of Chrome, Firefox, Safari, and Edge on desktop OSes
+  * Last 2 major versions of Chrome, Firefox, and Safari on desktop OSes
   * Latest release of official Element Desktop app on desktop OSes
   * Desktop OSes means macOS, Windows, and Linux versions for desktop devices
     that are actively supported by the OS vendor and receive security updates
@@ -30,23 +30,23 @@ and [element-ios](https://github.com/vector-im/element-ios).
 Getting Started
 ===============
 
-The easiest way to test Element is to just use the hosted copy at <https://app.element.io>.
-The `develop` branch is continuously deployed to <https://develop.element.io>
+The easiest way to test Element is to just use the hosted copy at https://app.element.io.
+The `develop` branch is continuously deployed by Jenkins at https://develop.element.io
 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/element-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 `element-x.x.x` directory to an appropriate name
+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)
 1. If desired, copy `config.sample.json` to `config.json` and edit it
    as desired. See the [configuration docs](docs/config.md) for details.
 1. Enter the URL into your browser and log into Element!
 
 Releases are signed using gpg and the OpenPGP standard, and can be checked against the public key located
-at <https://packages.riot.im/element-release-key.asc>.
+at https://packages.riot.im/riot-release-key.asc.
 
 Note that for the security of your chats will need to serve Element
 over HTTPS. Major browsers also do not allow you to use VoIP/video
@@ -58,11 +58,8 @@ and thus allowed.
 To install Element as a desktop application, see [Running as a desktop
 app](#running-as-a-desktop-app) below.
 
-Important Security Notes
-========================
-
-Separate domains
-----------------
+Important Security Note
+=======================
 
 We do not recommend running Element from the same domain name as your Matrix
 homeserver.  The reason is the risk of XSS (cross-site-scripting)
@@ -72,46 +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/element-web/issues/1977> for more details.
-
-Configuration best practices
-----------------------------
-
-Unless you have special requirements, you will want to add the following to
-your web server configuration when hosting Element Web:
-
-* The `X-Frame-Options: SAMEORIGIN` header, to prevent Element Web from being
-  framed and protect from [clickjacking][owasp-clickjacking].
-* The `frame-ancestors 'none'` directive to your `Content-Security-Policy`
-  header, as the modern replacement for `X-Frame-Options` (though both should be
-  included since not all browsers support it yet, see
-  [this][owasp-clickjacking-csp]).
-* The `X-Content-Type-Options: nosniff` header, to [disable MIME
-  sniffing][mime-sniffing].
-* The `X-XSS-Protection: 1; mode=block;` header, for basic XSS protection in
-  legacy browsers.
-
-[mime-sniffing]:
-<https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types#mime_sniffing>
-
-[owasp-clickjacking-csp]:
-<https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html#content-security-policy-frame-ancestors-examples>
-
-[owasp-clickjacking]:
-<https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html>
-
-If you are using nginx, this would look something like the following:
-
-```
-add_header X-Frame-Options SAMEORIGIN;
-add_header X-Content-Type-Options nosniff;
-add_header X-XSS-Protection "1; mode=block";
-add_header Content-Security-Policy "frame-ancestors 'none'";
-```
-
-Note: In case you are already setting a `Content-Security-Policy` header
-elsewhere, you should modify it to include the `frame-ancestors` directive
-instead of adding that last line.
+https://github.com/vector-im/element-web/issues/1977 for more details.
 
 Building From Source
 ====================
@@ -122,15 +80,15 @@ Ensure you have the latest LTS version of Node.js installed.
 Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
 guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it already.
 
-1. Install or update `node.js` so that your `node` is at least v14.x.
+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/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
+   *  If you're using the `develop` branch, then it is recommended to set up a
       proper development environment (see [Setting up a dev
       environment](#setting-up-a-dev-environment) below). Alternatively, you
-      can use <https://develop.element.io> - the continuous integration release of
+      can use https://develop.element.io - the continuous integration release of
       the develop branch.
 1. Configure the app by copying `config.sample.json` to `config.json` and
    modifying it. See the [configuration docs](docs/config.md) for details.
@@ -141,23 +99,21 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread
 Note that `yarn dist` is not supported on Windows, so Windows users can run `yarn build`,
 which will build all the necessary files into the `webapp` directory. The version of Element
 will not appear in Settings without using the dist script. You can then mount the
-`webapp` directory on your web server to actually serve up the app, which is
-entirely static content.
+`webapp` directory on your webserver to actually serve up the app, which is entirely static content.
 
 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://element.io/get-started> 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/element-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.
 
 Other options for running as a desktop app:
-
-* @asdf:matrix.org points out that you can use nativefier and it just works(tm)
+ * @asdf:matrix.org points out that you can use nativefier and it just works(tm)
 
 ```bash
 yarn global add nativefier
@@ -172,21 +128,18 @@ Running from Docker
 
 The Docker image can be used to serve element-web as a web server. The easiest way to use
 it is to use the prebuilt image:
-
 ```bash
-docker run -p 80:80 vectorim/element-web
+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/element-web/config.json` then your Docker command
 would be:
-
 ```bash
-docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/element-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/element-web.git element-web
 cd element-web
@@ -196,7 +149,6 @@ docker build .
 
 If you're building a custom branch, or want to use the develop branch, check out the appropriate
 element-web branch and then run:
-
 ```bash
 docker build -t \
     --build-arg USE_CUSTOM_SDKS=true \
@@ -207,12 +159,6 @@ docker build -t \
     .
 ```
 
-Running in Kubernetes
-=====================
-
-The provided element-web docker image can also be run from within a Kubernetes cluster.
-See the [Kubernetes example](docs/kubernetes.md) for more details.
-
 config.json
 ===========
 
@@ -229,7 +175,6 @@ Caching requirements
 ====================
 
 Element requires the following URLs not to be cached, when/if you are serving Element from your own webserver:
-
 ```
 /config.*.json
 /i18n
@@ -238,11 +183,6 @@ Element requires the following URLs not to be cached, when/if you are serving El
 /index.html
 ```
 
-We also recommend that you force browsers to re-validate any cached copy of Element on page load by configuring your
-webserver to return `Cache-Control: no-cache` for `/`. This ensures the browser will fetch a new version of Element on
-the next page load after it's been deployed. Note that this is already configured for you in the nginx config of our
-Dockerfile.
-
 Development
 ===========
 
@@ -272,10 +212,6 @@ internet.  So please don't depend on resources (JS libs, CSS, images, fonts)
 hosted by external CDNs or servers but instead please package all dependencies
 into Element itself.
 
-CSS hot-reload is available as an opt-in development feature. You can enable it
-by defining a `CSS_HOT_RELOAD` environment variable, in a `.env` file in the root
-of the repository. See `.env.example` for documentation and an example.
-
 Setting up a dev environment
 ============================
 
@@ -289,6 +225,7 @@ 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
@@ -299,6 +236,7 @@ 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
@@ -310,22 +248,26 @@ Finally, build and start Element itself:
 ```bash
 git clone https://github.com/vector-im/element-web.git
 cd element-web
+git checkout develop
 yarn link matrix-js-sdk
 yarn link matrix-react-sdk
 yarn install
-yarn reskindex
 yarn start
 ```
 
+
 Wait a few seconds for the initial build to finish; you should see something like:
-
 ```
-[element-js] <s> [webpack.Progress] 100%
-[element-js]
-[element-js] ℹ ｢wdm｣:    1840 modules
-[element-js] ℹ ｢wdm｣: Compiled successfully.
+Hash: b0af76309dd56d7275c8
+Version: webpack 1.12.14
+Time: 14533ms
+         Asset     Size  Chunks             Chunk Names
+     bundle.js   4.2 MB       0  [emitted]  main
+    bundle.css  91.5 kB       0  [emitted]  main
+ bundle.js.map  5.29 MB       0  [emitted]  main
+bundle.css.map   116 kB       0  [emitted]  main
+    + 1013 hidden modules
 ```
-
    Remember, the command will not terminate since it runs the web server
    and rebuilds source files when they change. This development server also
    disables caching, so do NOT use it in production.
@@ -333,32 +275,25 @@ Wait a few seconds for the initial build to finish; you should see something lik
 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 Element.
+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 limits are too low your build will fail silently or with
-`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit
-of at least `128M` and instance limit around `512`.
+for changes. If the inotify watch limit is too low your build will silently fail.
+To avoid this issue, we recommend a limit of at least 128M.
 
-You may be interested in issues [#15750](https://github.com/vector-im/element-web/issues/15750) and
-[#15774](https://github.com/vector-im/element-web/issues/15774) for further details.
-
-To set a new inotify watch and instance limit, execute:
+To set a new inotify watch limit, execute:
 
 ```
-sudo sysctl fs.inotify.max_user_watches=131072
-sudo sysctl fs.inotify.max_user_instances=512
-sudo sysctl -p
+$ sudo sysctl fs.inotify.max_user_watches=131072
+$ sudo sysctl -p
 ```
 
-If you wish, you can make the new limits permanent, by executing:
+If you wish, you can make this new limit permanent, by executing:
 
 ```
-echo fs.inotify.max_user_watches=131072 | sudo tee -a /etc/sysctl.conf
-echo fs.inotify.max_user_instances=512 | sudo tee -a /etc/sysctl.conf
-sudo sysctl -p
+$ echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
+$ sudo sysctl -p
 ```
-
 ___
 
 When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
@@ -401,11 +336,56 @@ 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.element.io/widgets/element-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.element.io/engage/element-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
 ===============
 
-Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process).
+Issues will be triaged by the core team using the below set of tags.
 
-We use [issue labels](https://github.com/vector-im/element-meta/wiki/Issue-labelling) to sort all incoming issues.
+Tags are meant to be used in combination - e.g.:
+ * P1 critical bug == really urgent stuff that should be next in the bugfixing todo list
+ * "release blocker" == stuff which is blocking us from cutting the next release.
+ * P1 feature type:voip == what VoIP features should we be working on next?
+
+priority: **compulsory**
+
+* P1: top priority - i.e. pool of stuff which we should be working on next
+* P2: still need to fix, but lower than P1
+* P3: non-urgent
+* P4: interesting idea - bluesky some day
+* P5: recorded for posterity/to avoid duplicates. No intention to resolves right now.
+
+bug or feature: **compulsory**
+
+* bug
+* feature
+
+bug severity: **compulsory, if bug**
+
+* critical - whole app doesn't work
+* major - entire feature doesn't work
+* minor - partially broken feature (but still usable)
+* cosmetic - feature works functionally but UI/UX is broken
+
+types
+* type:* - refers to a particular part of the app; used to filter bugs
+  on a given topic - e.g. VOIP, signup, timeline, etc.
+
+additional categories (self-explanatory):
+
+* release blocker
+* ui/ux (think of this as cosmetic)
+* network (specific to network conditions)
+* platform specific
+* accessibility
+* maintenance
+* performance
+* i18n
+* blocked - whether this issue currently can't be progressed due to outside factors
+
+community engagement
+* easy
+* hacktoberfest
+* bounty? - proposal to be included in a bounty programme
+* bounty - included in Status Open Bounty

babel.config.js

@@ -3,14 +3,12 @@ module.exports = {
     "presets": [
         ["@babel/preset-env", {
             "targets": [
-                "last 2 Chrome versions",
-                "last 2 Firefox versions",
-                "last 2 Safari versions",
-                "last 2 Edge versions",
+                "last 2 Chrome versions", "last 2 Firefox versions", "last 2 Safari versions"
             ],
         }],
         "@babel/preset-typescript",
-        "@babel/preset-react",
+        "@babel/preset-flow",
+        "@babel/preset-react"
     ],
     "plugins": [
         ["@babel/plugin-proposal-decorators", {legacy: true}],
@@ -18,9 +16,8 @@ module.exports = {
         "@babel/plugin-proposal-numeric-separator",
         "@babel/plugin-proposal-class-properties",
         "@babel/plugin-proposal-object-rest-spread",
-        "@babel/plugin-proposal-optional-chaining",
-        "@babel/plugin-proposal-nullish-coalescing-operator",
+        "@babel/plugin-transform-flow-comments",
         "@babel/plugin-syntax-dynamic-import",
-        "@babel/plugin-transform-runtime",
-    ],
+        "@babel/plugin-transform-runtime"
+    ]
 };

config.sample.json

@@ -25,7 +25,9 @@
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "defaultCountryCode": "GB",
     "showLabsSettings": false,
-    "features": { },
+    "features": {
+        "feature_new_spinner": false
+    },
     "default_federate": true,
     "default_theme": "light",
     "roomDirectory": {
@@ -33,6 +35,7 @@
             "matrix.org"
         ]
     },
+    "welcomeUserId": "@riot-bot:matrix.org",
     "piwik": {
         "url": "https://piwik.riot.im/",
         "whitelistedHSUrls": ["https://matrix.org"],

contribute.json

@@ -1,13 +1,13 @@
 {
-  "name": "Element",
+  "name": "Riot",
     "description": "A glossy Matrix collaboration client for the web.",
     "repository": {
-      "url": "https://github.com/vector-im/element-web",
+      "url": "https://github.com/vector-im/riot-web",
       "license": "Apache License 2.0"
     },
     "bugs": {
-      "list": "https://github.com/vector-im/element-web/issues",
-      "report": "https://github.com/vector-im/element-web/issues/new/choose"
+      "list": "https://github.com/vector-im/riot-web/issues",
+      "report": "https://github.com/vector-im/riot-web/issues/new/choose"
     },
     "keywords": [
       "chat",

docs/app-load.md

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

docs/conferencing.md

@@ -0,0 +1,52 @@
+# VoIP Conferencing
+
+This is a draft proposal for a naive voice/video conferencing implementation for
+Matrix clients.  There are many possible conferencing architectures possible for
+Matrix (Multipoint Conferencing Unit (MCU); Stream Forwarding Unit (SFU); Peer-
+to-Peer mesh (P2P), etc; events shared in the group room; events shared 1:1;
+possibly even out-of-band signalling).
+
+This is a starting point for a naive MCU implementation which could provide one
+possible Matrix-wide solution in  future, which retains backwards compatibility
+with standard 1:1 calling.
+
+ * A client chooses to initiate a conference for a given room by starting a
+   voice or video call with a 'conference focus' user.  This is a virtual user
+   (typically Application Service) which implements a conferencing bridge.  It
+   isn't defined how the client discovers or selects this user.
+
+ * The conference focus user MUST join the room in which the client has
+   initiated the conference - this may require the client to invite the
+   conference focus user to the room, depending on the room's `join_rules`. The
+   conference focus user needs to be in the room to let the bridge eject users
+   from the conference who have left the room in which it was initiated, and aid
+   discovery of the conference by other users in the room.  The bridge
+   identifies the room to join based on the user ID by which it was invited.
+   The format of this identifier is implementation dependent for now.
+
+ * If a client leaves the group chat room, they MUST be ejected from the
+   conference. If a client leaves the 1:1 room with the conference focus user,
+   they SHOULD be ejected from the conference.
+
+ * For now, rooms can contain multiple conference focus users - it's left to
+   user or client implementation to select which to converge on.  In future this
+   could be mediated using a state event (e.g. `im.vector.call.mcu`), but we
+   can't do that right now as by default normal users can't set arbitrary state
+   events on a room.
+
+ * To participate in the conference, other clients initiates a standard 1:1
+   voice or video call to the conference focus user.
+
+ * For best UX, clients SHOULD show the ongoing voice/video call in the UI
+   context of the group room rather than 1:1 with the focus user.  If a client
+   recognises a conference user present in the room, it MAY chose to highlight
+   this in the UI (e.g. with a "conference ongoing" notification, to aid
+   discovery).  Clients MAY hide the 1:1 room with the focus user (although in
+   future this room could be used for floor control or other direct
+   communication with the conference focus)
+
+ * When all users have left the conference, the 'conference focus' user SHOULD
+   leave the room.
+
+ * If a conference focus user joins a room but does not receive a 1:1 voice or
+   video call, it SHOULD time out after a period of time and leave the room.

docs/config.md

@@ -22,12 +22,9 @@ For a good example, see https://develop.element.io/config.json.
      `default_hs_url` is specified. When multiple sources are specified, it is unclear
      which should take priority and therefore the application cannot continue.
    * As of Element 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below.
-1. `sso_immediate_redirect`: When `true`, Element will assume the default server supports SSO
-   and attempt to send the user there to continue (if they aren't already logged in). Default
-   `false`. Note that this disables all usage of the welcome page.
 1. `features`: Lookup of optional features that may be force-enabled (`true`) or force-disabled (`false`).
    When features are not listed here, their defaults will be used, and users can turn them on/off if `showLabsSettings`
-   allows them to. The available optional experimental features vary from release to release and are
+   allows them to. The available optional experimental features vary from release to release and are 
    [documented](labs.md). The feature flag process is [documented](feature-flags.md) as well.
 1. `showLabsSettings`: Shows the "labs" tab of user settings. Useful to allow users to turn on experimental features
    they might not otherwise have access to.
@@ -49,9 +46,11 @@ For a good example, see https://develop.element.io/config.json.
    may be left blank to disable integrations.
 1. `integrations_rest_url`: URL to the REST interface for the integrations server.
 1. `integrations_widgets_urls`: list of URLs to the REST interface for the widget integrations server.
+1. `widget_domain_allowlist`: list of domains to allow widgets to load from without prompting to
+   user for permission.
 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/hidden by leaving the
+   "Send Logs" within the application. Bug reports can be disabled by leaving the
    `bug_report_endpoint_url` out of your config file.
 1. `roomDirectory`: config for the public room directory. This section is optional.
 1. `roomDirectory.servers`: List of other homeservers' directories to include in the drop
@@ -75,9 +74,6 @@ For a good example, see https://develop.element.io/config.json.
     1. `homeUrl`: Content shown on the inside of the app when a specific room is
        not selected. By default, no home page is configured. If one is set, a
        button to access it will be shown in the top left menu.
-    1. `loginForWelcome`: Overrides `welcomeUrl` to make the welcome page be the
-       same page as the login page when `true`. This effectively disables the
-       welcome page.
 1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
    country selectors, like the phone number input on the registration page.
    Defaults to `GB` if the given code is unknown or not provided.
@@ -88,8 +84,8 @@ For a good example, see https://develop.element.io/config.json.
    default homeserver when signing up or logging in.
 1. `permalinkPrefix`: Used to change the URL that Element generates permalinks with.
    By default, this is "https://matrix.to" to generate matrix.to (spec) permalinks.
-   Set this to your Element instance URL if you run an unfederated server (eg:
-   "https://element.example.org").
+   Set this to your Riot instance URL if you run an unfederated server (eg:
+   "https://riot.example.org").
 1. `jitsi`: Used to change the default conference options. Learn more about the
    Jitsi options at [jitsi.md](./jitsi.md).
     1. `preferredDomain`: The domain name of the preferred Jitsi instance. Defaults
@@ -107,41 +103,6 @@ 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.
-1. `mobileBuilds`: Used to alter promotional links to the mobile app. By default the
-   builds are considered available and accessible from https://element.io. This config
-   option is typically used in a context of encouraging the user to try the mobile app
-   instead of a mobile/incompatible browser.
-   1. `ios`: The URL to the iOS build. If `null`, it will be assumed to be not available.
-       If not set, the default element.io builds will be used.
-   1. `android`: The URL to the Android build. If `null`, it will be assumed to be not available.
-       If not set, the default element.io builds will be used.
-   1. `fdroid`: The URL to the FDroid build. If `null`, it will be assumed to be not available.
-      If not set, the default element.io builds will be used.
-1. `mobileGuideToast`: Whether to show a toast a startup which nudges users on
-   iOS and Android towards the native mobile apps. The toast redirects to the
-   mobile guide if they accept. Defaults to false.
-1. `audioStreamUrl`: If supplied, show an option on Jitsi widgets to stream
-   audio using Jitsi's live streaming feature. This option is experimental and
-   may be removed at any time without notice.
-1. `voip`: Behaviour related to calls
-   1. `obeyAssertedIdentity`: If set, MSC3086 asserted identity messages sent
-      on VoIP calls will cause the call to appear in the room corresponding to the
-      asserted identity. This *must* only be set in trusted environments.
-1. `posthog`: [Posthog](https://posthog.com/) integration config. If not set, Posthog analytics are disabled.
-   1. `projectApiKey`: The Posthog project API key
-   2. `apiHost`: The Posthog API host
-1. `sentry`: [Sentry](https://sentry.io/) configuration for rageshake data being sent to sentry.
-   1. `dsn`: the Sentry [DSN](https://docs.sentry.io/product/sentry-basics/dsn-explainer/)
-   2. `environment`: (optional) The [Environment](https://docs.sentry.io/product/sentry-basics/environments/) to pass to sentry
 
 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
@@ -184,45 +145,4 @@ decentralised.
 Desktop app configuration
 =========================
 
-See https://github.com/vector-im/element-desktop#user-specified-configjson
-
-UI Features
-===========
-
-Parts of the UI can be disabled using UI features. These are settings which appear
-under `settingDefaults` and can only be `true` (default) or `false`. When `false`,
-parts of the UI relating to that feature will be disabled regardless of the user's
-preferences.
-
-Currently, the following UI feature flags are supported:
-
-* `UIFeature.urlPreviews` - Whether URL previews are enabled across the entire application.
-* `UIFeature.feedback` - Whether prompts to supply feedback are shown.
-* `UIFeature.voip` - Whether or not VoIP is shown readily to the user. When disabled,
-  Jitsi widgets will still work though they cannot easily be added.
-* `UIFeature.widgets` - Whether or not widgets will be shown.
-* `UIFeature.flair` - Whether or not community flair is shown in rooms.
-* `UIFeature.communities` - Whether or not to show any UI related to communities. Implicitly
-  disables `UIFeature.flair` when disabled.
-* `UIFeature.advancedSettings` - Whether or not sections titled "advanced" in room and
-  user settings are shown to the user.
-* `UIFeature.shareQrCode` - Whether or not the QR code on the share room/event dialog
-  is shown.
-* `UIFeature.shareSocial` - Whether or not the social icons on the share room/event dialog
-  are shown.
-* `UIFeature.identityServer` - Whether or not functionality requiring an identity server
-  is shown. When disabled, the user will not be able to interact with the identity
-  server (sharing email addresses, 3PID invites, etc).
-* `UIFeature.thirdPartyId` - Whether or not UI relating to third party identifiers (3PIDs)
-  is shown. Typically this is considered "contact information" on the homeserver, and is
-  not directly related to the identity server.
-* `UIFeature.registration` - Whether or not the registration page is accessible. Typically
-  useful if accounts are managed externally.
-* `UIFeature.passwordReset` - Whether or not the password reset page is accessible. Typically
-  useful if accounts are managed externally.
-* `UIFeature.deactivate` - Whether or not the deactivate account button is accessible. Typically
-  useful if accounts are managed externally.
-* `UIFeature.advancedEncryption` - Whether or not advanced encryption options are shown to the
-  user.
-* `UIFeature.roomHistorySettings` - Whether or not the room history settings are shown to the user.
-  This should only be used if the room history visibility options are managed by the server.
+See https://github.com/vector-im/riot-desktop#user-specified-configjson

docs/customisations.md

@@ -1,34 +0,0 @@
-# Customisations
-
-Element Web and the React SDK support "customisation points" that can be used to
-easily add custom logic specific to a particular deployment of Element Web.
-
-An example of this is the [security customisations
-module](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/customisations/Security.ts).
-This module in the React SDK only defines some empty functions and their types:
-it does not do anything by default.
-
-To make use of these customisation points, you will first need to fork Element
-Web so that you can add your own code. Even though the default module is part of
-the React SDK, you can still override it from the Element Web layer:
-
-1. Copy the default customisation module to
-   `element-web/src/customisations/YourNameSecurity.ts`
-2. Edit customisations points and make sure export the ones you actually want to
-   activate
-3. Tweak the Element build process to use the customised module instead of the
-   default by adding this to the `additionalPlugins` array in `webpack.config.js`:
-
-```js
-new webpack.NormalModuleReplacementPlugin(
-    /src[\/\\]customisations[\/\\]Security\.ts/,
-    path.resolve(__dirname, 'src/customisations/YourNameSecurity.ts'),
-),
-```
-
-If we add more customisation modules in the future, we'll likely improve these
-steps to remove the need for build changes like the above.
-
-By isolating customisations to their own module, this approach should remove the
-chance of merge conflicts when updating your fork, and thus simplify ongoing
-maintenance.

docs/e2ee.md

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

docs/feature-flags.md

@@ -8,7 +8,7 @@ For example, flags make the following things possible:
 * Extended testing of a feature via labs on develop
 * Enabling features when ready instead of the first moment the code is released
 * Testing a feature with a specific set of users (by enabling only on a specific
-  Element instance)
+  Riot instance)
 
 The size of the feature controlled by a feature flag may vary widely: it could
 be a large project like reactions or a smaller change to an existing algorithm.
@@ -49,7 +49,7 @@ When starting work on a feature, we should create a matching feature flag:
 ```js
     SettingsStore.getValue("feature_cats")
 ```
-3. Document the feature in the [labs documentation](https://github.com/vector-im/element-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.
@@ -60,9 +60,9 @@ The following lists a few common options.
 ## Enabling by default on develop and nightly
 
 Set the feature to `true` in the
-[develop](https://github.com/vector-im/element-web/blob/develop/element.io/develop/config.json)
+[develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json)
 and
-[nightly](https://github.com/vector-im/element-desktop/blob/develop/element.io/nightly/config.json)
+[nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json)
 configs:
 
 ```json
@@ -74,9 +74,9 @@ configs:
 ## Enabling by default on staging, app, and release
 
 Set the feature to `true` in the
-[staging / app](https://github.com/vector-im/element-web/blob/develop/element.io/app/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/element-desktop/blob/develop/element.io/release/config.json)
+[release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json)
 configs.
 
 **Note:** The above will only enable the feature for https://app.element.io and official Element
@@ -90,18 +90,18 @@ Once we're confident that a feature is working well, we should remove or convert
 If the feature is meant to be turned off/on by the user:
 1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Change the `default` to `true` (if desired).
-3. Remove the feature from the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)
+3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md)
 4. Celebrate! 🥳
 
 If the feature is meant to be forced on (non-configurable):
 1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
 2. Remove all `getValue` lines that test for the feature.
-3. Remove the feature from the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)
+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/element-web/blob/develop/element.io/develop/config.json),
-   [nightly](https://github.com/vector-im/element-desktop/blob/develop/element.io/nightly/config.json),
-   [staging / app](https://github.com/vector-im/element-web/blob/develop/element.io/app/config.json),
+   [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/element-desktop/blob/develop/element.io/release/config.json)
+   [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json)
    configs
 5. Celebrate! 🥳

docs/jitsi.md

@@ -40,7 +40,7 @@ should start a new conference on your Jitsi server.
 domain will appear later in the URL as a configuration parameter.
 
 **Hint**: If you want everyone on your homeserver to use the same Jitsi server by
-default, and you are using element-web 1.6 or newer, set the following on your homeserver's 
+default, and you are using riot-web 1.6 or newer, set the following on your homeserver's 
 `/.well-known/matrix/client` config:
 ```json
 {
@@ -64,3 +64,10 @@ The domain used is the one specified by the `/.well-known/matrix/client` endpoin
 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,
+they will be joining a different conference which has the same name, but not the same
+participants. This is a known bug and which needs to be fixed.

docs/kubernetes.md

@@ -1,187 +0,0 @@
-Running in Kubernetes
-=====================
-
-In case you would like to deploy element-web in a kubernetes cluster you can use
-the provided Kubernetes example below as a starting point. Note that this example assumes the
-Nginx ingress to be installed.
-
-Note that the content of the required `config.json` is defined inside this yaml because it needs
-to be put in your Kubernetes cluster as a `ConfigMap`.
-
-So to use it you must create a file with this content as a starting point and modify it so it meets
-the requirements of your environment.
-
-Then you can deploy it to your cluster with something like `kubectl apply -f my-element-web.yaml`.
-
-    # This is an example of a POSSIBLE config for deploying a single element-web instance in Kubernetes
-
-    # Use the element-web namespace to put it all in.
-
-    apiVersion: v1
-    kind: Namespace
-    metadata:
-      name: element-web
-
-    ---
-
-    # The config.json file is to be put into Kubernetes as a config file in such a way that
-    # the element web instance can read it.
-    # The code below shows how this can be done with the config.sample.json content.
-
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      name: element-config
-      namespace: element-web
-    data:
-      config.json: |
-        {
-            "default_server_config": {
-                "m.homeserver": {
-                    "base_url": "https://matrix-client.matrix.org",
-                    "server_name": "matrix.org"
-                },
-                "m.identity_server": {
-                    "base_url": "https://vector.im"
-                }
-            },
-            "disable_custom_urls": false,
-            "disable_guests": false,
-            "disable_login_language_selector": false,
-            "disable_3pid_login": false,
-            "brand": "Element",
-            "integrations_ui_url": "https://scalar.vector.im/",
-            "integrations_rest_url": "https://scalar.vector.im/api",
-            "integrations_widgets_urls": [
-                    "https://scalar.vector.im/_matrix/integrations/v1",
-                    "https://scalar.vector.im/api",
-                    "https://scalar-staging.vector.im/_matrix/integrations/v1",
-                    "https://scalar-staging.vector.im/api",
-                    "https://scalar-staging.riot.im/scalar/api"
-            ],
-            "bug_report_endpoint_url": "https://element.io/bugreports/submit",
-            "defaultCountryCode": "GB",
-            "showLabsSettings": false,
-            "features": { },
-            "default_federate": true,
-            "default_theme": "light",
-            "roomDirectory": {
-                "servers": [
-                        "matrix.org"
-                ]
-            },
-            "piwik": {
-                "url": "https://piwik.riot.im/",
-                "whitelistedHSUrls": ["https://matrix.org"],
-                "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
-                "siteId": 1
-            },
-            "enable_presence_by_hs_url": {
-                "https://matrix.org": false,
-                "https://matrix-client.matrix.org": false
-            },
-            "settingDefaults": {
-                "breadcrumbs": true
-            },
-            "jitsi": {
-                "preferredDomain": "jitsi.riot.im"
-            }
-        }
-
-
-    ---
-
-    # A deployment of the element-web for a single instance
-
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: element
-      namespace: element-web
-    spec:
-      selector:
-        matchLabels:
-          app: element
-      replicas: 1
-      template:
-        metadata:
-          labels:
-            app: element
-        spec:
-          containers:
-          - name: element
-            image: vectorim/element-web:latest
-            volumeMounts:
-            - name: config-volume
-              mountPath: /app/config.json
-              subPath: config.json
-            ports:
-            - containerPort: 80
-              name: element
-              protocol: TCP
-            readinessProbe:
-                httpGet:
-                    path: /
-                    port: element
-                initialDelaySeconds: 2
-                periodSeconds: 3
-            livenessProbe:
-                httpGet:
-                    path: /
-                    port: element
-                initialDelaySeconds: 10
-                periodSeconds: 10
-          volumes:
-          - name: config-volume
-            configMap:
-              name: element-config
-
-    ---
-
-    # Wrap it all in a Service
-
-    apiVersion: v1
-    kind: Service
-    metadata:
-      name: element
-      namespace: element-web
-    spec:
-      selector:
-        app: element
-      ports:
-        - name: default
-          protocol: TCP
-          port: 80
-          targetPort: 80
-
-    ---
-
-    # An ingress definition to expose the service via a hostname
-
-    apiVersion: networking.k8s.io/v1
-    kind: Ingress
-    metadata:
-      name: element
-      namespace: element-web
-      annotations:
-        kubernetes.io/ingress.class: nginx
-        nginx.ingress.kubernetes.io/configuration-snippet: |
-          add_header X-Frame-Options SAMEORIGIN;
-          add_header X-Content-Type-Options nosniff;
-          add_header X-XSS-Protection "1; mode=block";
-          add_header Content-Security-Policy "frame-ancestors 'none'";
-    spec:
-      rules:
-        - host: element.example.nl
-          http:
-            paths:
-              - pathType: Prefix
-                path: /
-                backend:
-                  service:
-                    name: element
-                    port:
-                      number: 80
-
-    ---
-

docs/labs.md

@@ -7,14 +7,9 @@ to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in
 **Be warned! Labs features are not finalised, they may be fragile, they may change, they may be
 dropped. Ask in the room if you are unclear about any details here.**
 
-## Submit Abuse Report to Moderators [MSC3215](https://github.com/matrix-org/matrix-doc/pull/3215) support (`feature_report_to_moderators`)
+## New spinner design (`feature_new_spinner`)
 
-A new version of the "Report" dialog that lets users send abuse reports directly to room moderators,
-if the room supports it.
-
-## Render LaTeX maths in messages (`feature_latex_maths`)
-
-Enables rendering of LaTeX maths in messages using [KaTeX](https://katex.org/). LaTeX between single dollar-signs is interpreted as inline maths and double dollar-signs as display maths (i.e. centred on its own line).
+Replaces the old spinner image with a new, svg-based one featuring a sleeker design.
 
 ## Message pinning (`feature_pinning`)
 
@@ -111,34 +106,3 @@ To enable message previews for reactions in DMs, enable `feature_roomlist_previe
 represent what communities v2 will look/feel like and can/will change without notice. Due to the early
 stages this feature is in and the requirement for a compatible homeserver, we will not be accepting issues
 or feedback for this functionality at this time.
-
-## Dehydrated devices (`feature_dehydration`)
-
-Allows users to receive encrypted messages by creating a device that is stored
-encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697).
-
-## Do not disturb (`feature_dnd`)
-
-Enables UI for turning on "do not disturb" mode for the current device. When DND mode is engaged, popups
-and notification noises are suppressed. Not perfect, but can help reduce noise.
-
-## Hidden read receipts (`feature_hidden_read_receipts`)
-
-Enables sending hidden read receipts as per [MSC2285](https://github.com/matrix-org/matrix-doc/pull/2285)
-
-## New layout switcher (with message bubbles) (`feature_new_layout_switcher`)
-
-Adds a "Message layout" section under `Settings -> Appearance`, where the user can select their preferred message layout (e.g. IRC or Modern). Additionally, adds a new "Message bubbles" layout.
-
-## Pseudonymous Analytics opt-in (`feature_pseudonymous_analytics_opt_in`)
-
-Opts in to collection of pseudonymous analytics data via Posthog. See https://github.com/matrix-org/matrix-react-sdk/pull/6495
-
-## Polls (`feature_polls`) [In Development]
-
-Polls are a way to gauge interest from your community about a certain topic with a simple voting mechanic
-within the message timeline. Note that this feature is currently under active development and therefore is
-entirely incomplete and may not work at all - it is not recommended for general use at this time.
-
-Bug reports, feature requests, etc are not currently accepted for this feature flag. A later stage of
-development will provide opportunities for feedback.

docs/native-node-modules.md

@@ -1,3 +1,60 @@
 # Native Node Modules
 
-This documentation moved to the [`element-desktop`](https://github.com/vector-im/element-desktop/blob/develop/docs/native-node-modules.md) repository.
+For some features, the desktop version of Element can make use of native Node
+modules. These allow Riot to integrate with the desktop in ways that a browser
+cannot.
+
+While native modules enable powerful new features, they must be complied for
+each operating system. For official Element releases, we will always build these
+modules from source to ensure we can trust the compiled output. In the future,
+we may offer a pre-compiled path for those who want to use these features in a
+custom build of Element without installing the various build tools required.
+
+Do note that compiling a module for a particular operating system
+(Linux/macOS/Windows) will need to be done on that operating system.
+Cross-compiling from a host OS for a different target OS may be possible, but
+we don't support this flow with Element dependencies at this time.
+
+At the moment, we need to make some changes to the Element release process before
+we can support native Node modules at release time, so these features are
+currently disabled by default until that is resolved. The following sections
+explain the manual steps you can use with a custom build of Element to enable
+these features if you'd like to try them out.
+
+## Adding Seshat for search in E2E encrypted rooms
+
+Seshat is a native Node module that adds support for local event indexing and
+full text search in E2E encrypted rooms.
+
+Since Seshat is written in Rust, the Rust compiler and related tools need to be
+installed before installing Seshat itself. To install Rust please consult the
+official Rust [documentation](https://www.rust-lang.org/tools/install).
+
+Seshat also depends on the SQLCipher library to store its data in encrypted form
+on disk. You'll need to install it via your OS package manager.
+
+After installing the Rust compiler and SQLCipher, Seshat support can be added
+using yarn inside the `electron_app/` directory:
+
+    yarn add matrix-seshat
+
+You will have to rebuild the native libraries against electron's version of
+of node rather than your system node, using the `electron-build-env` tool.
+This is also needed to when pulling in changes to Seshat using `yarn link`.
+Again from the `electron_app/` directory:
+
+    yarn add electron-build-env
+
+Recompiling Seshat itself can be done like so:
+
+    yarn run electron-build-env -- --electron 6.1.1 -- neon build matrix-seshat --release
+
+Please make sure to include all the `--` as well as the `--release` command line
+switch at the end. Modify your electron version accordingly depending on the
+version that is installed on your system.
+
+After this is done the Electron version of Element can be run from the main folder
+as usual using:
+
+    yarn electron
+

docs/pr-previews.md

@@ -1,30 +0,0 @@
-# Pull Request Previews
-
-Pull requests to the React SDK layer (and in the future other layers as well)
-automatically set up a preview site with a full deployment of Element with the
-changes from the pull request added in so that anyone can easily test and review
-them. This is especially useful for checking visual and interactive changes.
-
-To access the preview site, click the link in the description of the PR.
-
-The checks section could be collapsed at first, so you may need to click "Show
-all checks" to reveal them. Look for an entry that mentions `deploy-preview`. It
-may be at the end of the list, so you may need scroll a bit to see it. To access
-the preview site, click the "Details" link in the deploy preview row.
-
-**Important:** Please always use test accounts when logging into preview sites,
-as they may contain unreviewed and potentially dangerous code that could damage
-your account, exfiltrate encryption keys, etc.
-
-## FAQs
-
-### Are preview sites created for pull requests from contributors?
-
-Yes, they are created for all PRs from any author.
-
-### Do preview sites expire after some time period?
-
-No, there is no expiry date, so they should remain accessible indefinitely, but
-of course they obviously aren't meant to live beyond the development workflow,
-so please don't rely on them for anything important. They may disappear at any
-time without notice.

docs/review.md

@@ -43,7 +43,7 @@ When reviewing code, here are some things we look for and also things we avoid:
 
 ### Workflow
 
-* Authors should request review from the element-web team by default (if someone on
+* Authors should request review from the riot-web team by default (if someone on
   the team is clearly the expert in an area, a direct review request to them may
   be more appropriate)
 * Reviewers should remove the team review request and request review from
@@ -58,43 +58,6 @@ When reviewing code, here are some things we look for and also things we avoid:
 * Assign issues only when in progress to indicate to others what can be picked
   up
 
-## Code Quality
-
-In the past, we have occasionally written different kinds of tests for
-Element and the SDKs, but it hasn't been a consistent focus. Going forward, we'd
-like to change that.
-
-* For new features, code reviewers will expect some form of automated testing to
-  be included by default
-* For bug fixes, regression tests are of course great to have, but we don't want
-  to block fixes on this, so we won't require them at this time
-
-The above policy is not a strict rule, but instead it's meant to be a
-conversation between the author and reviewer. As an author, try to think about
-writing a test when making your next change. As a reviewer, try to think about
-how you might test the area of code you are reviewing. If the reviewer agrees
-it would be quite difficult to test some new feature, then it's okay for them to
-accept the change without tests for now, but we'd eventually like to be more
-strict about this further down the road.
-
-If you do spot areas that are quite hard to test today, please let us know in
-[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org). We can
-work on improving the app architecture and testing helpers so that future tests
-are easier for everyone to write, but we won't know which parts are difficult
-unless people shout when stumbling through them.
-
-We recognise that this testing policy will slow things down a bit, but overall
-it should encourage better long-term health of the app and give everyone more
-confidence when making changes as coverage increases over time.
-
-For changes guarded by a feature flag, we currently lean towards prioritising
-our ability to evolve quickly using such flags and thus we will not currently
-require tests to appear at the same time as the initial landing of features
-guarded by flags, as long as (for new flagged features going forward) the
-feature author understands that they are effectively deferring part of their
-work (adding tests) until later and tests are expected to appear before the
-feature can be enabled by default.
-
 ## Design and Product Review
 
 We want to ensure that all changes to Element fit with our design and product
@@ -110,11 +73,12 @@ functionality is:
   required (though may still be useful) since we can continue tweaking
 
 As it can be difficult to review design work from looking at just the changed
-files in a PR, a [preview site](./pr-previews.md) that includes your changes
-will be added automatically so that anyone who's interested can try them out
-easily.
+files in a PR, authors should be prepared for Design and / or Product teams to
+request a link to an ad-hoc build of Element (hosted anywhere) that can be used for
+the review. In the future, we [hope to automate
+this](https://github.com/vector-im/riot-web/issues/12624) for every PR.
 
 Before starting work on a feature, it's best to ensure your plan aligns well
 with our vision for Element. Please chat with the team in
-[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before
-you start so we can ensure it's something we'd be willing to merge.
+[#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) before you
+start so we can ensure it's something we'd be willing to merge.

docs/skinning thoughts.md

@@ -52,7 +52,7 @@ other changes:
     - skins/vector/themes/foo/css
     - skins/vector/themes/foo/img
     - skins/vector/themes/foo/fonts
-  - ideally element-web would contain almost nothing but skins/vector directory. 
+  - ideally riot-web would contain almost nothing but skins/vector directory. 
   - ability to entirely replace CSS rather than override it for a given theme
     - e.g. if we replace `Login.js` with `StatusLogin.js`, then we should similarly be able to replace `_Login.scss` with `_StatusLogin.scss`.
 

docs/translating-dev.md

@@ -2,7 +2,7 @@
 
 ## Requirements
 
-- A working [Development Setup](../README.md#setting-up-a-dev-environment)
+- A working [Development Setup](../../#setting-up-a-dev-environment)
   - Including up-to-date versions of matrix-react-sdk and matrix-js-sdk
 - Latest LTS version of Node.js installed
 - Be able to understand English

docs/translating.md

@@ -6,28 +6,27 @@
 - Be able to understand English
 - Be able to understand the language you want to translate Element into
 
-## Step 0: Join #element-translations:matrix.org
+## Step 0: Join #riotweb-translations:matrix.org
 
-1. Come and join https://matrix.to/#/#element-translations:matrix.org for general discussion 
-2. Join https://matrix.to/#/#element-translators:matrix.org for language-specific rooms
-3. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)
+1. Come and join https://matrix.to/#/#riotweb-translations:matrix.org
+2. Read scrollback and/or ask if anyone else is working on your language, and co-ordinate if needed.  In general little-or-no coordination is needed though :)
 
 ## Step 1: Preparing your Weblate Profile
 
-1. Head to https://translate.element.io and register either via Github or email
+1. Head to https://translate.riot.im and register either via Github or email
 2. After registering check if you got an email to verify your account and click the link (if there is none head to step 1.4)
 3. Log into weblate
-4. Head to https://translate.element.io/accounts/profile/ and select the languages you know and maybe another language you know too.
-6. Head to https://translate.element.io/accounts/profile/#subscriptions and select Element Web as Project
+4. Head to https://translate.riot.im/accounts/profile/ and select the languages you know and maybe another language you know too.
+6. Head to https://translate.riot.im/accounts/profile/#subscriptions and select Element Web as Project
 
 ## How to check if your language already is being translated
 
-Go to https://translate.element.io/projects/element-web/ and visit the 2 sub-projects.
+Go to https://translate.riot.im/projects/riot-web/ and visit the 2 sub-projects.
 If your language is listed go to Step 2a and if not go to Step 2b
 
 ## Step 2a: Helping on existing languages.
 
-1. Head to one of the projects listed https://translate.element.io/projects/element-web/
+1. Head to one of the projects listed https://translate.riot.im/projects/riot-web/
 2. Click on the ``translate`` button on the right side of your language
 3. Fill in the translations in the writeable field. You will see the original English string and the string of your second language above.
 
@@ -35,7 +34,7 @@ Head to the explanations under Steb 2b
 
 ## Step 2b: Adding a new language
 
-1. Go to one of the projects listed https://translate.element.io/projects/element-web/
+1. Go to one of the projects listed https://translate.riot.im/projects/riot-web/
 2. Click the ``Start new translation`` button at the bottom
 3. Select a language
 4. Start translating like in 2a.3

element.io/README

@@ -6,7 +6,7 @@ official element.io distribution, but these files may be useful if you want to
 inspect the configuration used there.
 
 Element Desktop uses a separate config (see
-https://github.com/vector-im/element-desktop/tree/develop/element.io).
+https://github.com/vector-im/riot-desktop/tree/develop/element.io).
 
 Deployment scripts (such as app/deploy.py) are meant to be run on the web server
 hosting the Element installation.

element.io/app/config.json

@@ -20,9 +20,7 @@
     },
     "roomDirectory": {
         "servers": [
-            "matrix.org",
-            "gitter.im",
-            "libera.chat"
+            "matrix.org"
         ]
     },
     "enable_presence_by_hs_url": {
@@ -38,15 +36,5 @@
             "url": "https://element.io/cookie-policy",
             "text": "Cookie Policy"
         }
-    ],
-    "hostSignup": {
-      "brand": "Element Home",
-      "cookiePolicyUrl": "https://element.io/cookie-policy",
-      "domains": [
-          "matrix.org"
-      ],
-      "privacyPolicyUrl": "https://element.io/privacy",
-      "termsOfServiceUrl": "https://element.io/terms-of-service",
-      "url": "https://ems.element.io/element-home/in-app-loader"
-    }
+    ]
 }

element.io/app/deploy.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# download and unpack a element-web tarball.
+# download and unpack a riot-web tarball.
 #
 # Allows `bundles` to be extracted to a common directory, and a link to
 # config.json to be added.

element.io/develop/config.json

@@ -1,8 +1,8 @@
 {
     "default_server_name": "matrix.org",
     "brand": "Element",
-    "integrations_ui_url": "https://scalar.vector.im/",
-    "integrations_rest_url": "https://scalar.vector.im/api",
+    "integrations_ui_url": "https://scalar-staging.vector.im/",
+    "integrations_rest_url": "https://scalar-staging.vector.im/api",
     "integrations_widgets_urls": [
         "https://scalar.vector.im/_matrix/integrations/v1",
         "https://scalar.vector.im/api",
@@ -20,9 +20,7 @@
     },
     "roomDirectory": {
         "servers": [
-            "matrix.org",
-            "gitter.im",
-            "libera.chat"
+            "matrix.org"
         ]
     },
     "enable_presence_by_hs_url": {
@@ -38,23 +36,5 @@
             "url": "https://element.io/cookie-policy",
             "text": "Cookie Policy"
         }
-    ],
-    "hostSignup": {
-      "brand": "Element Home",
-      "cookiePolicyUrl": "https://element.io/cookie-policy",
-      "domains": [
-          "matrix.org"
-      ],
-      "privacyPolicyUrl": "https://element.io/privacy",
-      "termsOfServiceUrl": "https://element.io/terms-of-service",
-      "url": "https://ems.element.io/element-home/in-app-loader"
-    },
-    "sentry": {
-        "dsn": "https://029a0eb289f942508ae0fb17935bd8c5@sentry.matrix.org/6",
-        "environment": "develop"
-    },
-    "posthog": {
-        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
-        "apiHost": "https://posthog.hss.element.io"
-    }
+    ]
 }

nginx/conf.d/default.conf

@@ -1,18 +0,0 @@
-server {
-    listen       80;
-    listen  [::]:80;
-    server_name  localhost;
-
-    root   /usr/share/nginx/html;
-    index  index.html;
-
-    # Set no-cache for the index.html only so that browsers always check for a new copy of Element Web.
-    location = /index.html {
-        add_header Cache-Control "no-cache";
-    }
-
-    # redirect server error pages to the static page /50x.html
-    #
-    error_page   500 502 503 504  /50x.html;
-}
-

package.json

@@ -1,11 +1,12 @@
 {
-  "name": "element-web",
-  "version": "1.9.2",
+  "name": "riot-web",
+  "productName": "Riot",
+  "version": "1.7.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vector-im/element-web"
+    "url": "https://github.com/vector-im/riot-web"
   },
   "license": "Apache-2.0",
   "files": [
@@ -29,146 +30,124 @@
   "scripts": {
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
-    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
     "reskindex": "reskindex -h src/header",
     "reskindex:watch": "reskindex -h src/header -w",
     "reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
     "clean": "rimraf lib webapp",
-    "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
-    "build-stats": "yarn clean && yarn build:genfiles && yarn build:bundle-stats",
+    "build": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle",
+    "build-stats": "yarn clean && yarn build:genfiles && yarn build:compile && yarn build:types && yarn build:bundle-stats",
     "build:jitsi": "node scripts/build-jitsi.js",
     "build:res": "node scripts/copy-res.js",
     "build:genfiles": "yarn reskindex && yarn build:res && yarn build:jitsi",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
+    "build:compile": "babel -d lib --verbose --extensions \".ts,.js,.tsx\" src",
     "build:bundle": "webpack --progress --bail --mode production",
     "build:bundle-stats": "webpack --progress --bail --mode production --json > webpack-stats.json",
+    "build:types": "tsc --emitDeclarationOnly --jsx react",
     "dist": "scripts/package.sh",
-    "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
-    "start:https": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,element-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js --https\"",
+    "start": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n reskindex,reskindex-react,res,riot-js \"yarn reskindex:watch\" \"yarn reskindex:watch-react\" \"yarn start:res\" \"yarn start:js\"",
     "start:res": "yarn build:jitsi && node scripts/copy-res.js -w",
-    "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development --disable-host-check --hot",
+    "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development",
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-    "lint:js": "eslint --max-warnings 0 src",
-    "lint:js-fix": "eslint --fix src",
+    "lint:js": "eslint src",
     "lint:types": "tsc --noEmit --jsx react",
     "lint:style": "stylelint 'res/css/**/*.scss'",
     "test": "jest"
   },
   "dependencies": {
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
     "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
-    "highlight.js": "^11.3.1",
-    "jsrsasign": "^10.2.0",
-    "katex": "^0.12.0",
+    "highlight.js": "^9.13.1",
+    "jsrsasign": "^9.1.5",
     "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
     "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
-    "matrix-widget-api": "^0.1.0-beta.16",
+    "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "prop-types": "^15.7.2",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
-    "sanitize-html": "^2.3.2",
-    "ua-parser-js": "^0.7.24"
+    "react": "^16.9.0",
+    "react-dom": "^16.9.0",
+    "sanitize-html": "^1.19.1",
+    "ua-parser-js": "^0.7.19",
+    "url": "^0.11.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/eslint-parser": "^7.12.10",
-    "@babel/eslint-plugin": "^7.12.10",
-    "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-proposal-decorators": "^7.12.12",
-    "@babel/plugin-proposal-export-default-from": "^7.12.1",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-    "@babel/plugin-proposal-numeric-separator": "^7.12.7",
-    "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.12.10",
-    "@babel/preset-env": "^7.12.11",
-    "@babel/preset-react": "^7.12.10",
-    "@babel/preset-typescript": "^7.12.7",
-    "@babel/register": "^7.12.10",
-    "@babel/runtime": "^7.12.5",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
-    "@principalstudio/html-webpack-inject-preload": "^1.2.7",
-    "@sentry/webpack-plugin": "^1.18.1",
+    "@babel/cli": "^7.7.5",
+    "@babel/core": "^7.7.5",
+    "@babel/plugin-proposal-class-properties": "^7.7.4",
+    "@babel/plugin-proposal-decorators": "^7.7.4",
+    "@babel/plugin-proposal-export-default-from": "^7.7.4",
+    "@babel/plugin-proposal-numeric-separator": "^7.7.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.7.4",
+    "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+    "@babel/plugin-transform-flow-comments": "^7.7.4",
+    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/preset-env": "^7.7.6",
+    "@babel/preset-flow": "^7.7.4",
+    "@babel/preset-react": "^7.7.4",
+    "@babel/preset-typescript": "^7.7.4",
+    "@babel/register": "^7.7.4",
+    "@babel/runtime": "^7.7.6",
     "@types/flux": "^3.1.9",
-    "@types/jest": "^27.0.2",
     "@types/modernizr": "^3.5.3",
-    "@types/node": "^14.14.22",
-    "@types/react": "17.0.14",
-    "@types/react-dom": "17.0.9",
-    "@types/sanitize-html": "^2.3.1",
-    "@typescript-eslint/eslint-plugin": "^4.17.0",
-    "@typescript-eslint/parser": "^4.17.0",
-    "allchange": "^1.0.4",
-    "autoprefixer": "^9.8.6",
-    "babel-jest": "^26.6.3",
-    "babel-loader": "^8.2.2",
-    "chokidar": "^3.5.1",
-    "concurrently": "^5.3.0",
-    "cpx": "^1.5.0",
-    "css-loader": "^3.6.0",
-    "dotenv": "^10.0.0",
-    "eslint": "7.18.0",
-    "eslint-config-google": "^0.14.0",
-    "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
-    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "@types/node": "^12.12.41",
+    "@types/react": "16.9",
+    "@types/react-dom": "^16.9.4",
+    "autoprefixer": "^9.7.3",
+    "babel-eslint": "^10.0.3",
+    "babel-jest": "^24.9.0",
+    "babel-loader": "^8.0.6",
+    "canvas": "^2.6.1",
+    "chokidar": "^3.3.1",
+    "concurrently": "^4.0.1",
+    "cpx": "^1.3.2",
+    "css-loader": "^3.3.2",
+    "eslint": "7.3.1",
+    "eslint-config-matrix-org": "^0.1.2",
+    "eslint-plugin-babel": "^4.1.2",
+    "eslint-plugin-flowtype": "^2.50.3",
+    "eslint-plugin-react": "^7.11.1",
+    "eslint-plugin-react-hooks": "^2.2.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "fake-indexeddb": "^3.1.2",
-    "file-loader": "^5.1.0",
+    "fake-indexeddb": "^3.0.0",
+    "file-loader": "^5.0.2",
     "fs-extra": "^0.30.0",
-    "html-webpack-plugin": "^4.5.2",
-    "jest": "^26.6.3",
-    "jest-environment-jsdom-sixteen": "^1.0.3",
-    "jest-raw-loader": "^1.0.1",
-    "json-loader": "^0.5.7",
-    "loader-utils": "^1.4.0",
+    "html-webpack-plugin": "^3.2.0",
+    "jest": "^24.9.0",
+    "jest-environment-jsdom-fourteen": "^1.0.1",
+    "json-loader": "^0.5.3",
+    "loader-utils": "^1.2.3",
     "matrix-mock-request": "^1.2.3",
-    "matrix-react-test-utils": "^0.2.3",
-    "matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
-    "mini-css-extract-plugin": "^0.12.0",
-    "minimist": "^1.2.5",
-    "mkdirp": "^1.0.4",
-    "modernizr": "^3.11.7",
-    "node-fetch": "^2.6.1",
-    "optimize-css-assets-webpack-plugin": "^5.0.4",
+    "matrix-react-test-utils": "^0.2.2",
+    "mini-css-extract-plugin": "^0.8.0",
+    "minimist": "^1.2.0",
+    "mkdirp": "^0.5.1",
+    "modernizr": "^3.6.0",
+    "node-fetch": "^2.6.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
     "postcss-easings": "^2.0.0",
     "postcss-extend": "^1.0.5",
-    "postcss-hexrgba": "^2.0.1",
+    "postcss-hexrgba": "^2.0.0",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-mixins": "^6.2.3",
-    "postcss-nested": "^4.2.3",
+    "postcss-nested": "^4.2.1",
     "postcss-preset-env": "^6.7.0",
-    "postcss-scss": "^2.1.1",
+    "postcss-scss": "^2.0.0",
     "postcss-simple-vars": "^5.0.2",
     "postcss-strip-inline-comments": "^0.1.5",
-    "raw-loader": "^4.0.2",
-    "react-refresh": "^0.10.0",
-    "rimraf": "^3.0.2",
+    "rimraf": "^2.4.3",
     "shell-escape": "^0.2.0",
-    "simple-proxy-agent": "^1.1.0",
-    "string-replace-loader": "2",
-    "style-loader": "2",
-    "stylelint": "^13.9.0",
-    "stylelint-config-standard": "^20.0.0",
-    "stylelint-scss": "^3.18.0",
-    "terser-webpack-plugin": "^2.3.8",
-    "typescript": "4.3.5",
-    "webpack": "^4.46.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.2",
-    "worker-loader": "^2.0.0",
-    "worklet-loader": "^2.0.0"
-  },
-  "resolutions": {
-    "@types/react": "17.0.14"
+    "stylelint": "^12.0.1",
+    "terser-webpack-plugin": "^2.3.0",
+    "typescript": "^3.7.3",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.9.0"
   },
   "jest": {
-    "testEnvironment": "jest-environment-jsdom-sixteen",
+    "testEnvironment": "jest-environment-jsdom-fourteen",
     "testMatch": [
-      "<rootDir>/test/**/*-test.[tj]s?(x)"
+      "<rootDir>/test/**/*-test.js"
     ],
     "setupFilesAfterEnv": [
       "<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
@@ -181,15 +160,7 @@
       "^react$": "<rootDir>/node_modules/react",
       "^react-dom$": "<rootDir>/node_modules/react-dom",
       "^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
-      "^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
-      "decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-      "decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-      "waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-      "context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
-      "FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
-      "workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
-      "^!!raw-loader!.*": "jest-raw-loader",
-      "RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js"
+      "^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src"
     },
     "transformIgnorePatterns": [
       "/node_modules/(?!matrix-js-sdk).+$",

release.sh

@@ -38,12 +38,14 @@ do
             echo "Upgrading $i to $latestver..."
             yarn add -E $i@$latestver
             git add -u
-            git commit -m "Upgrade $i to $latestver"
+            # The `-e` flag opens the editor and gives you a chance to check
+            # the upgrade for correctness.
+            git commit -m "Upgrade $i to $latestver" -e
         fi
     fi
 done
 
-./node_modules/matrix-js-sdk/release.sh -n -z "$orig_args"
+./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args"
 
 release="${1#v}"
 tag="v${release}"

release_config.yaml

@@ -1,4 +1 @@
 signing_id: releases@riot.im
-subprojects:
-    matrix-react-sdk:
-        includeByDefault: true

res/css/structures/ErrorView.scss

@@ -22,7 +22,7 @@ limitations under the License.
     background: -moz-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
     background: -webkit-linear-gradient(top, #c5e0f7 0%, #ffffff 100%);
     background: linear-gradient(to bottom, #c5e0f7 0%, #ffffff 100%);
-    filter: progid:dximagetransform.microsoft.gradient(startColorstr='#c5e0f7', endColorstr='#ffffff', GradientType=0);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c5e0f7', endColorstr='#ffffff',GradientType=0 );
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
     width: 100%;
     min-height: 100%;
@@ -41,7 +41,7 @@ limitations under the License.
         margin-left: 4px;
         margin-right: 4px;
         min-width: 80px;
-        background-color: #03b381;
+        background-color: #03B381;
         color: #fff;
         cursor: pointer;
         padding: 12px 22px;
@@ -54,7 +54,7 @@ limitations under the License.
     }
 
     .mx_HomePage_header {
-        color: #2e2f32;
+        color: #2E2F32;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -95,7 +95,7 @@ limitations under the License.
     }
 
     .mx_FooterLink {
-        color: #368bd6;
+        color: #368BD6;
         text-decoration: none;
     }
 }

res/decoder-ring/index.html

@@ -11,7 +11,7 @@
         <script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"></script>
         <!--<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
         <script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>-->
-        <script crossorigin src="https://unpkg.com/rxjs/dist/bundles/rxjs.umd.min.js"></script>
+        <script crossorigin src="https://unpkg.com/rxjs/bundles/rxjs.umd.min.js"></script>
         <script src="datatypes.js"></script>
         <script src="decoder.js"></script>
 

res/sw.js

@@ -1 +1 @@
-self.addEventListener('fetch', () => {});
+self.addEventListener('fetch',() => {});

res/welcome.html

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

scripts/build-jitsi.js

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

scripts/ci_package.sh

@@ -6,7 +6,7 @@
 
 set -ex
 
-rm dist/element-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
+rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
 
 # Since the deps are fetched from git, we can rev-parse
 REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
@@ -14,4 +14,4 @@ JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
 
 VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
 
-CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh
+CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh -d

scripts/compare-file.js

@@ -0,0 +1,10 @@
+const fs = require("fs");
+
+if (process.argv.length < 4) throw new Error("Missing source and target file arguments");
+
+const sourceFile = fs.readFileSync(process.argv[2], 'utf8');
+const targetFile = fs.readFileSync(process.argv[3], 'utf8');
+
+if (sourceFile !== targetFile) {
+    throw new Error("Files do not match");
+}

scripts/copy-res.js

@@ -21,12 +21,10 @@ 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'},
     {'value': 'gl', 'label': 'Galego'},
-    {'value': 'he', 'label': 'עברית'},
     {'value': 'hi', 'label': 'हिन्दी'},
     {'value': 'hu', 'label': 'Magyar'},
     {'value': 'is', 'label': 'íslenska'},
@@ -69,7 +67,7 @@ const COPY_LIST = [
     ["res/vector-icons/**", "webapp/vector-icons"],
     ["res/decoder-ring/**", "webapp/decoder-ring"],
     ["node_modules/matrix-react-sdk/res/media/**", "webapp/media"],
-    ["node_modules/@matrix-org/olm/olm_legacy.js", "webapp", { directwatch: 1 }],
+    ["node_modules/olm/olm_legacy.js", "webapp", { directwatch: 1 }],
     ["./config.json", "webapp", { directwatch: 1 }],
     ["contribute.json", "webapp"],
 ];

scripts/deploy.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# download and unpack a element-web tarball.
+# download and unpack a riot-web tarball.
 #
 # Allows `bundles` to be extracted to a common directory, and a link to
 # config.json to be added.

scripts/docker-link-repos.sh

@@ -32,7 +32,6 @@ cd react-sdk
 yarn link
 yarn link matrix-js-sdk
 yarn --network-timeout=100000 install
-yarn reskindex
 cd ../
 
 echo "Setting up element-web with react-sdk and js-sdk packages"

scripts/fetch-develop.deps.sh

@@ -70,19 +70,24 @@ function dodep() {
 
 ##############################
 
+echo -en 'travis_fold:start:matrix-js-sdk\r'
 echo 'Setting up matrix-js-sdk'
 
 dodep matrix-org matrix-js-sdk
 
 pushd matrix-js-sdk
 yarn link
-yarn install --pure-lockfile
+yarn install
+yarn build
 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
@@ -90,12 +95,14 @@ dodep matrix-org matrix-react-sdk
 pushd matrix-react-sdk
 yarn link
 yarn link matrix-js-sdk
-yarn install --pure-lockfile
-yarn reskindex
+yarn install
+yarn build
 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`,

scripts/issues-burndown.pl

@@ -18,7 +18,7 @@ my $gh = Net::GitHub->new(
     login => 'ara4n', pass => read_password("github password: "),
 );
 
-$gh->set_default_user_repo('vector-im', 'element-web');
+$gh->set_default_user_repo('vector-im', 'riot-web');
 
 #my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
 my @issues = $gh->issue->repos_issues({ state => 'all' });

scripts/issues-no-state.pl

@@ -18,7 +18,7 @@ my $gh = Net::GitHub->new(
     login => 'ara4n', pass => read_password("github password: "),
 );
 
-$gh->set_default_user_repo('vector-im', 'element-web');
+$gh->set_default_user_repo('vector-im', 'riot-web');
 
 #my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
 my @issues = $gh->issue->repos_issues({ state => 'all' });

scripts/package.sh

@@ -16,20 +16,20 @@ yarn build
 cp config.sample.json webapp/
 
 mkdir -p dist
-cp -r webapp element-$version
+cp -r webapp riot-$version
 
 # Just in case you have a local config, remove it before packaging
-rm element-$version/config.json || true
+rm riot-$version/config.json || true
 
 # if $version looks like semver with leading v, strip it before writing to file
 if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
-    echo ${version:1} > element-$version/version
+    echo ${version:1} > riot-$version/version
 else
-    echo ${version} > element-$version/version
+    echo ${version} > riot-$version/version
 fi
 
-tar chvzf dist/element-$version.tar.gz element-$version
-rm -r element-$version
+tar chvzf dist/riot-$version.tar.gz riot-$version
+rm -r riot-$version
 
 echo
-echo "Packaged dist/element-$version.tar.gz"
+echo "Packaged dist/riot-$version.tar.gz"

scripts/redeploy.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# auto-deploy script for https://develop.element.io
+# auto-deploy script for https://riot.im/develop
 #
 # Listens for buildkite webhook pokes (https://buildkite.com/docs/apis/webhooks)
 # When it gets one, downloads the artifact from buildkite
@@ -191,7 +191,7 @@ def deploy_tarball(artifact, build_dir):
 
     # Download the tarball here as buildkite needs auth to do this
     # we don't pgp-sign buildkite artifacts, relying on HTTPS and buildkite
-    # not being evil. If that's not good enough for you, don't use develop.element.io.
+    # not being evil. If that's not good enough for you, don't use riot.im/develop.
     resp = requests.get(artifact['download_url'], stream=True, headers=req_headers())
     resp.raise_for_status()
     with open(artifact['filename'], 'wb') as ofp:

src/@types/global.d.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2020, 2021 New Vector Ltd
+Copyright 2020 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,46 +15,23 @@ limitations under the License.
 */
 
 import "matrix-react-sdk/src/@types/global"; // load matrix-react-sdk's type extensions first
-import type { Renderer } from "react-dom";
-import type { logger } from "matrix-js-sdk/src/logger";
-
-type ElectronChannel =
-    "app_onAction" |
-    "before-quit" |
-    "check_updates" |
-    "install_update" |
-    "ipcCall" |
-    "ipcReply" |
-    "loudNotification" |
-    "preferences" |
-    "seshat" |
-    "seshatReply" |
-    "setBadgeCount" |
-    "update-downloaded" |
-    "userDownloadCompleted" |
-    "userDownloadOpen";
+import type {Renderer} from "react-dom";
 
 declare global {
     interface Window {
         mxSendRageshake: (text: string, withLogs?: boolean) => void;
-        matrixLogger: typeof logger;
         matrixChat: ReturnType<Renderer>;
 
         // electron-only
-        electron?: Electron;
+        ipcRenderer: any;
 
         // opera-only
-        opera?: any;
+        opera: any;
 
         // https://developer.mozilla.org/en-US/docs/Web/API/InstallTrigger
         InstallTrigger: any;
     }
 
-    interface Electron {
-        on(channel: ElectronChannel, listener: (event: Event, ...args: any[]) => void): void;
-        send(channel: ElectronChannel, ...args: any[]): void;
-    }
-
     interface Navigator {
         // PWA badging extensions https://w3c.github.io/badging/
         setAppBadge?(count: number): Promise<void>;

src/@types/raw-loader.d.ts

@@ -1,4 +0,0 @@
-declare module '!!raw-loader!*' {
-    const contents: string;
-    export default contents;
-}

src/async-components/structures/CompatibilityView.tsx

@@ -27,55 +27,7 @@ interface IProps {
 }
 
 const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
-    const { brand, mobileBuilds } = SdkConfig.get();
-
-    let ios = null;
-    const iosCustomUrl = mobileBuilds?.ios;
-    if (iosCustomUrl !== null) { // could be undefined or a string
-        ios = <>
-            <p><strong>iOS</strong> (iPhone or iPad)</p>
-            <a
-                href={iosCustomUrl || "https://apps.apple.com/app/vector/id1083446067"}
-                target="_blank"
-                className="mx_ClearDecoration"
-            >
-                <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
-            </a>
-        </>;
-    }
-
-    let android = [<p className="mx_Spacer" key="header"><strong>Android</strong></p>];
-    const andCustomUrl = mobileBuilds?.android;
-    const fdroidCustomUrl = mobileBuilds?.fdroid;
-    if (andCustomUrl !== null) { // undefined or string
-        android.push(<a
-            href={andCustomUrl || "https://play.google.com/store/apps/details?id=im.vector.app"}
-            target="_blank"
-            className="mx_ClearDecoration"
-            key="android"
-        >
-            <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
-        </a>);
-    }
-    if (fdroidCustomUrl !== null) { // undefined or string
-        android.push(<a
-            href={fdroidCustomUrl || "https://f-droid.org/repository/browse/?fdid=im.vector.app"}
-            target="_blank"
-            className="mx_ClearDecoration"
-            key="fdroid"
-        >
-            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
-        </a>);
-    }
-    if (android.length === 1) { // just a header, meaning no links
-        android = [];
-    }
-
-    let mobileHeader = <h2 id="step2_heading">{ _t("Use %(brand)s on mobile", { brand }) }</h2>;
-    if (!android.length && !ios) {
-        mobileHeader = null;
-    }
-
+    const brand = SdkConfig.get().brand;
     return <div className="mx_ErrorView">
         <div className="mx_ErrorView_container">
             <div className="mx_HomePage_header">
@@ -102,11 +54,11 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                                 'or <safariLink>Safari</safariLink> for the best experience.',
                                 {},
                                 {
-                                    'chromeLink': (sub) => <a href="https://www.google.com/chrome">{ sub }</a>,
-                                    'firefoxLink': (sub) => <a href="https://firefox.com">{ sub }</a>,
-                                    'safariLink': (sub) => <a href="https://apple.com/safari">{ sub }</a>,
+                                    'chromeLink': (sub) => <a href="https://www.google.com/chrome">{sub}</a>,
+                                    'firefoxLink': (sub) => <a href="https://firefox.com">{sub}</a>,
+                                    'safariLink': (sub) => <a href="https://apple.com/safari">{sub}</a>,
                                 },
-                            ) }
+                            )}
                         </p>
                         <p>
                             { _t(
@@ -124,9 +76,30 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
             <div className="mx_HomePage_col">
                 <div className="mx_HomePage_row">
                     <div>
-                        { mobileHeader }
-                        { ios }
-                        { android }
+                        <h2 id="step2_heading">Use Element on mobile</h2>
+                        <p><strong>iOS</strong> (iPhone or iPad)</p>
+                        <a
+                            href="https://apps.apple.com/app/vector/id1083446067"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
+                            <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
+                        </a>
+                        <p className="mx_Spacer"><strong>Android</strong></p>
+                        <a
+                            href="https://play.google.com/store/apps/details?id=im.vector.app"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
+                            <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
+                        </a>
+                        <a
+                            href="https://f-droid.org/repository/browse/?fdid=im.vector.app"
+                            target="_blank"
+                            className="mx_ClearDecoration"
+                        >
+                            <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
+                        </a>
                     </div>
                 </div>
             </div>

src/async-components/structures/ErrorView.tsx

@@ -27,7 +27,7 @@ interface IProps {
     messages?: string[];
 }
 
-const ErrorView: React.FC<IProps> = ({ title, messages }) => {
+const ErrorView: React.FC<IProps> = ({title, messages}) => {
     return <div className="mx_ErrorView">
         <div className="mx_ErrorView_container">
             <div className="mx_HomePage_header">
@@ -40,9 +40,9 @@ const ErrorView: React.FC<IProps> = ({ title, messages }) => {
                 <div className="mx_HomePage_row">
                     <div>
                         <h2 id="step1_heading">{ title }</h2>
-                        { messages && messages.map(msg => <p key={msg}>
+                        {messages && messages.map(msg => <p key={msg}>
                             { msg }
-                        </p>) }
+                        </p>)}
                     </div>
                 </div>
             </div>

src/components/structures/VectorEmbeddedPage.js

@@ -16,6 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+'use strict';
+
 import EmbeddedPage from 'matrix-react-sdk/src/components/structures/EmbeddedPage';
 import sanitizeHtml from 'sanitize-html';
 import { _t } from 'matrix-react-sdk/src/languageHandler';
@@ -24,9 +26,9 @@ export default class VectorEmbeddedPage extends EmbeddedPage {
     static replaces = 'EmbeddedPage';
 
     // we're overriding the base component here, for Element-specific tweaks
-    translate(s: string) {
+    translate(s) {
         s = sanitizeHtml(_t(s));
-        // ugly fix for https://github.com/vector-im/element-web/issues/4243
+        // ugly fix for https://github.com/vector-im/riot-web/issues/4243
         // eslint-disable-next-line max-len
         s = s.replace(/\[matrix\]/, '<a href="https://matrix.org" target="_blank" rel="noreferrer noopener"><img width="79" height="34" alt="Matrix" style="padding-left: 1px;vertical-align: middle" src="welcome/images/matrix.svg"/></a>');
         return s;

src/components/views/auth/VectorAuthFooter.js

@@ -22,9 +22,9 @@ import { _t } from 'matrix-react-sdk/src/languageHandler';
 const VectorAuthFooter = () => {
     const brandingConfig = SdkConfig.get().branding;
     let links = [
-        { "text": "Blog", "url": "https://element.io/blog" },
-        { "text": "Twitter", "url": "https://twitter.com/element_hq" },
-        { "text": "GitHub", "url": "https://github.com/vector-im/element-web" },
+        {"text": "Blog", "url": "https://element.io/blog"},
+        {"text": "Twitter", "url": "https://twitter.com/element_hq"},
+        {"text": "GitHub", "url": "https://github.com/vector-im/riot-web"},
     ];
 
     if (brandingConfig && brandingConfig.authFooterLinks) {
@@ -35,14 +35,14 @@ const VectorAuthFooter = () => {
     for (const linkEntry of links) {
         authFooterLinks.push(
             <a href={linkEntry.url} key={linkEntry.text} target="_blank" rel="noreferrer noopener">
-                { linkEntry.text }
+                {linkEntry.text}
             </a>,
         );
     }
 
     return (
         <div className="mx_AuthFooter">
-            { authFooterLinks }
+            {authFooterLinks}
             <a href="https://matrix.org" target="_blank" rel="noreferrer noopener">{ _t('Powered by Matrix') }</a>
         </div>
     );

src/components/views/auth/VectorAuthHeaderLogo.js

@@ -15,11 +15,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+'use strict';
+
 import React from 'react';
+import PropTypes from 'prop-types';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
 
 export default class VectorAuthHeaderLogo extends React.PureComponent {
-    static replaces = 'AuthHeaderLogo';
+    static replaces = 'AuthHeaderLogo'
+
+    static propTypes = {
+        icon: PropTypes.string,
+    }
 
     render() {
         const brandingConfig = SdkConfig.get().branding;

src/components/views/auth/VectorAuthPage.js

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { CSSProperties } from 'react';
+import React from 'react';
 import * as sdk from 'matrix-react-sdk/src/index';
 import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
 
 export default class VectorAuthPage extends React.PureComponent {
-    static replaces = 'AuthPage';
+    static replaces = 'AuthPage'
 
     static welcomeBackgroundUrl;
 
@@ -48,12 +48,12 @@ export default class VectorAuthPage extends React.PureComponent {
             background: `center/cover fixed url(${VectorAuthPage.getWelcomeBackgroundUrl()})`,
         };
 
-        const modalStyle: CSSProperties = {
+        const modalStyle = {
             position: 'relative',
             background: 'initial',
         };
 
-        const blurStyle: CSSProperties = {
+        const blurStyle = {
             position: 'absolute',
             top: 0,
             right: 0,
@@ -63,7 +63,7 @@ export default class VectorAuthPage extends React.PureComponent {
             background: pageStyle.background,
         };
 
-        const modalContentStyle: CSSProperties = {
+        const modalContentStyle = {
             display: 'flex',
             zIndex: 1,
             background: 'rgba(255, 255, 255, 0.59)',

src/customisations/README.md

@@ -1 +0,0 @@
-../../docs/customisations.md

src/favicon.ts

@@ -57,7 +57,7 @@ export default class Favicon {
     private readyCb = () => {};
 
     constructor(params: Partial<IParams> = {}) {
-        this.params = { ...defaults, ...params };
+        this.params = {...defaults, ...params};
 
         this.icons = Favicon.getIcons();
         // create work canvas
@@ -125,7 +125,7 @@ export default class Favicon {
     }
 
     private circle(n: number | string, opts?: Partial<IParams>) {
-        const params = { ...this.params, ...opts };
+        const params = {...this.params, ...opts};
         const opt = this.options(n, params);
 
         let more = false;
@@ -214,7 +214,7 @@ export default class Favicon {
         if (!this.isReady) {
             this.readyCb = () => {
                 this.badge(content, opts);
-            };
+            }
             return;
         }
 

src/i18n/strings/ar.json

@@ -1,38 +1,35 @@
 {
-    "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 & 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": "تدعمه «ماترِكس»",
-    "Use %(brand)s on mobile": "استعمل %(brand)s على المحمول",
-    "Switch to space by number": "التبديل إلى المساحة بالرقم"
+    "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": "فشل الاقلاع"
 }

src/i18n/strings/bg.json

@@ -31,7 +31,5 @@
     "Download Completed": "Свалянето завърши",
     "Open": "Отвори",
     "Your browser can't run %(brand)s": "Браузърът ви не може да изпълни %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия.",
-    "Powered by Matrix": "Базирано на Matrix",
-    "Use %(brand)s on mobile": "Използвайте %(brand)s на мобилен телефон"
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s използва модерни функции на браузъра, които не се поддържат от Вашия."
 }

src/i18n/strings/bn_IN.json

@@ -1,5 +1 @@
-{
-    "Your Element is misconfigured": "আপনার এলিমেন্ট টি ভুল ভাবে কনফিগার করা হয়েছে",
-    "Invalid configuration: no default server specified.": "ভুল কনফিগারেশনঃ কোনো মূল সার্ভার উল্লেখ করা হয়নি।",
-    "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."
-}
+{}

src/i18n/strings/bs.json

@@ -1,35 +1 @@
-{
-    "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"
-}
+{}

src/i18n/strings/ca.json

@@ -1,38 +1,14 @@
 {
     "Dismiss": "Omet",
     "Unknown device": "Dispositiu desconegut",
-    "Welcome to Element": "Benvingut/da a Element",
-    "You need to be using HTTPS to place a screen-sharing call.": "Has d'utilitzar HTTPS per poder fer una trucada amb pantalla compartida.",
+    "Welcome to Element": "Us donem la benvinguda a Element",
+    "You need to be using HTTPS to place a screen-sharing call.": "Heu d'utilitzar HTTPS per poder fer una trucada amb pantalla compartida.",
     "powered by Matrix": "amb tecnologia de Matrix",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Xat descentralitzat, xifrat i col·laboratiu amb tecnologia de [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Xat descentralitzat, encriptat i col·laboratiu amb tecnologia de [matrix]",
     "Create Account": "Crea un compte",
-    "Explore rooms": "Explora sales",
-    "Sign In": "Inicia sessió",
-    "Invalid configuration: no default server specified.": "Configuració invàlida: no s'ha especificat cap servidor predeterminat.",
-    "Invalid JSON": "JSON invàlid",
-    "Go to your browser to complete Sign In": "Vés al navegador per completar l'inici de sessió",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuració invàlida: només pots especificar una únic default_server_config, default_server_name, o default_hs_url.",
-    "Your Element is misconfigured": "Element està mal configurat",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "La configuració d'Element conté un JSON invàlid. Soluciona el problema i actualitza la pàgina.",
-    "The message from the parser is: %(message)s": "El missatge de l'analitzador és: %(message)s",
-    "Unable to load config file: please refresh the page to try again.": "No s'ha pogut carregar el fitxer de configuració: actualitza la pàgina per tornar-ho a provar.",
-    "Unexpected error preparing the app. See console for details.": "Error inesperat durant la preparació de l'aplicació. Consulta la consola pels a més detalls.",
-    "Download Completed": "Baixada completada",
-    "Open": "Obre",
-    "Open user settings": "Obre la configuració d'usuari",
-    "Previous/next recently visited room or community": "Anterior/següent sala o comunitat visitada recentment",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s d'escriptori (%(platformName)s)",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Powered by Matrix": "Amb tecnologia de Matrix",
-    "Unsupported browser": "Navegador no compatible",
-    "Your browser can't run %(brand)s": "El teu navegador no pot executar %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utilitza funcions del navegador avançades que no són compatibles amb el teu navegador actual.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instal·la <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per obtenir la millor experiència.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Pots continuar utilitzant el teu navegador actual, però algunes o totes les funcions podrien no funcionar i l'aspecte de l'aplicació podria ser incorrecte.",
-    "I understand the risks and wish to continue": "Entenc els riscos i vull continuar",
-    "Go to element.io": "Vés a element.io",
-    "Failed to start": "Ha fallat l'inici",
-    "Missing indexeddb worker script!": "Falta l'script del treballador indexeddb!",
-    "Use %(brand)s on mobile": "Utilitza %(brand)s al mòbil",
-    "Switch to space by number": "Canvia d'espai per número"
+    "Explore rooms": "Exploreu les sales",
+    "Sign In": "Inicia la sessió",
+    "Invalid configuration: no default server specified.": "Configuració no vàlida: no s'ha especificat cap servidor per defecte.",
+    "Invalid JSON": "JSON no vàlid",
+    "Go to your browser to complete Sign In": "Aneu al vostre navegador per completar l'inici de sessió"
 }

src/i18n/strings/cs.json

@@ -2,7 +2,7 @@
     "Welcome to Element": "Vítá vás Element",
     "Unknown device": "Neznámé zařízení",
     "You need to be using HTTPS to place a screen-sharing call.": "Pro uskutečnění hovoru se sdílením obrazovky musíte používat HTTPS.",
-    "Dismiss": "Zavřít",
+    "Dismiss": "Zahodit",
     "powered by Matrix": "používá protokol Matrix",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralizovaný, šifrovaný chat a spolupráce na platformě [matrix]",
     "Sign In": "Přihlásit se",
@@ -28,11 +28,5 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Pro nejlepší zážitek si prosím nainstalujte prohlížeč <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, nebo <safariLink>Safari</safariLink>.",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Můžete pokračovat v užívání vašeho současného prohlížeče, ale některé (nebo dokonce všechny) funkce nemusí fungovat a vzhled a chování aplikace nemusí být správné.",
     "I understand the risks and wish to continue": "Rozumím a přesto chci pokračovat",
-    "Go to element.io": "Přejít na element.io",
-    "Failed to start": "Nepovedlo se nastartovat",
-    "Powered by Matrix": "Běží na Matrixu",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)",
-    "Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!",
-    "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních",
-    "Switch to space by number": "Přepnout na prostor podle čísla"
+    "Go to element.io": "Přejít na element.io"
 }

src/i18n/strings/da.json

@@ -9,28 +9,13 @@
     "Invalid JSON": "Ugyldig JSON",
     "Unexpected error preparing the app. See console for details.": "Uventet fejl ved forberedelse af appen. Se konsollen for detaljer.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ugyldig konfiguration: kan kun angive en af default_server_config, default_server_name eller default_hs_url.",
-    "Invalid configuration: no default server specified.": "Ugyldig konfiguration: Ingen standardserver er angivet.",
+    "Invalid configuration: no default server specified.": "Ugyldig konfiguration: ingen standardserver angivet.",
     "Sign In": "Log ind",
     "Create Account": "Opret brugerkonto",
     "Explore rooms": "Udforsk rum",
     "Missing indexeddb worker script!": "Manglende indexeddb worker script!",
-    "Unable to load config file: please refresh the page to try again.": "Ikke i stand til at indlæse konfigurationsfil: Genopfrisk venligst siden for at prøve igen.",
+    "Unable to load config file: please refresh the page to try again.": "Ikke i stand til at loade config fil: genopfrisk venligst siden for at prøve igen.",
     "Open user settings": "Åbn brugerindstillinger",
     "Previous/next recently visited room or community": "Forrige/næste besøgte rum eller fællesskab",
-    "Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind",
-    "Go to element.io": "Gå til element.io",
-    "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker at fortsætte",
-    "Unsupported browser": "Browser ikke understøttet",
-    "Open": "Åbn",
-    "Download Completed": "Hentning færdig",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Din Element konfiguration indeholder ugyldig JSON. Løs venligst problemet og genindlæs siden.",
-    "Your Element is misconfigured": "Din Element er konfigureret forkert",
-    "Your browser can't run %(brand)s": "Din browser kan ikke køre %(brand)s",
-    "Powered by Matrix": "Drevet af Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Failed to start": "Opstart mislykkedes",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop %(platformName)s",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kan fortsætte med at bruge din nuværende browser, men du kan opleve at visse eller alle funktioner ikke vil fungere korrekt.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Venligst installer <chromeLink>Chrome</chromeLink>,<firefoxLink>Firefox</firefoxLink> eller <safariLink>Safari</safariLink> for den bedste oplevelse.",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruger avanceret browser funktioner som ikke er understøttet af din nuværende browser."
+    "Go to your browser to complete Sign In": "Gå til din browser for at færdiggøre Log ind"
 }

src/i18n/strings/de_DE.json

@@ -2,37 +2,35 @@
     "powered by Matrix": "betrieben mit Matrix",
     "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.",
+    "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",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung basierend auf [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- & Kollaborationslösung unterstützt von [matrix]",
     "Sign In": "Anmelden",
-    "Create Account": "Konto erstellen",
-    "Explore rooms": "Räume erkunden",
-    "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App. Siehe in die Konsole für mehr Details.",
+    "Create Account": "Account erstellen",
+    "Explore rooms": "Erkunde Räume",
+    "Unexpected error preparing the app. See console for details.": "Unerwarteter Fehler bei der Vorbereitung der App. Siehe Konsole für Details.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ungültige Konfiguration: Es kann nur eine der Optionen default_server_config, default_server_name oder default_hs_url angegeben werden.",
     "Invalid configuration: no default server specified.": "Ungültige Konfiguration: Es wurde kein Standardserver angegeben.",
     "The message from the parser is: %(message)s": "Die Nachricht des Parsers ist: %(message)s",
     "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": "Benutzereinstellungen öffnen",
-    "Unable to load config file: please refresh the page to try again.": "Konfigurationsdatei kann nicht geladen werden: Bitte aktualisiere die Seite, um es erneut zu versuchen.",
-    "Missing indexeddb worker script!": "Fehlendes indexeddb-Arbeitsskript!",
+    "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!": "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",
     "Failed to start": "Start fehlgeschlagen",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kannst deinen aktuellen Browser weiterhin verwenden. Es ist aber möglich, dass nicht alles richtig funktioniert oder das Aussehen der App inkorrekt ist.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bitte installiere <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, oder <safariLink>Safari</safariLink> für das beste Erlebnis.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Du kannst mit diesem Browser weitermachen, aber einiges könnte nicht funktionieren und die Darstellung könnte fehlerhaft sein.",
     "I understand the risks and wish to continue": "Ich verstehe die Risiken und möchte fortfahren",
-    "Your Element is misconfigured": "Dein Element ist falsch konfiguriert",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Deine Elementkonfiguration enthält ungültiges JSON. Bitte korrigiere das Problem und lade die Seite neu.",
-    "Download Completed": "Herunterladen fertiggestellt",
+    "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": "Öffnen",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem Browser nicht unterstützt werden.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von Ihrem aktuellen Browser nicht unterstützt werden.",
     "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
-    "Powered by Matrix": "Betrieben mit Matrix",
-    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy",
-    "Switch to space by number": "Zum n-ten Space wechseln"
+    "Powered by Matrix": "Betrieben von Matrix"
 }

src/i18n/strings/el.json

@@ -4,33 +4,13 @@
     "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για την πραγματοποίηση κλήσης διαμοιρασμού επιφάνειας εργασίας.",
     "powered by Matrix": "λειτουργεί με το Matrix",
     "Welcome to Element": "Καλώς ήλθατε στο Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνεργασία συνομιλίας χρησιμοποιώντας το [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία και συνεργασία χρησιμοποιώντας το [matrix]",
     "Sign In": "Σύνδεση",
     "Create Account": "Δημιουργία Λογαριασμού",
     "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": "Εξερευνήστε δωμάτια",
-    "Open": "Άνοιγμα",
-    "Go to your browser to complete Sign In": "Μεταβείτε στο πρόγραμμα περιήγησής σας για να ολοκληρώσετε τη σύνδεση",
-    "Powered by Matrix": "Με την υποστήριξη του Matrix",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Παρακαλούμε εγκαταστήστε <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ή <safariLink>Safari</safariLink> για καλύτερη εμπειρία χρήσης.",
-    "Your Element is misconfigured": "Το Element σας δεν εχει ρυθμιστεί σωστά",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Η ρύθμιση του Element περιέχει μη έγκυρο JSON. Διορθώστε το πρόβλημα και φορτώστε ξανά τη σελίδα.",
-    "Unable to load config file: please refresh the page to try again.": "Δεν είναι δυνατή η φόρτωση του αρχείου config: ανανεώστε τη σελίδα για να δοκιμάσετε ξανά.",
-    "Download Completed": "Η λήψη ολοκληρώθηκε",
-    "Open user settings": "Ανοίξτε τις ρυθμίσεις χρήστη",
-    "Previous/next recently visited room or community": "Προηγούμενο / επόμενο δωμάτιο ή κοινότητα που επισκεφτήκατε πρόσφατα",
-    "Unsupported browser": "Μη υποστηριζόμενο πρόγραμμα περιήγησης",
-    "Your browser can't run %(brand)s": "Το πρόγραμμα περιήγησής σας δεν μπορεί να εκτελέσει %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s χρησιμοποιεί προηγμένες δυνατότητες προγράμματος περιήγησης που δεν υποστηρίζονται από το τρέχον πρόγραμμα περιήγησής σας.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Μπορείτε να συνεχίσετε να χρησιμοποιείτε το τρέχον πρόγραμμα περιήγησής σας, αλλά ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν και η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι λανθασμένη.",
-    "I understand the risks and wish to continue": "Κατανοώ τους κινδύνους και επιθυμώ να συνεχίσω",
-    "Go to element.io": "Πήγαινε στο element.io",
-    "Failed to start": "Αποτυχία έναρξης",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "Missing indexeddb worker script!": "Απουσία indexeddb worker script!"
+    "Explore rooms": "Εξερευνήστε δωμάτια"
 }

src/i18n/strings/en_EN.json

@@ -1,4 +1,5 @@
 {
+    "Missing indexeddb worker script!": "Missing indexeddb worker script!",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
     "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
     "Your Element is misconfigured": "Your Element is misconfigured",
@@ -10,7 +11,6 @@
     "Download Completed": "Download Completed",
     "Open": "Open",
     "Dismiss": "Dismiss",
-    "Switch to space by number": "Switch to space by number",
     "Open user settings": "Open user settings",
     "Previous/next recently visited room or community": "Previous/next recently visited room or community",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
@@ -19,7 +19,6 @@
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
     "Powered by Matrix": "Powered by Matrix",
-    "Use %(brand)s on mobile": "Use %(brand)s on mobile",
     "Unsupported browser": "Unsupported browser",
     "Your browser can't run %(brand)s": "Your browser can't run %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uses advanced browser features which aren't supported by your current browser.",

src/i18n/strings/en_US.json

@@ -12,26 +12,5 @@
     "Invalid JSON": "Invalid JSON",
     "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
-    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
-    "Failed to start": "Failed to start",
-    "Go to element.io": "Go to element.io",
-    "I understand the risks and wish to continue": "I understand the risks and wish to continue",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uses advanced browser features which aren't supported by your current browser.",
-    "Your browser can't run %(brand)s": "Your browser can't run %(brand)s",
-    "Unsupported browser": "Unsupported browser",
-    "Powered by Matrix": "Powered by Matrix",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Go to your browser to complete Sign In": "Go to your browser to complete Sign In",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "Previous/next recently visited room or community": "Previous/next recently visited room or community",
-    "Open user settings": "Open user settings",
-    "Open": "Open",
-    "Download Completed": "Download Completed",
-    "Unable to load config file: please refresh the page to try again.": "Unable to load config file: please refresh the page to try again.",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.",
-    "Your Element is misconfigured": "Your Element is misconfigured",
-    "Missing indexeddb worker script!": "Missing indexeddb worker script!",
-    "Switch to space by number": "Switch to space by number"
+    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified."
 }

src/i18n/strings/eo.json

@@ -32,7 +32,5 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Via agordaro de Elemento enhavas nevalidajn datumojn de JSON. Bonvolu korekti la problemon kaj aktualigi la paĝon.",
     "Your browser can't run %(brand)s": "Via foliumilo ne povas ruli %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s uzas specialajn funkciojn de foliumilo, kiujn via nuna foliumilo ne subtenas.",
-    "Powered by Matrix": "Povigata de Matrix",
-    "Use %(brand)s on mobile": "Uzi %(brand)s telefone",
-    "Switch to space by number": "Baskuli al aro laŭ numero"
+    "Powered by Matrix": "Povigata de Matrix"
 }

src/i18n/strings/es.json

@@ -3,36 +3,33 @@
     "Dismiss": "Omitir",
     "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": "Te damos la bienvenida a Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas. Funciona con [matrix]",
+    "Welcome to Element": "Bienvenido a Element",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Conversaciones cifradas y descentralizadas y colaboración con el poder de [matrix]",
     "Sign In": "Iniciar sesión",
     "Create Account": "Crear cuenta",
     "Explore rooms": "Explorar salas",
-    "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Ver la consola para más detalles.",
+    "Unexpected error preparing the app. See console for details.": "Error inesperado preparando la aplicación. Vea la consola para más detalles.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración errónea: sólo puede especificar uno de default_server_config, default_server_name, o default_hs_url.",
     "Invalid configuration: no default server specified.": "Configuración errónea: no se ha especificado servidor.",
     "The message from the parser is: %(message)s": "El mensaje del parser es: %(message)s",
     "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!": "¡Falta el Worker script “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 intentarlo otra vez.",
+    "Missing indexeddb worker script!": "¡Worker script “indexeddb” faltante!",
+    "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 de escritorio (%(platformName)s)",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Unsupported browser": "Navegador no compatible",
+    "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.",
     "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.": "Puedes seguir utilizando tu navegador actual, pero puede que algunas funcionalidades no estén disponibles o que algunas partes de la aplicación se muestren de forma incorrecta.",
-    "I understand the risks and wish to continue": "Entiendo los riesgos y quiero continuar",
+    "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": "Tu aplicación Element está mal configurada",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Tu configuración de Element contiene JSON inválido. Por favor corrígelo e inténtelo de nuevo.",
+    "Your Element is misconfigured": "Su Element 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": "Tu navegador no es compatible con %(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.",
-    "Powered by Matrix": "Funciona con Matrix",
-    "Use %(brand)s on mobile": "Usar %(brand)s en modo móvil",
-    "Switch to space by number": "Cambiar a espacio por número"
+    "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."
 }

src/i18n/strings/et.json

@@ -3,7 +3,7 @@
     "Invalid JSON": "Vigane JSON",
     "Unknown device": "Tundmatu seade",
     "Invalid configuration: no default server specified.": "Vigane seadistus: vaikimisi server on määramata.",
-    "Unable to load config file: please refresh the page to try again.": "Seadistuste faili laadimine ei õnnestunud: uuesti proovimiseks palun laadi leht uuesti.",
+    "Unable to load config file: please refresh the page to try again.": "Seadistuste faili laadimine ei õnnestunud: uuesti proovimiseks palun lae leht uuesti.",
     "Unexpected error preparing the app. See console for details.": "Rakenduse ettevalmistamisel tekkis ootamatu viga. Täpsema teabe leiad konsoolist.",
     "Open user settings": "Ava kasutaja seadistused",
     "Go to your browser to complete Sign In": "Sisselogimiseks ava oma brauser",
@@ -15,7 +15,7 @@
     "Previous/next recently visited room or community": "Eelmine/järgmine hiljuti kasutatud jututuba või kogukond",
     "You need to be using HTTPS to place a screen-sharing call.": "Ekraani jagava kõne jaoks pead kasutama HTTPS-ühendust.",
     "powered by Matrix": "põhineb Matrix'il",
-    "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element",
+    "Welcome to Element": "Tere tulemast Element kasutajaks",
     "Sign In": "Logi sisse",
     "Create Account": "Loo konto",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s'i töölauaversioon (%(platformName)s)",
@@ -29,10 +29,8 @@
     "Download Completed": "Allalaadimine on lõpetatud",
     "Open": "Ava",
     "Your Element is misconfigured": "Sinu Element on valesti seadistatud",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sinu Element'i seadistustes on vigased JSON-vormingus andmed. Palun paranda see viga ja laadi leht uuesti.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sinu Element'i seadistustes on vigased JSON-vormingus andmed. Palun paranda see viga ja lae leht uuesti.",
     "Your browser can't run %(brand)s": "%(brand)s ei toimi sinu brauseris",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
-    "Powered by Matrix": "Põhineb Matrix'il",
-    "Use %(brand)s on mobile": "Kasuta rakendust %(brand)s nutiseadmes",
-    "Switch to space by number": "Vaata kogukonnakeskust tema numbri alusel"
+    "Powered by Matrix": "Põhineb Matrix'il"
 }

src/i18n/strings/fa.json

@@ -26,13 +26,11 @@
     "%(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 از ویژگی های پیشرفته مرورگر استفاده میکند که در مرورگر فعلی شما پشتیبانی نمیشوند.",
+    "%(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": "قدرت‌گرفته از ماتریکس",
-    "Use %(brand)s on mobile": "استفاده از %(brand)s روی گوشی",
-    "Switch to space by number": "تغییر به فضا با شماره"
+    "Powered by Matrix": "قدرت‌گرفته از ماتریکس"
 }

src/i18n/strings/fi.json

@@ -2,7 +2,7 @@
     "Dismiss": "Hylkää",
     "Unknown device": "Tuntematon laite",
     "Welcome to Element": "Tervetuloa Element-sovellukseen",
-    "You need to be using HTTPS to place a screen-sharing call.": "Sinun täytyy käyttää HTTPS-yhteyttä, jotta voit jakaa näytön puhelussa.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Sinun täytyy käyttää HTTPS-yhteyttä, jotta voit jakaa ruudun puhelussa.",
     "powered by Matrix": "moottorina Matrix",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Hajautettua ja salattua viestintää Matrix-teknologialla",
     "Sign In": "Kirjaudu",
@@ -32,7 +32,5 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element-asetuksesi sisältävät epäkelpoa JSONia. Korjaa ongelma ja lataa sivu uudelleen.",
     "Powered by Matrix": "Moottorina Matrix",
     "Your browser can't run %(brand)s": "%(brand)s ei toimi selaimessasi",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s käyttää edistyneitä selaimen ominaisuuksia, joita nykyinen selaimesi ei tue.",
-    "Use %(brand)s on mobile": "Käytä %(brand)sia mobiilisti",
-    "Switch to space by number": "Vaihda avaruuteen käyttäen numeroa"
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s käyttää edistyneitä selaimen ominaisuuksia, joita nykyinen selaimesi ei tue."
 }

src/i18n/strings/fr.json

@@ -4,12 +4,12 @@
     "Unknown device": "Appareil inconnu",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
     "Welcome to Element": "Bienvenue sur Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "Discussion & collaboration décentralisées et chiffrées, propulsées par [matrix]",
     "Sign In": "Se connecter",
     "Create Account": "Créer un compte",
-    "Explore rooms": "Parcourir les salons",
+    "Explore rooms": "Explorer les salons",
     "Unexpected error preparing the app. See console for details.": "Une erreur inattendue est survenue pendant la préparation de l’application. Consultez la console pour avoir des détails.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs parmis default_server_config, default_server_name et default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuration invalide : il ne faut spécifier qu’un des trois champs entre default_server_config, default_server_name et default_hs_url.",
     "Invalid configuration: no default server specified.": "Configuration invalide : aucun serveur par défaut spécifié.",
     "The message from the parser is: %(message)s": "Le message de l’analyseur est : %(message)s",
     "Invalid JSON": "JSON non valide",
@@ -21,7 +21,7 @@
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Navigateur non pris en charge",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Veuillez installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> ou <safariLink>Safari</safariLink> pour une expérience optimale.",
-    "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.": "Vous pouvez continuer à utiliser votre navigateur actuel, mais vous risquez de trouver que certaines fonctionnalités et/ou l’apparence de l’application sont incorrectes.",
+    "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.": "Vous pouvez continuer à utiliser votre navigateur actuel, mais vous risquez de trouver que certaines fonctionnalités et/ou l'apparence de l'application sont incorrectes.",
     "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer",
     "Go to element.io": "Aller vers element.io",
     "Failed to start": "Échec au démarrage",
@@ -31,8 +31,5 @@
     "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 prend pas en charge.",
-    "Powered by Matrix": "Propulsé par Matrix",
-    "Use %(brand)s on mobile": "Utiliser %(brand)s sur téléphone",
-    "Switch to space by number": "Afficher un espace par son numéro"
+    "%(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."
 }

src/i18n/strings/fy.json

@@ -1,36 +0,0 @@
-{
-    "Sign In": "Ynskriuwe",
-    "Failed to start": "Iepenjen mislearre",
-    "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.": "Jo kinne fierder gean mei jo eigen browser, mar guon funksjes kinne net wurkje en uterlik kin de applikaasje der ôfwikend út sjen.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Graach <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of<safariLink>Safari</safariLink> ynstallearre foar de beste ûnderfining.",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brûkt avansearre browser funksjes dy net stipe wurde troch de browser dy jo no brûke.",
-    "Powered by Matrix": "Fersoarge troch Matrix",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
-    "Previous/next recently visited room or community": "Foarige/Folgjende resintlik besochte keamer as mienskip",
-    "Switch to space by number": "Wikselje fan romte mei nûmer",
-    "Unexpected error preparing the app. See console for details.": "Ûnferwachte flater by it klearmeitsjen fan de applikaasje. Sjoch yn'e konsole foar details.",
-    "The message from the parser is: %(message)s": "It berjocht fan de ferwurker is: %(message)s",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jo Element konfiguraasje hat ûnjildige JSON. Nei dat jo dit oplost ha kin dizze side ferfarske wurde.",
-    "Use %(brand)s on mobile": "Brûk %(brand)s op mobyl",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desintralisearre, fersifere chat &amp; gearwurking fersoarge troch [matrix]",
-    "You need to be using HTTPS to place a screen-sharing call.": "Jo moatte HTTPS brûke om te skiljen en jo skermynhâld te dielen.",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Go to your browser to complete Sign In": "Gean nei jo browser om it ynskriuwen ôf te rûnen",
-    "Download Completed": "Klear mei Delheljen",
-    "Unable to load config file: please refresh the page to try again.": "Kin konfiguraasje bestân net lade: ferfarskje de side en probearje it noch ris.",
-    "Open user settings": "Brûkersynstellingen iepenje",
-    "Dismiss": "Negearre",
-    "Explore rooms": "Keamers ûntdekke",
-    "Create Account": "Account Meitsje",
-    "Welcome to Element": "Wolkom by Element",
-    "I understand the risks and wish to continue": "Ik begryp de risiko's en wol graach fierder gean",
-    "Go to element.io": "Gean nei element.io",
-    "Your browser can't run %(brand)s": "Jo browser kin %(brand)s net útfiere",
-    "Unsupported browser": "Net stipe browser",
-    "Unknown device": "Ûnbekend apparaat",
-    "Open": "Iepenje",
-    "Invalid JSON": "Ûnjildiche JSON",
-    "Your Element is misconfigured": "Jo Element is net goed konfigurearre",
-    "Invalid configuration: no default server specified.": "Ûnjildiche konfiguraasje: gjin standert tsjinner selektearre.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ûnjildige konfiguraasje: kin allinnich kieze út default_server_config, default_server_name, as default_hs_url."
-}

src/i18n/strings/ga.json

@@ -7,32 +7,5 @@
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Meán comhrá agus comhoibriú, díláraithe agus criptithe, cumhachtaithe ag [matrix]",
     "Sign In": "Sínigh Isteach",
     "Create Account": "Déan cuntas a chruthú",
-    "Explore rooms": "Breathnaigh thart ar na seomraí",
-    "Your browser can't run %(brand)s": "Níl do bhrabhsálaí comhoiriúnach do %(brand)s",
-    "Go to your browser to complete Sign In": "Oscail do bhrabhsálaí agus críochnaigh an clárú",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Coinníonn do chumraíocht JSON neamhbhailí. Ceartaigh an fadhb agus athlódáil an leathanach le do thoil.",
-    "Your Element is misconfigured": "Níl do fheidhmchlár Element cumraithe i gceart",
-    "Previous/next recently visited room or community": "roimhe/chéad eile, seomra nó pobal is déanaí",
-    "Failed to start": "Theip chun tosú",
-    "I understand the risks and wish to continue": "Tuigim na rioscaí agus ba mhaith liom lean ar aghaidh",
-    "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.": "An féidir leat úsáid do bhrabhsálaí reatha, ach nár oibrí roinnt nó gach gné agus nár thaispeántar an feidhmchlár i gceart.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Suiteáil <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> chun an taithí is fearr a fháil.",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "Úsáideann %(brand)s gnéithe ardforbartha nach bhfuil ar fáil faoi do bhrabhsálaí reatha.",
-    "Unsupported browser": "Brabhsálaí gan tacaíocht",
-    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "%(brand)s Desktop (%(platformName)s)": "%(brand)s deisce (%(platformName)s)",
-    "Unexpected error preparing the app. See console for details.": "Earráid nuair an feidhmchlár a hullmhú. Feic sa consól le haghaidh eolas.",
-    "Unable to load config file: please refresh the page to try again.": "Ní féidir an comhad cumraíochta a lódáil. Athnuaigh an leathanach chun déanamh iarracht arís le do thoil.",
-    "Download Completed": "Íoslódáil críochnaithe",
-    "Invalid JSON": "JSON neamhbhailí",
-    "The message from the parser is: %(message)s": "Is í an teachtaireacht as an parsálaí: %(message)s",
-    "Invalid configuration: no default server specified.": "Cumraíocht neamhbhailí: Níl aon freastalaí réamhshocraithe a sonrú.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Cumraíocht neamhbhailí: ní féidir ach ceann de default_server_config, default_server_name, nó default_hs_url a shonrú.",
-    "Missing indexeddb worker script!": "An script oibrí \"indexeddb\" ag iarraidh!",
-    "Powered by Matrix": "Cumhachtaithe ag Matrix",
-    "Go to element.io": "Téigh go element.io",
-    "Open user settings": "Oscail socruithe úsáideora",
-    "Open": "Oscail",
-    "Use %(brand)s on mobile": "Úsáid %(brand)s ar guthán póca",
-    "Switch to space by number": "Athraigh go spás de réir uimhreach"
+    "Explore rooms": "Breathnaigh thart ar na seomraí"
 }

src/i18n/strings/gl.json

@@ -12,7 +12,7 @@
     "Invalid JSON": "JSON non válido",
     "Unexpected error preparing the app. See console for details.": "Fallo non agardado ao preparar a app. Detalles na consola.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuración non válida: só se pode indicar un de default_server_config, default_server_name, ou default_hs_url.",
-    "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por defecto.",
+    "Invalid configuration: no default server specified.": "Configuración non válida: non se indicou servidor por omisión.",
     "Missing indexeddb worker script!": "Falta o script indexeddb!",
     "Unable to load config file: please refresh the page to try again.": "Non se cargou o ficheiro de configuración: actualiza a páxina para reintentalo.",
     "Open user settings": "Abrir axustes da usuaria",
@@ -32,7 +32,5 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuración de Element contén JSON non válido. Corrixe o problema e recarga a páxina.",
     "Your browser can't run %(brand)s": "O teu navegador non pode executar %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza características avanzadas do navegador que non están dispoñibles no teu navegador.",
-    "Powered by Matrix": "Funciona grazas a Matrix",
-    "Use %(brand)s on mobile": "Utiliza %(brand)s no móbil",
-    "Switch to space by number": "Cambiar a espazo polo número"
+    "Powered by Matrix": "Funciona grazas a Matrix"
 }