Specify node-version for setup-node action

.eslintrc.js

@@ -14,15 +14,11 @@ module.exports = {
     },
     settings: {
         react: {
-            version: 'detect',
-        },
+            version: 'detect'
+        }
     },
     overrides: [{
-        files: [
-            "src/**/*.{ts,tsx}",
-            "test/**/*.{ts,tsx}",
-            "module_system/**/*.{ts,tsx}",
-        ],
+        files: ["src/**/*.{ts,tsx}", "module_system/**/*.{ts,tsx}"],
         extends: [
             "plugin:matrix-org/typescript",
             "plugin:matrix-org/react",

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas).
+        Thank you for taking the time to propose a new feature or make a suggestion.
   - type: textarea
     id: usecase
     attributes:

.github/cfp_headers

@@ -1,10 +0,0 @@
-/*
-  X-XSS-Protection: 1; mode=block
-  X-Content-Type-Options: nosniff
-  Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
-
-/version
-  Content-Type: text/plain
-
-/apple-app-site-association
-  Content-Type: application/json

.github/workflows/build.yml

@@ -18,6 +18,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'yarn'
+          node-version: 16
 
       - name: Install Dependencies
         run: "./scripts/layered.sh"

.github/workflows/build_develop.yml

@@ -1,31 +1,28 @@
 # Separate to the main build workflow for access to develop
 # environment secrets, largely similar to build.yaml.
-name: Build and Deploy develop
+name: Build and Package develop
 on:
   push:
     branches: [ develop ]
   repository_dispatch:
     types: [ element-web-notify ]
 concurrency:
-  group: ${{ github.repository_owner }}-${{ github.workflow }}-${{ github.ref_name }}
+  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true
 jobs:
   build:
-    name: "Build & Deploy develop.element.io"
+    name: "Build & Upload source maps to Sentry"
     # Only respect triggers from our develop branch, ignore that of forks
     if: github.repository == 'vector-im/element-web'
     runs-on: ubuntu-latest
     environment: develop
-    env:
-      R2_BUCKET: 'element-web-develop'
-      R2_URL: ${{ secrets.CF_R2_S3_API }}
-      R2_PUBLIC_URL: 'https://element-web-develop.element.io'
     steps:
       - uses: actions/checkout@v2
 
       - uses: actions/setup-node@v3
         with:
           cache: 'yarn'
+          node-version: 16
 
       - name: Install Dependencies
         run: "./scripts/layered.sh"
@@ -38,78 +35,28 @@ jobs:
           SENTRY_URL: ${{ secrets.SENTRY_URL }}
           SENTRY_ORG: element
           SENTRY_PROJECT: riot-web
-          # We only deploy the latest bundles to Cloudflare Pages and use _redirects to fallback to R2 for
-          # older ones. This redirect means that 'self' is insufficient in the CSP,
-          # and we have to add the R2 URL.
-          # Once Cloudflare redirects support proxying mode we will be able to ditch this.
-          # See Proxying in support table at https://developers.cloudflare.com/pages/platform/redirects
-          CSP_EXTRA_SOURCE: ${{ env.R2_PUBLIC_URL }}
 
       - run: mv dist/element-*.tar.gz dist/develop.tar.gz
 
+      # We keep the latest develop.tar.gz as the artifact uploaded later expires after 24 and requires auth to download
+      # Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
+      - name: Deploy develop.tar.gz to Github Pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: dist
+          single-commit: true
+
       - uses: actions/upload-artifact@v3
         with:
           name: webapp
           path: dist/develop.tar.gz
           retention-days: 1
-          
-      - name: Extract webapp
-        run: |
-          mkdir _deploy
-          tar xf dist/develop.tar.gz -C _deploy --strip-components=1
-          
-      - name: Copy config
-        run: cp element.io/develop/config.json _deploy/config.json
-
-      - name: Populate 404.html
-        run: echo "404 Not Found" > _deploy/404.html
-
-      - name: Populate _headers
-        run: cp .github/cfp_headers _deploy/_headers
-
-      # Redirect requests for the develop tarball and the historical bundles to R2
-      - name: Populate _redirects
-        run: |
-          {
-            echo "/develop.tar.gz $R2_PUBLIC_URL/develop.tar.gz 301"
-            for bundle in $(aws s3 ls s3://$R2_BUCKET/bundles/ --endpoint-url $R2_URL --region=auto | awk '{print $2}'); do
-              echo "/bundles/${bundle}* $R2_PUBLIC_URL/bundles/${bundle}:splat 301"
-            done
-          } | tee _deploy/_redirects
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
 
       - name: Wait for other steps to succeed
         uses: lewagon/wait-on-check-action@v1.1.2
         with:
           ref: ${{ github.ref }}
-          running-workflow-name: 'Build & Deploy develop.element.io'
+          running-workflow-name: 'Build & Upload source maps to Sentry'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 10
           check-regexp: ^((?!SonarQube|issues|board).)*$
-
-      # We keep the latest develop.tar.gz on R2 instead of relying on the github artifact uploaded earlier
-      # as the expires after 24h and requires auth to download.
-      # Element Desktop's fetch script uses this tarball to fetch latest develop to build Nightlies.
-      - name: Deploy to R2
-        run: |
-          aws s3 cp dist/develop.tar.gz s3://$R2_BUCKET/develop.tar.gz --endpoint-url $R2_URL --region=auto
-          aws s3 cp _deploy/bundles s3://$R2_BUCKET/bundles --recursive --endpoint-url $R2_URL --region=auto
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_TOKEN }}
-          
-      - name: Deploy to Cloudflare Pages
-        id: cfp
-        uses: cloudflare/pages-action@1
-        with:
-          apiToken: ${{ secrets.CF_PAGES_TOKEN }}
-          accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
-          projectName: element-web-develop
-          directory: _deploy
-          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          
-      - run: |
-          echo "Deployed to ${{ steps.cfp.outputs.url }}" >> $GITHUB_STEP_SUMMARY
-    

.github/workflows/static_analysis.yaml

@@ -19,6 +19,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'yarn'
+          node-version: 16
 
       - name: Install Dependencies
         run: "./scripts/layered.sh"
@@ -26,41 +27,6 @@ jobs:
       - name: Typecheck
         run: "yarn run lint:types"
 
-  tsc-strict:
-    name: Typescript Strict Error Checker
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-      checks: write
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Get diff lines
-        id: diff
-        uses: Equip-Collaboration/diff-line-numbers@v1.0.0
-        with:
-          include: '["\\.tsx?$"]'
-
-      - name: Detecting files changed
-        id: files
-        uses: futuratrepadeira/changed-files@v4.0.0
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          pattern: '^.*\.tsx?$'
-
-      - uses: t3chguy/typescript-check-action@main
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          use-check: false
-          check-fail-mode: added
-          output-behaviour: annotate
-          ts-extra-args: '--strict'
-          files-changed: ${{ steps.files.outputs.files_updated }}
-          files-added: ${{ steps.files.outputs.files_created }}
-          files-deleted: ${{ steps.files.outputs.files_deleted }}
-          line-numbers: ${{ steps.diff.outputs.lineNumbers }}
-
   i18n_lint:
     name: "i18n Check"
     uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
@@ -74,6 +40,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'yarn'
+          node-version: 16
 
       # Does not need branch matching as only analyses this layer
       - name: Install Deps
@@ -91,6 +58,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'yarn'
+          node-version: 16
 
       # Needs branch matching as it inherits .stylelintrc.js from matrix-react-sdk
       - name: Install Dependencies
@@ -108,6 +76,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: 'yarn'
+          node-version: 16
 
       - name: Install Deps
         run: "scripts/layered.sh"

.github/workflows/tests.yaml

@@ -21,16 +21,13 @@ jobs:
         uses: actions/setup-node@v3
         with:
           cache: 'yarn'
+          node-version: 16
 
       - name: Install Dependencies
         run: "./scripts/layered.sh"
 
-      - name: Get number of CPU cores
-        id: cpu-cores
-        uses: SimenB/github-actions-cpu-cores@v1
-
       - name: Run tests with coverage
-        run: "yarn coverage --ci --reporters github-actions --max-workers ${{ steps.cpu-cores.outputs.count }}"
+        run: "yarn coverage --ci"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2

.github/workflows/triage-labelled.yml

@@ -17,9 +17,7 @@ jobs:
       contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
       contains(github.event.issue.labels.*.name, 'A-Tags') ||
       contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
-      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
-      contains(github.event.issue.labels.*.name, 'A-Element-Call')
+      contains(github.event.issue.labels.*.name, 'A-Message-Starring')
     steps:
       - uses: actions/github-script@v5
         with:
@@ -31,23 +29,6 @@ jobs:
               labels: ['Z-Labs']
             })
 
-  apply_Help-Wanted_label:
-    name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'good first issue') ||
-      contains(github.event.issue.labels.*.name, 'Hacktoberfest')
-    steps:
-      - uses: actions/github-script@v5
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ['Help Wanted']
-            })
-
   move_needs_info_issues:
     name: X-Needs-Info issues to Need info column on triage board
     runs-on: ubuntu-latest
@@ -63,13 +44,7 @@ jobs:
     name: P1 X-Needs-Design to Design project board
     runs-on: ubuntu-latest
     if: >
-      contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
-      (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, 'X-Needs-Design')
     steps:
       - uses: octokit/graphql-action@v2.x
         id: add_to_project
@@ -77,12 +52,12 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
@@ -101,12 +76,12 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
@@ -129,12 +104,12 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
@@ -152,12 +127,12 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
@@ -175,18 +150,17 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
           PROJECT_ID: "PN_kwDOAM0swc2KCw"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
   move_message_bubbles_issues:
     name: A-Message-Bubbles to Message bubbles board
     runs-on: ubuntu-latest
@@ -198,12 +172,12 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
@@ -221,12 +195,12 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
@@ -244,116 +218,14 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
-                  }
                 }
               }
+            }
           projectid: ${{ env.PROJECT_ID }}
           contentid: ${{ github.event.issue.node_id }}
         env:
           PROJECT_ID: "PN_kwDOAM0swc4AArk0"
           GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features1:
-    name: Add labelled issues to PS features team 1
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Polls') ||
-      contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
-      (contains(github.event.issue.labels.*.name, 'A-Voice-Messages') &&
-        !contains(github.event.issue.labels.*.name, 'A-Broadcast')) ||
-      (contains(github.event.issue.labels.*.name, 'A-Session-Mgmt') &&
-        contains(github.event.issue.labels.*.name, 'A-User-Settings'))
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4AHJKF"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features2:
-    name: Add labelled issues to PS features team 2
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-DM-Start') ||
-      contains(github.event.issue.labels.*.name, 'A-Broadcast')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4AHJKd"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  ps_features3:
-    name: Add labelled issues to PS features team 3
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  voip:
-    name: Add labelled issues to VoIP project board
-    runs-on: ubuntu-latest
-    if: >
-      contains(github.event.issue.labels.*.name, 'Team: VoIP')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        id: add_to_project
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-              mutation add_to_project($projectid:ID!,$contentid:ID!) {
-                addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
-                  id
-                  }
-                }
-              }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/triage-move-review-requests.yml

@@ -58,8 +58,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
                 }
               }
@@ -125,8 +125,8 @@ jobs:
           headers: '{"GraphQL-Features": "projects_next_graphql"}'
           query: |
             mutation add_to_project($projectid:ID!, $contentid:ID!) {
-              addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
-                item {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
                   id
                 }
               }

.github/workflows/triage-unlabelled.yml

@@ -48,15 +48,16 @@ jobs:
     if: >
       !(contains(github.event.issue.labels.*.name, 'A-Maths') ||
       contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
+      contains(github.event.issue.labels.*.name, 'A-Threads') ||
+      contains(github.event.issue.labels.*.name, 'A-Polls') ||
       contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
+      contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
       contains(github.event.issue.labels.*.name, 'Z-IA') ||
       contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
       contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
       contains(github.event.issue.labels.*.name, 'A-Tags') ||
       contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
-      contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
-      contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor') ||
-      contains(github.event.issue.labels.*.name, 'A-Element-Call')) &&
+      contains(github.event.issue.labels.*.name, 'A-Message-Starring')) &&
       contains(github.event.issue.labels.*.name, 'Z-Labs')
     steps:
       - uses: actions/github-script@v5

CHANGELOG.md

@@ -1,139 +1,3 @@
-Changes in [1.11.15](https://github.com/vector-im/element-web/releases/tag/v1.11.15) (2022-11-22)
-=================================================================================================
-
-## ✨ Features
- * Make clear notifications work with threads ([\#9575](https://github.com/matrix-org/matrix-react-sdk/pull/9575)). Fixes #23751.
- * Change "None" to "Off" in notification options ([\#9539](https://github.com/matrix-org/matrix-react-sdk/pull/9539)). Contributed by @Arnei.
- * Advanced audio processing settings ([\#8759](https://github.com/matrix-org/matrix-react-sdk/pull/8759)). Fixes #6278. Contributed by @MrAnno.
- * Add way to create a user notice via config.json ([\#9559](https://github.com/matrix-org/matrix-react-sdk/pull/9559)).
- * Improve design of the rich text editor ([\#9533](https://github.com/matrix-org/matrix-react-sdk/pull/9533)). Contributed by @florianduros.
- * Enable user to zoom beyond image size ([\#5949](https://github.com/matrix-org/matrix-react-sdk/pull/5949)). Contributed by @jaiwanth-v.
- * Fix: Move "Leave Space" option to the bottom of space context menu ([\#9535](https://github.com/matrix-org/matrix-react-sdk/pull/9535)). Contributed by @hanadi92.
-
-## 🐛 Bug Fixes
- * Make build scripts work on NixOS ([\#23740](https://github.com/vector-im/element-web/pull/23740)).
- * Fix integration manager `get_open_id_token` action and add E2E tests ([\#9520](https://github.com/matrix-org/matrix-react-sdk/pull/9520)).
- * Fix links being mangled by markdown processing ([\#9570](https://github.com/matrix-org/matrix-react-sdk/pull/9570)). Fixes #23743.
- * Fix: inline links selecting radio button ([\#9543](https://github.com/matrix-org/matrix-react-sdk/pull/9543)). Contributed by @hanadi92.
- * Fix wrong error message in registration when phone number threepid is in use. ([\#9571](https://github.com/matrix-org/matrix-react-sdk/pull/9571)). Contributed by @bagvand.
- * Fix missing avatar for show current profiles ([\#9563](https://github.com/matrix-org/matrix-react-sdk/pull/9563)). Fixes #23733.
- * Fix read receipts trickling down correctly ([\#9567](https://github.com/matrix-org/matrix-react-sdk/pull/9567)). Fixes #23746.
- * Resilience fix for homeserver without thread notification support ([\#9565](https://github.com/matrix-org/matrix-react-sdk/pull/9565)).
- * Don't switch to the home page needlessly after leaving a room ([\#9477](https://github.com/matrix-org/matrix-react-sdk/pull/9477)).
- * Differentiate download and decryption errors when showing images ([\#9562](https://github.com/matrix-org/matrix-react-sdk/pull/9562)). Fixes #3892.
- * Close context menu when a modal is opened to prevent user getting stuck ([\#9560](https://github.com/matrix-org/matrix-react-sdk/pull/9560)). Fixes #15610 and #10781.
- * Fix TimelineReset handling when no room associated ([\#9553](https://github.com/matrix-org/matrix-react-sdk/pull/9553)).
- * Always use current profile on thread events ([\#9524](https://github.com/matrix-org/matrix-react-sdk/pull/9524)). Fixes #23648.
- * Fix `ThreadView` tests not using thread flag ([\#9547](https://github.com/matrix-org/matrix-react-sdk/pull/9547)). Contributed by @MadLittleMods.
- * Handle deletion of `m.call` events ([\#9540](https://github.com/matrix-org/matrix-react-sdk/pull/9540)). Fixes #23663.
- * Fix incorrect notification count after leaving a room with notifications ([\#9518](https://github.com/matrix-org/matrix-react-sdk/pull/9518)). Contributed by @Arnei.
-
-Changes in [1.11.14](https://github.com/vector-im/element-web/releases/tag/v1.11.14) (2022-11-08)
-=================================================================================================
-
-## ✨ Features
- * Loading threads with server-side assistance ([\#9356](https://github.com/matrix-org/matrix-react-sdk/pull/9356)). Fixes #21807, #21799, #21911, #22141, #22157, #22641, #22501 #22438 and #21678. Contributed by @justjanne.
- * Make thread replies trigger a room list re-ordering ([\#9510](https://github.com/matrix-org/matrix-react-sdk/pull/9510)). Fixes #21700.
- * Device manager - add extra details to device security and renaming ([\#9501](https://github.com/matrix-org/matrix-react-sdk/pull/9501)). Contributed by @kerryarchibald.
- * Add plain text mode to the wysiwyg composer ([\#9503](https://github.com/matrix-org/matrix-react-sdk/pull/9503)). Contributed by @florianduros.
- * Sliding Sync: improve sort order, show subspace rooms, better tombstoned room handling ([\#9484](https://github.com/matrix-org/matrix-react-sdk/pull/9484)).
- * Device manager - add learn more popups to filtered sessions section ([\#9497](https://github.com/matrix-org/matrix-react-sdk/pull/9497)). Contributed by @kerryarchibald.
- * Show thread notification if thread timeline is closed ([\#9495](https://github.com/matrix-org/matrix-react-sdk/pull/9495)). Fixes #23589.
- * Add message editing to wysiwyg composer ([\#9488](https://github.com/matrix-org/matrix-react-sdk/pull/9488)). Contributed by @florianduros.
- * Device manager - confirm sign out of other sessions ([\#9487](https://github.com/matrix-org/matrix-react-sdk/pull/9487)). Contributed by @kerryarchibald.
- * Automatically request logs from other users in a call when submitting logs ([\#9492](https://github.com/matrix-org/matrix-react-sdk/pull/9492)).
- * Add thread notification with server assistance (MSC3773) ([\#9400](https://github.com/matrix-org/matrix-react-sdk/pull/9400)). Fixes #21114, #21413, #21416, #21433, #21481, #21798, #21823 #23192 and #21765.
- * Support for login + E2EE set up with QR ([\#9403](https://github.com/matrix-org/matrix-react-sdk/pull/9403)). Contributed by @hughns.
- * Allow pressing Enter to send messages in new composer ([\#9451](https://github.com/matrix-org/matrix-react-sdk/pull/9451)). Contributed by @andybalaam.
-
-## 🐛 Bug Fixes
- * Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641.
- * Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321.
- * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
- * Fix NotificationBadge unsent color ([\#9522](https://github.com/matrix-org/matrix-react-sdk/pull/9522)). Fixes #23646.
- * Fix room list sorted by recent on app startup ([\#9515](https://github.com/matrix-org/matrix-react-sdk/pull/9515)). Fixes #23635.
- * Reset custom power selector when blurred on empty ([\#9508](https://github.com/matrix-org/matrix-react-sdk/pull/9508)). Fixes #23481.
- * Reinstate timeline/redaction callbacks when updating notification state ([\#9494](https://github.com/matrix-org/matrix-react-sdk/pull/9494)). Fixes #23554.
- * Only render NotificationBadge when needed ([\#9493](https://github.com/matrix-org/matrix-react-sdk/pull/9493)). Fixes #23584.
- * Fix embedded Element Call screen sharing ([\#9485](https://github.com/matrix-org/matrix-react-sdk/pull/9485)). Fixes #23571.
- * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
- * Fix joining calls without audio or video inputs ([\#9486](https://github.com/matrix-org/matrix-react-sdk/pull/9486)). Fixes #23511.
- * Ensure spaces in the spotlight dialog have rounded square avatars ([\#9480](https://github.com/matrix-org/matrix-react-sdk/pull/9480)). Fixes #23515.
- * Only show mini avatar uploader in room intro when no avatar yet exists ([\#9479](https://github.com/matrix-org/matrix-react-sdk/pull/9479)). Fixes #23552.
- * Fix threads fallback incorrectly targets root event ([\#9229](https://github.com/matrix-org/matrix-react-sdk/pull/9229)). Fixes #23147.
- * Align video call icon with banner text ([\#9460](https://github.com/matrix-org/matrix-react-sdk/pull/9460)).
- * Set relations helper when creating event tile context menu ([\#9253](https://github.com/matrix-org/matrix-react-sdk/pull/9253)). Fixes #22018.
- * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)). Contributed by @kerryarchibald.
- * Update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
-
-Changes in [1.11.13](https://github.com/vector-im/element-web/releases/tag/v1.11.13) (2022-11-01)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Fix default behavior of Room.getBlacklistUnverifiedDevices ([\#2830](https://github.com/matrix-org/matrix-js-sdk/pull/2830)). Contributed by @duxovni.
- * Catch server versions API call exception when starting the client ([\#2828](https://github.com/matrix-org/matrix-js-sdk/pull/2828)). Fixes vector-im/element-web#23634.
- * Fix authedRequest including `Authorization: Bearer undefined` for password resets ([\#2822](https://github.com/matrix-org/matrix-js-sdk/pull/2822)). Fixes vector-im/element-web#23655.
-
-Changes in [1.11.12](https://github.com/vector-im/element-web/releases/tag/v1.11.12) (2022-10-26)
-=================================================================================================
-
-## 🐛 Bug Fixes
- * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
-
-Changes in [1.11.11](https://github.com/vector-im/element-web/releases/tag/v1.11.11) (2022-10-25)
-=================================================================================================
-
-## ✨ Features
- * Device manager - tweak string formatting of default device name ([\#23457](https://github.com/vector-im/element-web/pull/23457)).
- * Add Element Call participant limit ([\#23431](https://github.com/vector-im/element-web/pull/23431)).
- * Add Element Call `brand` ([\#23443](https://github.com/vector-im/element-web/pull/23443)).
- * Include a file-safe room name and ISO date in chat exports ([\#9440](https://github.com/matrix-org/matrix-react-sdk/pull/9440)). Fixes #21812 and #19724.
- * Room call banner ([\#9378](https://github.com/matrix-org/matrix-react-sdk/pull/9378)). Fixes #23453. Contributed by @toger5.
- * Device manager - spinners while devices are signing out ([\#9433](https://github.com/matrix-org/matrix-react-sdk/pull/9433)). Fixes #15865.
- * Device manager - silence call ringers when local notifications are silenced ([\#9420](https://github.com/matrix-org/matrix-react-sdk/pull/9420)).
- * Pass the current language to Element Call ([\#9427](https://github.com/matrix-org/matrix-react-sdk/pull/9427)).
- * Hide screen-sharing button in Element Call on desktop ([\#9423](https://github.com/matrix-org/matrix-react-sdk/pull/9423)).
- * Add reply support to WysiwygComposer ([\#9422](https://github.com/matrix-org/matrix-react-sdk/pull/9422)). Contributed by @florianduros.
- * Disconnect other connected devices (of the same user) when joining an Element call ([\#9379](https://github.com/matrix-org/matrix-react-sdk/pull/9379)).
- * Device manager - device tile main click target ([\#9409](https://github.com/matrix-org/matrix-react-sdk/pull/9409)).
- * Add formatting buttons to the rich text editor ([\#9410](https://github.com/matrix-org/matrix-react-sdk/pull/9410)). Contributed by @florianduros.
- * Device manager - current session context menu ([\#9386](https://github.com/matrix-org/matrix-react-sdk/pull/9386)).
- * Remove piwik config fallback for privacy policy URL ([\#9390](https://github.com/matrix-org/matrix-react-sdk/pull/9390)).
- * Add the first step to integrate the matrix wysiwyg composer ([\#9374](https://github.com/matrix-org/matrix-react-sdk/pull/9374)). Contributed by @florianduros.
- * Device manager - UA parsing tweaks ([\#9382](https://github.com/matrix-org/matrix-react-sdk/pull/9382)).
- * Device manager - remove client information events when disabling setting ([\#9384](https://github.com/matrix-org/matrix-react-sdk/pull/9384)).
- * Add Element Call participant limit ([\#9358](https://github.com/matrix-org/matrix-react-sdk/pull/9358)).
- * Add Element Call room settings ([\#9347](https://github.com/matrix-org/matrix-react-sdk/pull/9347)).
- * Device manager - render extended device information ([\#9360](https://github.com/matrix-org/matrix-react-sdk/pull/9360)).
- * New group call experience: Room header and PiP designs ([\#9351](https://github.com/matrix-org/matrix-react-sdk/pull/9351)).
- * Pass language to Jitsi Widget ([\#9346](https://github.com/matrix-org/matrix-react-sdk/pull/9346)). Contributed by @Fox32.
- * Add notifications and toasts for Element Call calls ([\#9337](https://github.com/matrix-org/matrix-react-sdk/pull/9337)).
- * Device manager - device type icon ([\#9355](https://github.com/matrix-org/matrix-react-sdk/pull/9355)).
- * Delete the remainder of groups ([\#9357](https://github.com/matrix-org/matrix-react-sdk/pull/9357)). Fixes #22770.
- * Device manager - display client information in device details ([\#9315](https://github.com/matrix-org/matrix-react-sdk/pull/9315)).
-
-## 🐛 Bug Fixes
- * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
- * Make ErrorView & CompatibilityView scrollable ([\#23468](https://github.com/vector-im/element-web/pull/23468)). Fixes #23376.
- * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)).
- * update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
- * Don't show call banners in video rooms ([\#9441](https://github.com/matrix-org/matrix-react-sdk/pull/9441)).
- * Prevent useContextMenu isOpen from being true if the button ref goes away ([\#9418](https://github.com/matrix-org/matrix-react-sdk/pull/9418)). Fixes matrix-org/element-web-rageshakes#15637.
- * Automatically focus the WYSIWYG composer when you enter a room ([\#9412](https://github.com/matrix-org/matrix-react-sdk/pull/9412)).
- * Improve the tooltips on the call lobby join button ([\#9428](https://github.com/matrix-org/matrix-react-sdk/pull/9428)).
- * Pass the homeserver's base URL to Element Call ([\#9429](https://github.com/matrix-org/matrix-react-sdk/pull/9429)). Fixes #23301.
- * Better accommodate long room names in call toasts ([\#9426](https://github.com/matrix-org/matrix-react-sdk/pull/9426)).
- * Hide virtual widgets from the room info panel ([\#9424](https://github.com/matrix-org/matrix-react-sdk/pull/9424)). Fixes #23494.
- * Inhibit clicking on sender avatar in threads list ([\#9417](https://github.com/matrix-org/matrix-react-sdk/pull/9417)). Fixes #23482.
- * Correct the dir parameter of MSC3715 ([\#9391](https://github.com/matrix-org/matrix-react-sdk/pull/9391)). Contributed by @dhenneke.
- * Use a more correct subset of users in `/remakeolm` developer command ([\#9402](https://github.com/matrix-org/matrix-react-sdk/pull/9402)).
- * use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes #23456.
- * Device manager - eagerly create `m.local_notification_settings` events ([\#9353](https://github.com/matrix-org/matrix-react-sdk/pull/9353)).
- * Close incoming Element call toast when viewing the call lobby ([\#9375](https://github.com/matrix-org/matrix-react-sdk/pull/9375)).
- * Always allow enabling sending read receipts ([\#9367](https://github.com/matrix-org/matrix-react-sdk/pull/9367)). Fixes #23433.
- * Fixes (vector-im/element-web/issues/22609) where the white theme is not applied when `white -> dark -> white` sequence is done. ([\#9320](https://github.com/matrix-org/matrix-react-sdk/pull/9320)). Contributed by @florianduros.
- * Fix applying programmatically set height for "top" room layout ([\#9339](https://github.com/matrix-org/matrix-react-sdk/pull/9339)). Contributed by @Fox32.
-
 Changes in [1.11.10](https://github.com/vector-im/element-web/releases/tag/v1.11.10) (2022-10-11)
 =================================================================================================
 

Dockerfile

@@ -1,5 +1,5 @@
 # Builder
-FROM --platform=$BUILDPLATFORM node:16-buster as builder
+FROM node:14-buster as builder
 
 # Support custom branches of the react-sdk and js-sdk. This also helps us build
 # images of element-web develop.

docs/config.md

@@ -139,11 +139,6 @@ complete re-branding/private labeling, a more personalised experience can be ach
     to hide this dropdown.
 16. `disable_guests`: When `false` (default), **enable** guest-related functionality (peeking/previewing rooms, etc) for unregistered
     users. Set to `true` to disable this functionality.
-17. `user_notice`: Optional notice to show to the user, e.g. for sunsetting a deployment and pushing users to move in their own time.
-    Takes a configuration object as below:
-    1. `title`: Required. Title to show at the top of the notice.
-    2. `description`: Required. The description to use for the notice.
-    3. `show_once`: Optional. If true then the notice will only be shown once per device.
 
 ### `desktop_builds` and `mobile_builds`
 
@@ -365,7 +360,8 @@ For example:
 ## Integration managers
 
 Integration managers are embedded applications within Element to help the user configure bots, bridges, and widgets. An integration manager
-is a separate piece of software not typically available with your homeserver. To disable integrations, set the options defined here to `null`.
+is a separate piece of software not typically available with your homeserver. To disable integrations, leave the options defined here out of
+your config.
 
 1. `integrations_ui_url`: The UI URL for the integration manager.
 2. `integrations_rest_url`: The REST interface URL for the integration manager.
@@ -555,4 +551,3 @@ The following are undocumented or intended for developer use only.
 2. `sync_timeline_limit`
 3. `dangerously_allow_unsafe_and_insecure_passwords`
 4. `latex_maths_delims`: An optional setting to override the default delimiters used for maths parsing. See https://github.com/matrix-org/matrix-react-sdk/pull/5939 for details. Only used when `feature_latex_maths` is enabled.
-5. `voice_broadcast.chunk_length`: Target chunk length in seconds for the Voice Broadcast feature currently under development.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.11.15",
+  "version": "1.11.10",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -46,8 +46,8 @@
     "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 --mode development --disable-host-check --hot",
     "lint": "yarn lint:types && yarn lint:js && yarn lint:style",
-    "lint:js": "eslint --max-warnings 0 src module_system test",
-    "lint:js-fix": "eslint --fix src module_system test",
+    "lint:js": "eslint --max-warnings 0 src module_system",
+    "lint:js-fix": "eslint --fix src module_system",
     "lint:types": "tsc --noEmit --jsx react && tsc --noEmit --project ./tsconfig.module_system.json",
     "lint:style": "stylelint \"res/css/**/*.pcss\"",
     "test": "jest",
@@ -57,11 +57,12 @@
   "dependencies": {
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
     "@matrix-org/react-sdk-module-api": "^0.0.3",
+    "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.5.25",
     "katex": "^0.16.0",
-    "matrix-js-sdk": "21.2.0",
-    "matrix-react-sdk": "3.61.0",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
     "matrix-widget-api": "^1.1.1",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
@@ -86,14 +87,12 @@
     "@babel/preset-typescript": "^7.12.7",
     "@babel/register": "^7.12.10",
     "@babel/runtime": "^7.12.5",
-    "@casualbot/jest-sonar-reporter": "^2.2.5",
     "@principalstudio/html-webpack-inject-preload": "^1.2.7",
     "@sentry/webpack-plugin": "^1.18.1",
     "@svgr/webpack": "^5.5.0",
     "@testing-library/react": "^12.1.5",
     "@types/flux": "^3.1.9",
     "@types/jest": "^29.0.0",
-    "@types/jsrsasign": "^10.5.4",
     "@types/modernizr": "^3.5.3",
     "@types/node": "^14.18.28",
     "@types/react": "^17.0.49",
@@ -115,10 +114,9 @@
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-deprecate": "^0.7.0",
     "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-matrix-org": "^0.7.0",
+    "eslint-plugin-matrix-org": "^0.6.1",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "eslint-plugin-unicorn": "^44.0.2",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fake-indexeddb": "^3.1.2",
     "fetch-mock-jest": "^1.5.1",
@@ -130,9 +128,11 @@
     "jest-environment-jsdom": "^29.0.0",
     "jest-mock": "^29.0.0",
     "jest-raw-loader": "^1.0.1",
+    "jest-sonar-reporter": "^2.0.0",
     "json-loader": "^0.5.7",
-    "loader-utils": "^2.0.3",
+    "loader-utils": "^1.4.0",
     "matrix-mock-request": "^2.5.0",
+    "matrix-react-test-utils": "^0.2.3",
     "matrix-web-i18n": "^1.3.0",
     "mini-css-extract-plugin": "^1",
     "minimist": "^1.2.6",
@@ -210,11 +210,10 @@
       "text-summary",
       "lcov"
     ],
-    "testResultsProcessor": "@casualbot/jest-sonar-reporter"
+    "testResultsProcessor": "jest-sonar-reporter"
   },
-  "@casualbot/jest-sonar-reporter": {
-    "outputDirectory": "coverage",
-    "outputName": "jest-sonar-report.xml",
-    "relativePaths": true
+  "jestSonar": {
+    "reportPath": "coverage",
+    "sonar56x": true
   }
 }

release.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # Script to perform a release of element-web.
 

res/apple-app-site-association

@@ -1,18 +0,0 @@
-{
-    "applinks": {
-        "apps": [],
-        "details": [
-            {
-                "appID": "7J4U792NQT.im.vector.app",
-                "paths": [
-                    "*"
-                ]
-            }
-        ]
-    },
-    "webcredentials": {
-        "apps": [
-            "7J4U792NQT.im.vector.app"
-        ]
-    }
-}

scripts/ci_package.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Runs package.sh, passing DIST_VERSION determined by git
 

scripts/copy-res.js

@@ -63,7 +63,6 @@ const INCLUDE_LANGS = [
 // common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
 // "dest/b/...".
 const COPY_LIST = [
-    ["res/apple-app-site-association", "webapp"],
     ["res/manifest.json", "webapp"],
     ["res/sw.js", "webapp"],
     ["res/welcome.html", "webapp"],

scripts/docker-link-repos.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -ex
 

scripts/docker-package.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -ex
 

scripts/fetch-develop.deps.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Fetches the js-sdk and matrix-react-sdk dependencies for development
 # or testing purposes

scripts/get-version-from-git.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Echoes a version based on the git hashes of the element-web, react-sdk & js-sdk checkouts, for the case where
 # these dependencies are git checkouts.

scripts/layered.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -ex
 

scripts/make-icons.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # Converts an svg logo into the various image resources required by
 # the various platforms deployments.

scripts/normalize-version.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 

scripts/package.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 

sonar-project.properties

@@ -11,4 +11,4 @@ sonar.exclusions=__mocks__,docs,element.io,nginx
 sonar.typescript.tsconfigPath=./tsconfig.json
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.coverage.exclusions=test/**/*,res/**/*
-sonar.testExecutionReportPaths=coverage/jest-sonar-report.xml
+sonar.testExecutionReportPaths=coverage/test-report.xml

src/i18n/strings/ar.json

@@ -15,7 +15,9 @@
     "Unexpected error preparing the app. See console for details.": "حدث عُطل غير متوقع أثناء تجهيز التطبيق. طالِع المِعراض للتفاصيل.",
     "Download Completed": "اكتمل التنزيل",
     "Open": "افتح",
+    "%(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 ميزات متقدمة في المتصفحات لا يدعمها متصفحك الحالي.",
@@ -26,5 +28,6 @@
     "Failed to start": "فشل البدء",
     "Powered by Matrix": "تدعمه «ماترِكس»",
     "Use %(brand)s on mobile": "استعمل %(brand)s على المحمول",
+    "Switch to space by number": "التبديل إلى المساحة بالرقم",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "محادثة لامركزية، مشفرة & تعمل بواسطة $matrixLogo"
 }

src/i18n/strings/az.json

@@ -10,6 +10,7 @@
     "The message from the parser is: %(message)s": "Sözügedən mesaj: %(message)s",
     "Dismiss": "Nəzərə almayın",
     "Welcome to Element": "Element-ə xoş gəlmişsiniz",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "[matrix] tərəfindən təchiz edilmiş mərkəziləşdirilməmiş, şifrələnmiş çat və əməkdaşlıq platforması",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "$matrixLogo tərəfindən dəstəklənən mərkəzləşdirilməmiş ,şifrələnmiş söhbət & əməkdaşlıq",
     "Failed to start": "Başlatmaq alınmadı",
     "Go to element.io": "element.io saytına keçin",
@@ -21,7 +22,9 @@
     "Unsupported browser": "Dəstəklənməyən brauzer",
     "Use %(brand)s on mobile": "Mobil telefonda %(brand)s istifadə edin",
     "Powered by Matrix": "Gücünü Matrix'dən alır",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Go to your browser to complete Sign In": "Girişi tamamlamaq üçün brauzerinizə keçin",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)",
     "Open": "Aç",
     "Download Completed": "Yükləmə Tamamlandı",
     "Unable to load config file: please refresh the page to try again.": "Konfiqurasiya faylını yükləmək mümkün deyil: yenidən cəhd etmək üçün səhifəni yeniləyin.",

src/i18n/strings/bg.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "Невалиден JSON",
     "Go to your browser to complete Sign In": "Отидете в браузъра за да завършите влизането",
     "Unable to load config file: please refresh the page to try again.": "Неуспешно зареждане на конфигурационния файл: презаредете страницата за да опитате пак.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Неподдържан браузър",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Инсталирайте <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> или <safariLink>Safari</safariLink> за най-добра работа.",
@@ -27,7 +28,5 @@
     "%(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 на мобилен телефон",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализиран, криптиран чат &amp; сътрудничество, захранено от $matrixlogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s под %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализиран, криптиран чат &amp; сътрудничество, захранено от $matrixlogo"
 }

src/i18n/strings/bs.json

@@ -10,8 +10,10 @@
     "Download Completed": "Preuzimanje završeno",
     "Open": "Otvori",
     "Dismiss": "Odbaci",
+    "%(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)",
     "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",

src/i18n/strings/ca.json

@@ -16,6 +16,7 @@
     "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",
+    "%(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",

src/i18n/strings/cs.json

@@ -16,6 +16,7 @@
     "Unable to load config file: please refresh the page to try again.": "Nepodařilo se načíst konfigurační soubor: abyste to zkusili znovu, načtěte prosím znovu stránku.",
     "Download Completed": "Stahování dokončeno",
     "Open": "Otevřít",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Nepodporovaný prohlížeč",
     "Your browser can't run %(brand)s": "Váš prohlížeč nedokáže spustit %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s využívá pokročilých funkcí prohlížeče, které ten váš nepodporuje.",
@@ -25,8 +26,7 @@
     "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)",
     "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních",
-    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentralizovaný, šifrovaný chat a spolupráce na platformě $matrixLogo"
 }

src/i18n/strings/da.json

@@ -1,5 +1,6 @@
 {
     "Dismiss": "Afvis",
+    "powered by Matrix": "Drevet af Matrix",
     "Unknown device": "Ukendt enhed",
     "Welcome to Element": "Velkommen til Element",
     "The message from the parser is: %(message)s": "Beskeden fra parseren er: %(message)s",
@@ -21,7 +22,9 @@
     "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.",

src/i18n/strings/de_DE.json

@@ -15,6 +15,7 @@
     "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.",
@@ -27,7 +28,5 @@
     "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",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s auf %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von $matrixLogo"
 }

src/i18n/strings/el.json

@@ -25,7 +25,9 @@
     "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)",
     "Use %(brand)s on mobile": "Χρήση %(brand)s σε κινητό",
+    "Switch to space by number": "Εναλλαγή σε space με αριθμό",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία και συνεργασία χρησιμοποιώντας το $matrixLogo"
 }

src/i18n/strings/en_US.json

@@ -19,7 +19,9 @@
     "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)",
     "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.",

src/i18n/strings/eo.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "Nevalida JSON",
     "Go to your browser to complete Sign In": "Iru al via retumilo por finpretigi la ensaluton",
     "Unable to load config file: please refresh the page to try again.": "Ne povas enlegi agordan dosieron: bonvolu reprovi per aktualigo de la paĝo.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s labortabla (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Nesubtenata retumilo",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Bonvolu instali retumilon <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, aŭ <safariLink>Safari</safariLink>, por la plej bona sperto.",

src/i18n/strings/es.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "JSON inválido",
     "Go to your browser to complete Sign In": "Abre tu navegador web para completar el registro",
     "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.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s de escritorio (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Navegador no compatible",
     "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.",
@@ -27,7 +28,5 @@
     "%(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",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Conversaciones y colaboración descentralizadas y cifradas gracias a $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s en %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s de escritorio: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Conversaciones y colaboración descentralizadas y cifradas gracias a $matrixLogo"
 }

src/i18n/strings/et.json

@@ -12,6 +12,7 @@
     "Welcome to Element": "Tere tulemast kasutama suhtlusrakendust Element",
     "Sign In": "Logi sisse",
     "Create Account": "Loo konto",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s'i töölauaversioon (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Sellele brauserile puudub tugi",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Parima kasutuskogemuse jaoks palun paigalda <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> või <safariLink>Safari</safariLink>.",
@@ -27,7 +28,5 @@
     "%(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",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s operatsioonisüsteemis %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajutatud ja krüpteeritud suhtlus- ning ühistöörakendus, mille aluseks on $matrixLogo"
 }

src/i18n/strings/eu.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "JSON baliogabea",
     "Go to your browser to complete Sign In": "Joan zure nabigatzailera izena ematen bukatzeko",
     "Unable to load config file: please refresh the page to try again.": "Ezin izan da konfigurazio fitxategia kargatu: Saiatu orria birkargatzen.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Onartu gabeko nabigatzailea",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalatu <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, edo <safariLink>Safari</safariLink> esperientzia hobe baterako.",

src/i18n/strings/fa.json

@@ -16,6 +16,7 @@
     "Unexpected error preparing the app. See console for details.": "خطای غیر منتظره در آماده سازی برنامه. کنسول را برای جزئیات مشاهده کنید.",
     "Download Completed": "بارگیری کامل شد",
     "Open": "باز",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s میزکار %(platformName)s",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "مرورگر پش‬تبانی نمی شود",
     "Your browser can't run %(brand)s": "مرورگر شما نمی تواند %(brand)s را اجرا کند",
@@ -27,7 +28,5 @@
     "Failed to start": "خطا در شروع",
     "Powered by Matrix": "راه اندازی شده با استفاده از ماتریکس",
     "Use %(brand)s on mobile": "از %(brand)s گوشی استفاده کنید",
-    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "همکاری چت غیرمتمرکز و رمزگذاری شده & توسعه یافته با استفاده از $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s: روی %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s دسکتاپ: %(platformName)s"
+    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "همکاری چت غیرمتمرکز و رمزگذاری شده & توسعه یافته با استفاده از $matrixLogo"
 }

src/i18n/strings/fi.json

@@ -11,7 +11,9 @@
     "The message from the parser is: %(message)s": "Viesti jäsentimeltä: %(message)s",
     "Invalid JSON": "Virheellinen JSON",
     "Unable to load config file: please refresh the page to try again.": "Asetustiedostoa ei voi ladata. Yritä uudelleen lataamalla sivu uudelleen.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)sin työpöytäversio (%(platformName)s)",
     "Go to your browser to complete Sign In": "Tee kirjautuminen loppuun selaimessasi",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Selainta ei tueta",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Asenna <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> tai <safariLink>Safari</safariLink>, jotta kaikki toimii parhaiten.",
     "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.": "Voit käyttää edelleen nykyistä selaintasi, mutta jotkut tai kaikki ominaisuudet eivät ehkä toimi ja sovelluksen ulkoasu voi olla virheellinen.",
@@ -25,8 +27,5 @@
     "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",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Hajautettu, salattu keskustelu &amp; yhteistyö, taustavoimana $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s käyttöjärjestelmällä %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)sin työpöytäversio: %(platformName)s"
+    "Use %(brand)s on mobile": "Käytä %(brand)sia mobiilisti"
 }

src/i18n/strings/fr.json

@@ -12,12 +12,14 @@
     "Invalid JSON": "JSON non valide",
     "Go to your browser to complete Sign In": "Utilisez votre navigateur pour terminer la connexion",
     "Unable to load config file: please refresh the page to try again.": "Impossible de charger le fichier de configuration : rechargez la page pour réessayer.",
+    "%(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.",
     "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",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s pour bureau (%(platformName)s)",
     "Download Completed": "Téléchargement terminé",
     "Open": "Ouvrir",
     "Your Element is misconfigured": "Votre Element est mal configuré",
@@ -26,7 +28,5 @@
     "%(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",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée &amp; une collaboration alimentée par $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s : %(browserName)s pour %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s pour bureau : %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Messagerie décentralisée, chiffrée &amp; une collaboration alimentée par $matrixLogo"
 }

src/i18n/strings/fy.json

@@ -5,10 +5,12 @@
     "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> ynstallearje foar de beste ûnderfining.",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brûkt avansearre browserfunksjes dy’t net stipe wurde troch de browser dy’t jo no brûke.",
     "Powered by Matrix": "Mooglik makke troch Matrix",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "Unexpected error preparing the app. See console for details.": "Unferwachte flater by it klearmeitsjen fan de applikaasje. Sjoch yn de console 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",
+    "%(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 te foltôgjen",
     "Download Completed": "Download foltôge",
     "Unable to load config file: please refresh the page to try again.": "Kin konfiguraasjebestân net lade: ferfarskje de side en probearje it nochris.",

src/i18n/strings/ga.json

@@ -15,6 +15,7 @@
     "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.",

src/i18n/strings/gl.json

@@ -11,7 +11,9 @@
     "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.",
     "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.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "Go to your browser to complete Sign In": "Abre o navegador para realizar a Conexión",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Navegador non soportado",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instala <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ou <safariLink>Safari</safariLink> para ter unha mellor 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.": "Podes continuar co teu navegador, pero algunhas características poderían non funcionar e o aspecto da aplicación podería non ser o correcto.",

src/i18n/strings/he.json

@@ -24,8 +24,10 @@
     "Your browser can't run %(brand)s": "הדפדפן שלך לא יכול להריץ %(brand)s",
     "Unsupported browser": "דפדפן לא נתמך",
     "Powered by Matrix": "מופעל על ידי מטריקס",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s שולחן עבודה %(platformName)s",
     "The message from the parser is: %(message)s": "ההודעה מהמנתח היא: %(message)s",
+    "Missing indexeddb worker script!": "סקריפט indexeddb worker חסר!",
     "Switch to space by number": "עבור 'למרחב' על פי המספר שלו",
     "Use %(brand)s on mobile": "השתמש ב-%(brand)s במכשיר הנייד",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "צ'אט מבוזר ומוצפן & מופעל בשיתוף פעולה ע\"י $matrixLogo"

src/i18n/strings/hi.json

@@ -5,6 +5,7 @@
     "Sign In": "साइन करना",
     "Create Account": "खाता बनाएं",
     "Explore rooms": "रूम का अन्वेषण करें",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s का डेस्कटॉप (%(platformName)s)",
     "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 में से कोई एक निर्दिष्ट कर सकता है।",
     "Failed to start": "प्रारंभ करने में विफल",

src/i18n/strings/hu.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "Érvénytelen JSON",
     "Go to your browser to complete Sign In": "A böngészőben fejezze be a bejelentkezést",
     "Unable to load config file: please refresh the page to try again.": "A konfigurációs fájlt nem sikerült betölteni: frissítse az oldalt és próbálja meg újra.",
+    "%(brand)s Desktop (%(platformName)s)": "Asztali %(brand)s (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Nem támogatott böngésző",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "A legjobb élmény érdékében telepítsen <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
@@ -27,7 +28,5 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "A(z) %(brand)s speciális böngészőfunkciókat használ, amelyeket a jelenlegi böngészője nem támogat.",
     "Powered by Matrix": "A gépházban: Matrix",
     "Use %(brand)s on mobile": "Mobilon használja ezt: %(brand)s",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Elosztott, titkosított csevegés és együttműködés ezzel: $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: (%(browserName)s itt: %(osName)s)",
-    "%(brand)s Desktop: %(platformName)s": "Asztali %(brand)s: (%(platformName)s)"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Elosztott, titkosított csevegés és együttműködés ezzel: $matrixLogo"
 }

src/i18n/strings/hy.json

@@ -2,6 +2,7 @@
     "Explore rooms": "Փնտրել սենյակներ",
     "Failed to start": "Չի ստացվում սկսել",
     "Use %(brand)s on mobile": "Օգտագործում է %(brand)s հեռախոսի վրա",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s%(browserName)s%(osName)s",
     "Unknown device": "Անծանոթ սարք",
     "Welcome to Element": "Բարի գալուստ Element",
     "Your browser can't run %(brand)s": "Ձեր բրաուզերը չի թողարկում %(brand)s",

src/i18n/strings/id.json

@@ -18,6 +18,7 @@
     "Unsupported browser": "Peramban tidak didukung",
     "Use %(brand)s on mobile": "Gunakan %(brand)s di ponsel",
     "Powered by Matrix": "Diberdayakan oleh Matrix",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "Open": "Buka",
     "Download Completed": "Unduhan Selesai",
@@ -27,7 +28,5 @@
     "The message from the parser is: %(message)s": "Pesan dari pengurai adalah: %(message)s",
     "Your Element is misconfigured": "Anda salah mengatur Element",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Konfigurasi tidak absah: hanya bisa menentukan satu dari default_server_config, default_server_name, atau default_hs_url.",
-    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Obrolan & kolaborasi terdesentralisasi dan terenkripsi diberdayakan oleh $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s di %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Obrolan & kolaborasi terdesentralisasi dan terenkripsi diberdayakan oleh $matrixLogo"
 }

src/i18n/strings/is.json

@@ -11,6 +11,7 @@
     "The message from the parser is: %(message)s": "Skilaboðið frá þáttaranum er %(message)s",
     "Invalid JSON": "Ógilt JSON",
     "Download Completed": "Niðurhali lokið",
+    "%(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.": "Þú ættir að setja upp <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eða <safariLink>Safari</safariLink> til að fá sem besta útkomu.",
     "I understand the risks and wish to continue": "Ég skil áhættuna og óska að halda áfram",
     "Go to element.io": "Fara á element.io",
@@ -20,6 +21,7 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s notar háþróaða vafraeiginleika sem eru ekki studdir af vafranum þínum.",
     "Powered by Matrix": "Keyrt með Matrix",
     "Go to your browser to complete Sign In": "Farðu í vafrann þinn til að ljúka innskráningu",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop fyrir vinnutölvur (%(platformName)s)",
     "Unable to load config file: please refresh the page to try again.": "Ekki er hægt að hlaða stillingaskrána: endurnýjaðu síðuna til að reyna aftur.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element-stillingar þínar innihalda ógilt JSON. Leiðréttu vandamálið og endurlestu síðuna.",
     "Your Element is misconfigured": "Element-tilvikið þitt er rangt stillt",

src/i18n/strings/it.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "JSON non valido",
     "Go to your browser to complete Sign In": "Vai nel tuo browser per completare l'accesso",
     "Unable to load config file: please refresh the page to try again.": "Impossibile caricare il file di configurazione: ricarica la pagina per riprovare.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Browser non supportato",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installa <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, o <safariLink>Safari</safariLink> per una migliore esperienza.",
@@ -27,7 +28,5 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funzionalità avanzate del browser che non sono supportate dal tuo browser attuale.",
     "Powered by Matrix": "Offerto da Matrix",
     "Use %(brand)s on mobile": "Usa %(brand)s su mobile",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat e collaborazioni criptate e decentralizzate offerte da $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s su %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat e collaborazioni criptate e decentralizzate offerte da $matrixLogo"
 }

src/i18n/strings/ja.json

@@ -16,7 +16,9 @@
     "Unable to load config file: please refresh the page to try again.": "設定ファイルの読み込みに失敗しました：ページを再読み込みして、もう一度やり直してください。",
     "Download Completed": "ダウンロードが完了しました",
     "Open": "開く",
+    "%(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": "サポートされていないブラウザー",
     "Go to element.io": "element.ioへ移動",
     "Failed to start": "起動に失敗しました",
@@ -25,8 +27,5 @@
     "Your browser can't run %(brand)s": "このブラウザーでは%(brand)sが動きません",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)sはブラウザーの高度な機能を使う必要がありますが、このブラウザーではその機能がサポートされていないようです。",
     "Powered by Matrix": "Powered by Matrix",
-    "Use %(brand)s on mobile": "携帯端末で%(brand)sを使用できます",
-    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "$matrixLogo による、分散型で暗号化された会話とコラボレーション",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s： %(osName)sの%(browserName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)sデスクトップ：%(platformName)s"
+    "Use %(brand)s on mobile": "携帯端末で%(brand)sを使用できます"
 }

src/i18n/strings/jbo.json

@@ -4,7 +4,9 @@
     "Invalid JSON": ".i le veirdjeisano na drani",
     "Download Completed": ".i mo'u kibycpa",
     "Open": "nu viska",
+    "%(brand)s Desktop (%(platformName)s)": ".i la'o zoi. %(brand)s .zoi samtci .i le vanbi na kibrbrauzero .i la'o zoi. %(platformName)s .zoi samcmu",
     "Go to your browser to complete Sign In": ".i do ka'e pilno pa kibrbrauzero lo nu mo'u co'a jaspu",
+    "%(appName)s (%(browserName)s, %(osName)s)": ".i la'o zoi. %(appName)s .zoi samtci .i la'o zoi. %(browserName)s .zoi kibrbrauzero .i la'o zoi. %(osName)s .zoi samcmu",
     "Unsupported browser": ".i le kibrbrauzero na kakne",
     "Your browser can't run %(brand)s": ".i na ka'e pilno le kibrbrauzero lo nu pilno la'o zoi. %(brand)s .zoi",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": ".i la'o zoi. %(brand)s .zoi pilno pa na jai se kakne be le kibrbrauzero",

src/i18n/strings/ka.json

@@ -5,6 +5,7 @@
     "Explore rooms": "ოთახების დათავლიერება",
     "Failed to start": "ჩართვა ვერ მოხერხდა",
     "Use %(brand)s on mobile": "გამოიყენე %(brand)s-ი მობილურზე",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s დესკტოპი (%(platformName)s)",
     "Unexpected error preparing the app. See console for details.": "მოულოდნელი ერორი აპლიკაციის შემზადებისას. იხილეთ კონსოლი დეტალებისთვის.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "თქვენი Element-ის კონფიგურაცია შეიცავს მიუღებელ JSON-ს. გთხოვთ გადაჭრათ პრობლემა და დაარაფრეშოთ გვერდი.",
     "Sign In": "შესვლა",
@@ -19,6 +20,7 @@
     "Your Element is misconfigured": "შენი Element-ი არასწორადაა კონფიგურირებული",
     "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> საუკეთესო გამოცდილებისთვის.",
     "Powered by Matrix": "მუშაობს Matrix-ის მეშვეობით",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Go to your browser to complete Sign In": "გახსენი ბრაუზერი Sign In-ის დასასრულებლად",
     "Open": "გახსნა",
     "Download Completed": "გადმოწერა დასრულებულია"

src/i18n/strings/kab.json

@@ -1,7 +1,9 @@
 {
     "Invalid JSON": "JSON armeɣtu",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s n tnarit (%(platformName)s)",
     "Go to your browser to complete Sign In": "Ddu ɣer iminig akken ad tkemleḍ ajerred",
     "Unknown device": "Ibenk arussin",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Create Account": "Rnu amiḍan",
     "Dismiss": "Agwi",
     "Sign In": "Kcem",

src/i18n/strings/ko.json

@@ -11,7 +11,9 @@
     "Create Account": "계정 만들기",
     "Explore rooms": "방 검색",
     "Unable to load config file: please refresh the page to try again.": "설정 파일을 불러오는 데 실패: 페이지를 새로고침한 후에 다시 시도해 주십시오.",
+    "%(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": "지원되지 않는 브라우저",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "최상의 경험을 위해 <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, 또는 <safariLink>Safari</safariLink>를 설치해주세요.",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "현재 사용 중인 브라우저를 계속 사용할 수 있지만, 일부 기능들이 작동하지 않거나 애플리케이션이 올바르게 보여지지 않을 수 있습니다.",
@@ -25,8 +27,5 @@
     "Open": "열기",
     "Download Completed": "다운로드 완료",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "당신의 Element 설정은 유효하지 않은 JSON을 포함합니다. 이 문제를 해결하고 페이지를 새로고침해주세요.",
-    "Your Element is misconfigured": "당신의 Element가 잘못 설정되었습니다",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "$matrixLogo 에서 제공하는 탈중앙화되고 암호화된 협업",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(osName)s 의 %(browserName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s 데스크탑: %(platformName)s"
+    "Your Element is misconfigured": "당신의 Element가 잘못 설정되었습니다"
 }

src/i18n/strings/lb.json

@@ -1 +0,0 @@
-{}

src/i18n/strings/lo.json

@@ -15,8 +15,10 @@
     "Unsupported browser": "ບໍ່ຮັບຮອງເວັບບຣາວເຊີນີ້",
     "Use %(brand)s on mobile": "ໃຊ້ມືຖື %(brand)s",
     "Powered by Matrix": "ສະໜັບສະໜູນໂດຍ Matrix",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unknown device": "ທີ່ບໍ່ຮູ້ຈັກອຸປະກອນນີ້",
     "Go to your browser to complete Sign In": "ໄປທີ່ໜ້າເວັບຂອງທ່ານເພື່ອເຂົ້າສູ່ລະບົບ",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s ຕັ້ງໂຕະ (%(platformName)s)",
     "Dismiss": "ຍົກເລີກ",
     "Download Completed": "ດາວໂຫຼດສຳເລັດແລ້ວ",
     "Unexpected error preparing the app. See console for details.": "ເກີດຄວາມຜິດພາດທີ່ບໍ່ຄາດຄິດໃນການກະກຽມແອັບຯ. ເບິ່ງ console ສໍາລັບລາຍລະອຽດ.",

src/i18n/strings/lt.json

@@ -12,6 +12,7 @@
     "Invalid configuration: no default server specified.": "Klaidinga konfigūracija: nenurodytas numatytasis serveris.",
     "Go to your browser to complete Sign In": "Norėdami užbaigti prisijungimą, eikite į naršyklę",
     "Unable to load config file: please refresh the page to try again.": "Nepavyko įkelti konfigūracijos failo: atnaujinkite puslapį, kad pabandytumėte dar kartą.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Kompiuteryje (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Nepalaikoma naršyklė",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jūs galite toliau naudotis savo dabartine naršykle, bet kai kurios arba visos funkcijos gali neveikti ir programos išvaizda bei sąsaja gali būti neteisingai rodoma.",
@@ -27,6 +28,5 @@
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Geriausiam veikimui suinstaliuokite <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, arba <safariLink>Safari</safariLink>.",
     "Powered by Matrix": "Veikia su Matrix",
     "Use %(brand)s on mobile": "Naudoti %(brand)s mobiliajame telefone",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizuotas, užšifruotų pokalbių &amp; bendradarbiavimas, paremtas $matrixLogo",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Kompiuteryje: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizuotas, užšifruotų pokalbių &amp; bendradarbiavimas, paremtas $matrixLogo"
 }

src/i18n/strings/lv.json

@@ -25,6 +25,7 @@
     "Download Completed": "Lejuplāde pabeigta",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jūsu Element konfigurācija satur kļūdainu JSON. Lūdzu, izlabojiet un pārlādējiet lapu.",
     "Your Element is misconfigured": "Jūsu Element ir nokonfigurēts kļūdaini",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Galdvirsmas (%(platformName)s)",
     "Use %(brand)s on mobile": "Mobilajā tālrunī izmanojiet %(brand)s",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Decentralizēta, šifrēta saziņa & sadarbība, ko nodrošina $matrixLogo"

src/i18n/strings/ml.json

@@ -1,6 +1,7 @@
 {
     "Dismiss": "ഒഴിവാക്കുക",
     "Unknown device": "അപരിചിത ഡിവൈസ്",
+    "%(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.": "ദയവായി <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, അല്ലെങ്കിൽ <safariLink>Safari</safariLink> ഇൻസ്റ്റാൾ ചെയ്യുക.",
     "Your Element is misconfigured": "നിങ്ങളുടെ Element തെറ്റായിട്ടാണ് കോൺഫിഗർ ചെയ്തിരിക്കുന്നത്",
     "Invalid configuration: no default server specified.": "അസാധുവായ കോൺഫിഗറേഷൻ: സ്ഥിര സെർവർ ഒന്നും വ്യക്തമാക്കിയില്ല.",

src/i18n/strings/nb_NO.json

@@ -24,6 +24,7 @@
     "Your Element is misconfigured": "Ditt Element er feilkonfigurert",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Vennligst installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> for den beste opplevelsen.",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s bruker avanserte nettleserfunksjoner som ikke støttes av din nåværende nettleser.",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Skrivebord (%(platformName)s)",
     "Open": "Åpne",
     "Use %(brand)s on mobile": "Bruk %(brand)s på mobil"

src/i18n/strings/ne.json

@@ -1,6 +1,7 @@
 {
     "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> इंस्टॉल करें।",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s उन्नत ब्राउज़र सुविधाओं का उपयोग करते हैं जो आपके वर्तमान ब्राउज़र द्वारा समर्थित नहीं हैं।",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s का डेस्कटॉप (%(platformName)s)",
     "Sign In": "साइन करना",
     "Explore rooms": "रूम का अन्वेषण करें",

src/i18n/strings/nl.json

@@ -10,24 +10,23 @@
     "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
     "The message from the parser is: %(message)s": "De ontleder meldt: %(message)s",
     "Invalid JSON": "Ongeldige JSON",
-    "Go to your browser to complete Sign In": "Ga naar je browser om de aanmelding te voltooien",
-    "Unable to load config file: please refresh the page to try again.": "Kan het configuratiebestand niet laden. Herlaad de pagina.",
+    "Go to your browser to complete Sign In": "Ga naar uw browser om de aanmelding te voltooien",
+    "Unable to load config file: please refresh the page to try again.": "Kan het configuratiebestand niet laden. Herlaad de pagina alstublieft.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Niet-ondersteunde browser",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> voor de beste gebruikservaring.",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Je kan je huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de weergave van het programma kan verkeerd zijn.",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de weergave van het programma kan verkeerd zijn.",
     "I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan",
     "Go to element.io": "Ga naar element.io",
     "Failed to start": "Opstarten mislukt",
     "Open": "Openen",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jouw Element configuratie bevat ongeldige JSON. Corrigeer het probleem en herlaad de pagina.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.",
     "Download Completed": "Download voltooid",
-    "Your Element is misconfigured": "Jouw Element is verkeerd geconfigureerd",
-    "Your browser can't run %(brand)s": "Jouw browser kan %(brand)s niet starten",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in je huidige browser.",
+    "Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd",
+    "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet starten",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
     "Powered by Matrix": "Mogelijk gemaakt door Matrix",
-    "Use %(brand)s on mobile": "Gebruik %(brand)s op je mobiel",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Gedecentraliseerde, versleutelde chat &amp; samenwerking mogelijk gemaakt door $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s op %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
+    "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel",
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Gedecentraliseerde, versleutelde chat &amp; samenwerking mogelijk gemaakt door $matrixLogo"
 }

src/i18n/strings/nn.json

@@ -16,12 +16,14 @@
     "Unsupported browser": "Nettlesaren er ikkje støtta",
     "Your browser can't run %(brand)s": "Din nettlesar kan ikkje køyra %(brand)s",
     "Go to element.io": "Gå til element.io",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)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 fortsetja å bruka gjeldande nettlesar, men nokre eller alle funksjonane fungerer kanskje ikkje, og utsjånaden og kjensla av applikasjonen kan vera feil.",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> for den beste opplevinga.",
     "I understand the risks and wish to continue": "Eg forstår risikoen og ynskjer å fortsetja",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brukar avanserte nettlesarfunksjonar som ikkje er støtta av den gjeldande nettlesaren din.",
     "Use %(brand)s on mobile": "Bruk %(brand)s på mobil",
     "Powered by Matrix": "Driven av Matrix",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Skrivebord (%(platformName)s)",
     "Your Element is misconfigured": "Element er feilkonfigurert",
     "Failed to start": "Klarte ikkje å starta",
     "Open": "Opna",

src/i18n/strings/oc.json

@@ -20,6 +20,7 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza de foncions avançadas que lo vòstre navigator non suporta pas.",
     "Unsupported browser": "Navigator incompatible",
     "Powered by Matrix": "Fonciona ambé Matrix",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s de burèu (%(platformName)s)",
     "Open": "Dobrir",
     "Download Completed": "Descargament acabat",

src/i18n/strings/pl.json

@@ -12,6 +12,7 @@
     "Invalid configuration: no default server specified.": "Błędna konfiguracja: nie wybrano domyślnego serwera.",
     "Go to your browser to complete Sign In": "Aby dokończyć proces rejestracji, przejdź do swojej przeglądarki",
     "Unable to load config file: please refresh the page to try again.": "Nie udało się załadować pliku konfiguracyjnego: odśwież stronę aby spróbować ponownie.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Niewspierana przeglądarka",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Zainstaluj <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, lub <safariLink>Safari</safariLink> w celu zapewnienia najlepszego działania.",
@@ -27,6 +28,8 @@
     "Your Element is misconfigured": "Twój Element jest nieprawidłowo skonfigurowany",
     "Powered by Matrix": "Zasilane przez Matrix",
     "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie",
+    "Switch to space by number": "Przełącz na przestrzeń według numeru",
     "Next recently visited room or community": "Następne ostatnio odwiedzone pokoje i społeczności",
+    "Previous recently visited room or community": "Ostatnio odwiedzone pokoje i społeczności",
     "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Zdecentralizowany, szyfrowany czat i współpraca oparte na $matrixLogo"
 }

src/i18n/strings/pt.json

@@ -17,6 +17,7 @@
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "A configuração do Element contém um JSON inválido. Corrija o problema e recarregue a página.",
     "Your Element is misconfigured": "O Element está configurado incorretamente",
     "Powered by Matrix": "Desenvolvido por Matrix",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (2%(browserName)s, 3%(osName)s)",
     "Go to element.io": "Visite element.io",
     "I understand the risks and wish to continue": "Compreendo os riscos e pretendo continuar",
     "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.": "Podes continuar a utilizar teu browser atual, mas algumas funcionalidades podem não funcionar ou aparecerem de forma incorrecta.",

src/i18n/strings/pt_BR.json

@@ -12,6 +12,7 @@
     "Invalid configuration: no default server specified.": "Configuração inválida: nenhum servidor default especificado.",
     "Unable to load config file: please refresh the page to try again.": "Incapaz de carregar arquivo de config: por favor atualize a página para tentar de novo.",
     "Download Completed": "Download Completado",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Browser insuportado",
     "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>, ou <safariLink>Safari</safariLink> para a melhor 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.": "Você pode continuar usando seu browser atual, mas alguma ou toda funcionalidade pode não funcionar e a aparência e sensação do aplicativo pode estar incorretas.",
@@ -19,6 +20,7 @@
     "Go to element.io": "Ir para element.io",
     "Failed to start": "Falha para iniciar",
     "Open": "Abrir",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "Go to your browser to complete Sign In": "Vá para seu browser para completar Sign In",
     "Your Element is misconfigured": "Seu Element está malconfigurado",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Sua configuração de Element contém JSON inválido. Por favor corrija o problema e recarregue a página.",

src/i18n/strings/ro.json

@@ -1,33 +1,31 @@
 {
-    "Unknown device": "Dispozitiv necunoscut",
+    "Unknown device": "Device necunoscut",
     "Dismiss": "Închide",
-    "Welcome to Element": "Bine ai venit pe Element",
-    "Sign In": "Autentifică-te",
-    "Create Account": "Creează-ți Cont",
+    "Welcome to Element": "Bun venit pe Element",
+    "Sign In": "Autentificare",
+    "Create Account": "Crează un cont",
     "Explore rooms": "Explorează camerele",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configurație invalidă: se poate specifica doar una dintre default_server_config, default_server_name, sau default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratie invalida: se poate specifica doar una dintre default_server_config, default_server_name, or default_hs_url.",
     "Invalid JSON": "JSON invalid",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Acest browser nu este suportat",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalați vă rog <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, sau <safariLink>Safari</safariLink> pentru cea mai bună experiență.",
-    "I understand the risks and wish to continue": "Ințeleg riscurile și doresc să continui",
-    "Go to element.io": "Accesează element.io",
-    "Failed to start": "Inițializare eșuată",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalati va rog <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> pentru o experienta mai buna.",
+    "I understand the risks and wish to continue": "Inteleg riscul si doresc sa continui",
+    "Go to element.io": "Acceseaza element.io",
+    "Failed to start": "Nu reuseste sa porneasca",
     "Your Element is misconfigured": "Element-ul tău este configurat necorespunzător",
-    "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.": "Poți continua să folosești browser-ul curent, însă unele sau toate funcționalitățile pot să nu meargă, iar aspectul și experiența în aplicație pot fi incorecte.",
+    "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.": "Poți continua să folosești browser-ul curent, însă aspectul și experiența câtorva sau tuturor funcțiilor poate fi incorectă.",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s folosește funcții avansate de browser ce nu sunt suportate de browser-ul dumneavoastră.",
-    "Your browser can't run %(brand)s": "Browser-ul tău nu poate rula %(brand)s",
+    "Your browser can't run %(brand)s": "Browserul tău nu poate rula %(brand)s",
     "Use %(brand)s on mobile": "Folosește %(brand)s pe mobil",
-    "Powered by Matrix": "Cu ajutorul Matrix",
-    "Go to your browser to complete Sign In": "Deschide în browser pentru a finaliza Autentificarea",
+    "Powered by Matrix": "Bazat pe Matrix",
+    "Go to your browser to complete Sign In": "Du-te la browser pentru a finaliza Autentificarea",
     "Open": "Deschide",
     "Download Completed": "Descărcare Completă",
     "Unexpected error preparing the app. See console for details.": "Eroare neașteptată în aplicație. Vezi consola pentru detalii.",
-    "Unable to load config file: please refresh the page to try again.": "Nu se poate încărca fișierul de configurație: vă rugăm să reîncărcați pagina și să încercați din nou.",
+    "Unable to load config file: please refresh the page to try again.": "Nu se poate încărca fișierul de configurație: vă rugăm sa reîncărcați pagina și să încercați din nou.",
     "The message from the parser is: %(message)s": "Mesajul de la parser este: %(message)s",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Configurația ta Element conține JSON invalid. Vă rugăm să corectați problema și să reîncărcați pagina.",
-    "Invalid configuration: no default server specified.": "Configurație invalidă: niciun server implicit nu este specificat.",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s pe %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Chat &amp; colaborare descentralizate și criptate cu ajutorul $matrixLogo"
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Configurația ta Element conține JSON invalid. Vă rugăm sa corectați problema și să reîncărcați pagina.",
+    "Invalid configuration: no default server specified.": "Configurație invalidă: niciun server implicit specificat."
 }

src/i18n/strings/ru.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "Неверный JSON",
     "Go to your browser to complete Sign In": "Перейдите в браузер для завершения входа",
     "Unable to load config file: please refresh the page to try again.": "Не удалось загрузить файл конфигурации. Попробуйте обновить страницу.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s десктоп (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Неподдерживаемый браузер",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Пожалуйста поставьте <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, или <safariLink>Safari</safariLink> для лучшей совместимости.",
@@ -27,7 +28,5 @@
     "%(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 на мобильном телефоне",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализованное, зашифрованное общение и сотрудничество на основе $matrixLogo",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Рабочий стол: %(platformName)s",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s на %(osName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Децентрализованное, зашифрованное общение и сотрудничество на основе $matrixLogo"
 }

src/i18n/strings/si.json

@@ -1,5 +1,6 @@
 {
     "Unknown device": "නොදන්නා උපාංගයකි",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Welcome to Element": "ඉලමන්ට් වෙත සාදරයෙන් පිළිගනිමු",
     "Open": "විවෘත කරන්න",
     "Powered by Matrix": "මැට්‍රික්ස් මඟින් බලගන්වා ඇත",
@@ -26,5 +27,6 @@
     "I understand the risks and wish to continue": "අවදානම වැටහේ, ඉදිරියට යාමට කැමැත්තෙමි",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "විමධ්‍යගත, සංකේතිත කතාබහ සහ amp; $matrixLogo මගින් බලගැන්වූ සහයෝගිත්වය",
     "Use %(brand)s on mobile": "දුරකථනය සඳහා %(brand)s",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s වැඩතලය (%(platformName)s)",
     "Invalid JSON": "JSON වලංගු නොවේ"
 }

src/i18n/strings/sk.json

@@ -12,6 +12,7 @@
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Neplatná konfigurácia: je možné špecifikovať len jednu možnosť z default_server_config, default_server_name, alebo default_hs_url.",
     "Unable to load config file: please refresh the page to try again.": "Nemožno načítať konfiguračný súbor: prosím obnovte stránku a skúste to znova.",
     "Go to your browser to complete Sign In": "Prejdite do prehliadača a dokončite prihlásenie",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Nepodporovaný prehliadač",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Prosím, nainštalujte si <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink> alebo <safariLink>Safari</safariLink> pre najlepší zážitok.",
@@ -27,7 +28,5 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s používa pokročilé funkcie prehliadača, ktoré nie sú podporované vaším aktuálnym prehliadačom.",
     "Powered by Matrix": "používa protokol Matrix",
     "Use %(brand)s on mobile": "Používať %(brand)s pri mobilných zariadeniach",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizované, šifrované konverzácie a spolupráca na platforme $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s na %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Stolný počítač: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentralizované, šifrované konverzácie a spolupráca na platforme $matrixLogo"
 }

src/i18n/strings/sl.json

@@ -15,7 +15,9 @@
     "Unexpected error preparing the app. See console for details.": "Nepričakovana napaka pri pripravi aplikacije: Za več poglejte konzolo.",
     "Download Completed": "Prenos zaključen",
     "Open": "Odpri",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s namizje za (%(platformName)s)",
     "Go to your browser to complete Sign In": "Nadaljujte s prijavo v spletnem brskalniku",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Powered by Matrix": "Poganja Matrix",
     "Unsupported browser": "Nepodprt brskalnik",
     "Your browser can't run %(brand)s": "Vaš brskalnik ne more poganjati %(brand)s",

src/i18n/strings/sq.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "JSON i pavlefshëm",
     "Go to your browser to complete Sign In": "Që të plotësoni Hyrjen, kaloni te shfletuesi juaj",
     "Unable to load config file: please refresh the page to try again.": "S’arrihet të ngarkohet kartelë formësimesh: ju lutemi, rifreskoni faqen dhe riprovoni.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Shfletues i pambuluar",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Ju lutemi, për funksionimin më të mirë, instaloni <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, ose <safariLink>Safari</safariLink>.",
@@ -27,7 +28,5 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s përdor veçori të thelluara të shfletuesit, të cilat shfletuesi juaj i tanishëm s’i mbulon.",
     "Powered by Matrix": "Bazuar në Matrix",
     "Use %(brand)s on mobile": "Përdor %(brand)s në celular",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në $matrixLogo",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s për Desktop: %(platformName)s",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s në %(osName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Fjalosje &amp; bashkëpunim i decentralizuar, i fshehtëzuar, bazuar në $matrixLogo"
 }

src/i18n/strings/sr.json

@@ -15,7 +15,9 @@
     "Unable to load config file: please refresh the page to try again.": "Не могу да учитам датотеку подешавања: освежите страницу и покушајте поново.",
     "Download Completed": "Преузимање завршено",
     "Open": "Отвори",
+    "%(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 користи напредне могућности које нису подржане у вашем тренутном прегледачу.",

src/i18n/strings/sv.json

@@ -12,6 +12,7 @@
     "Invalid configuration: no default server specified.": "Ogiltiga inställningar: ingen standardserver specificerad.",
     "Go to your browser to complete Sign In": "Gå till din webbläsare för att slutföra inloggningen",
     "Unable to load config file: please refresh the page to try again.": "Kan inte ladda konfigurationsfilen: ladda om sidan för att försöka igen.",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s skrivbord (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "Webbläsaren stöds ej",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installera <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, eller <safariLink>Safari</safariLink> för den bästa upplevelsen.",
@@ -27,7 +28,5 @@
     "Your browser can't run %(brand)s": "Din webbläsare kan inte köra %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s använder avancerade webbläsarfunktioner som inte stöds av din aktuella webbläsare.",
     "Use %(brand)s on mobile": "Använd %(brand)s på mobilen",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentraliserad krypterad chatt &amp; samarbete som drivs av $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s på %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s Skrivbord: %(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Decentraliserad krypterad chatt &amp; samarbete som drivs av $matrixLogo"
 }

src/i18n/strings/ta.json

@@ -20,13 +20,13 @@
     "Your browser can't run %(brand)s": "உங்கள் உலாவியில் %(brand)s ஐ இயக்க முடியாது",
     "Unsupported browser": "ஆதரிக்கப்படாத உலாவி",
     "Use %(brand)s on mobile": "%(brand)s ஐ திறன்பேசியில் பயன்படுத்தவும்",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Go to your browser to complete Sign In": "உள்நுழைவை முடிவுசெய்ய உங்கள் உலாவிக்குச் செல்லவும்",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s திரைமுகப்பு (%(platformName)s)",
     "Open": "திற",
     "Download Completed": "பதிவிறக்கம் முடிவடைந்தது",
     "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.": "உங்கள் எலிமெண்ட் உள்ளமைவில் தவறான JSON உள்ளது. தயவுசெய்து இதை சரிசெய்து பக்கத்தை மீண்டும் ஏற்றவும்.",
     "Your Element is misconfigured": "உங்கள் எலிமெண்ட் தவறாக உள்ளமைக்கப்பட்டுள்ளது",
-    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "மேட்ரிக்ஸ் இனால் செயற்படுத்தபடுகின்ற பரவலாக்கப்பட்ட, மறைகுறியாக்கப்பட்ட , உரையாடல் மற்றும் ஒத்துழைப்பு பயன்பாட்டை",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s இல் %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s டெஸ்க்டாப்: %(platformName)s"
+    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "மேட்ரிக்ஸ் இனால் செயற்படுத்தபடுகின்ற பரவலாக்கப்பட்ட, மறைகுறியாக்கப்பட்ட , உரையாடல் மற்றும் ஒத்துழைப்பு பயன்பாட்டை"
 }

src/i18n/strings/te.json

@@ -9,5 +9,6 @@
     "Create Account": "ఖాతా తెరువు",
     "Open": "తెరువు",
     "Download Completed": "దిగుమతి పూర్తయినది",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s డస్కటాప్ (%(platformName)s)",
     "Unexpected error preparing the app. See console for details.": "ఆప్ ని తయారు చేసే ప్రక్రియాలో అనుకోని లోపం తలెత్తింది. మరిన్ని వివరాల కోసం కాన్సోల్ ను చూడండి."
 }

src/i18n/strings/th.json

@@ -20,5 +20,6 @@
     "I understand the risks and wish to continue": "ฉันเข้าใจความเสี่ยง และดำเนินการต่อ",
     "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 browser can't run %(brand)s": "เบราว์เซอร์ของคุณไม่สามารถใช้งาน %(brand)s ได้",
-    "Unsupported browser": "เบราว์เซอร์ไม่รองรับ"
+    "Unsupported browser": "เบราว์เซอร์ไม่รองรับ",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)"
 }

src/i18n/strings/tr.json

@@ -24,6 +24,7 @@
     "Go to element.io": "element.io adresine git",
     "Failed to start": "Başlatılamadı",
     "Powered by Matrix": "Gücünü Matrix'ten alır",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)  (%(browserName), %(osName))",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)",
     "Open": "Aç",
     "Use %(brand)s on mobile": "Mobilde %(brand)s kullan",

src/i18n/strings/tzm.json

@@ -6,6 +6,7 @@
     "Go to your browser to complete Sign In": "Ddu ɣer umessara fad ad tsemded azemmem",
     "Welcome to Element": "Azul g Element",
     "Go to element.io": "Ddu ɣer element.io",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unknown device": "Allal arussin",
     "Dismiss": "Nexxel",
     "Open": "Ṛẓem",

src/i18n/strings/uk.json

@@ -21,12 +21,12 @@
     "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.": "Неможливо завантажити файл конфігурації. Оновіть, будь ласка, сторінку, щоб спробувати знову.",
     "Open": "Відкрити",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
     "Go to your browser to complete Sign In": "Перейдіть у ваш браузер щоб завершити вхід",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Powered by Matrix": "Працює на Matrix",
     "Your browser can't run %(brand)s": "Ваш браузер не може запустити %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш браузер не підтримує.",
     "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному",
-    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Децентралізована, зашифрована бесіда та співпраця на основі $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s на %(osName)s",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s для комп'ютера: %(platformName)s"
+    "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Децентралізована, зашифрована бесіда та співпраця на основі $matrixLogo"
 }

src/i18n/strings/vi.json

@@ -19,11 +19,13 @@
     "Your browser can't run %(brand)s": "Trình duyệt của bạn không thể chạy %(brand)s",
     "Unsupported browser": "Trình duyệt không được hỗ trợ",
     "Go to your browser to complete Sign In": "Mở trình duyệt web để hoàn thành đăng nhập",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Máy tính để bàn (%(platformName)s)",
     "Open": "Mở",
     "Unable to load config file: please refresh the page to try again.": "Không thể tải tệp cấu hình: hãy tải lại trang để thử lại.",
     "Failed to start": "Khởi động thất bại",
     "Use %(brand)s on mobile": "Sử dụng %(brand)s trên di động",
     "Powered by Matrix": "Được chạy trên giao thức Matrix",
+    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Thiết lập Element của bạn chứa JSON không hợp lệ. Vui lòng sửa vấn đề và tải lại trang.",
     "Your Element is misconfigured": "Element của bạn bị thiết lập sai",
     "Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Dịch vụ chat & liên lạc đã được mã hóa, phi tập trung. Được cung cấp bởi $matrixLogo"

src/i18n/strings/zh_Hans.json

@@ -11,7 +11,9 @@
     "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.": "配置无效：没有指定默认服务器。",
     "Unable to load config file: please refresh the page to try again.": "无法加载配置文件：请刷新页面以重试。",
+    "%(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": "不支持的浏览器",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "请安装 <chromeLink>Chrome</chromeLink>、<firefoxLink>Firefox</firefoxLink> 或 <safariLink>Safari</safariLink> 以获得最佳体验。",
     "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "您可以继续使用您目前的浏览器，但部分或全部功能可能无法正常工作，应用程序的外观可能也看起来不正确。",
@@ -26,5 +28,6 @@
     "%(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",
+    "Switch to space by number": "按数字切换空间",
     "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "去中心化、加密的聊天与协作，由 $matrixLogo 驱动"
 }

src/i18n/strings/zh_Hant.json

@@ -12,6 +12,7 @@
     "Invalid JSON": "無效的 JSON",
     "Go to your browser to complete Sign In": "到您的瀏覽器完成登入",
     "Unable to load config file: please refresh the page to try again.": "無法載入設定檔：請重新整理頁面以再試一次。",
+    "%(brand)s Desktop (%(platformName)s)": "%(brand)s 桌面版 (%(platformName)s)",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "Unsupported browser": "不支援的瀏覽器",
     "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "請安裝 <chromeLink>Chrome</chromeLink>、<firefoxLink>Firefox</firefoxLink> 或 <safariLink>Safari</safariLink> 以取得最佳體驗。",
@@ -27,7 +28,5 @@
     "%(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",
-    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "去中心化、加密的聊天與協作，威力本源 $matrixLogo",
-    "%(appName)s: %(browserName)s on %(osName)s": "%(appName)s：%(browserName)s 在 %(osName)s 上",
-    "%(brand)s Desktop: %(platformName)s": "%(brand)s 桌面版：%(platformName)s"
+    "Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "去中心化、加密的聊天與協作，威力本源 $matrixLogo"
 }

src/vector/index.html

@@ -25,17 +25,17 @@
     <meta property="og:image" content="<%= og_image_url %>" />
     <meta http-equiv="Content-Security-Policy" content="
         default-src 'none';
-        style-src 'self' 'unsafe-inline' <%= csp_extra_source %>;
-        script-src 'self' 'unsafe-eval' https://www.recaptcha.net https://www.gstatic.com <%= csp_extra_source %>;
+        style-src 'self' 'unsafe-inline';
+        script-src 'self' 'unsafe-eval' https://www.recaptcha.net https://www.gstatic.com;
         img-src * blob: data:;
         connect-src *;
-        font-src 'self' data: <%= csp_extra_source %>;
+        font-src 'self' data:;
         media-src * blob: data:;
         child-src * blob: data:;
-        worker-src 'self' blob: <%= csp_extra_source %>;
+        worker-src 'self' blob:;
         frame-src * blob: data:;
-        form-action 'self' <%= csp_extra_source %>;
-        manifest-src 'self' <%= csp_extra_source %>;
+        form-action 'self';
+        manifest-src 'self';
     ">
     <% for (var i=0; i < htmlWebpackPlugin.files.css.length; i++) {
         var file = htmlWebpackPlugin.files.css[i];

src/vector/index.ts

@@ -77,16 +77,16 @@ function checkBrowserFeatures() {
     const featureList = Object.keys(window.Modernizr);
 
     let featureComplete = true;
-    for (const feature of featureList) {
-        if (window.Modernizr[feature] === undefined) {
+    for (let i = 0; i < featureList.length; i++) {
+        if (window.Modernizr[featureList[i]] === undefined) {
             logger.error(
                 "Looked for feature '%s' but Modernizr has no results for this. " +
-                "Has it been configured correctly?", feature,
+                "Has it been configured correctly?", featureList[i],
             );
             return false;
         }
-        if (window.Modernizr[feature] === false) {
-            logger.error("Browser missing feature: '%s'", feature);
+        if (window.Modernizr[featureList[i]] === false) {
+            logger.error("Browser missing feature: '%s'", featureList[i]);
             // toggle flag rather than return early so we log all missing features rather than just the first.
             featureComplete = false;
         }

src/vector/jitsi/index.ts

@@ -65,7 +65,7 @@ const setupCompleted = (async () => {
     try {
         // Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with
         // other setup work and therefore do not block.
-        const configPromise = getVectorConfig();
+        const configPromise = getVectorConfig('..');
 
         // The widget's options are encoded into the fragment to avoid leaking info to the server.
         const widgetQuery = new URLSearchParams(window.location.hash.substring(1));
@@ -102,7 +102,7 @@ const setupCompleted = (async () => {
 
             const handleAction = (
                 action: WidgetApiAction,
-                handler: (request: IWidgetApiRequestData) => Promise<void>,
+                handler: (request: IWidgetApiRequestData) => void,
             ): void => {
                 widgetApi.on(`action:${action}`, async (ev: CustomEvent<IWidgetApiRequest>) => {
                     ev.preventDefault();

src/vector/platform/WebPlatform.ts

@@ -137,8 +137,7 @@ export default class WebPlatform extends VectorBasePlatform {
         return true;
     }
 
-    // Exported for tests
-    public pollForUpdate = (
+    private pollForUpdate = (
         showUpdate: (currentVersion: string, mostRecentVersion: string) => void,
         showNoUpdate?: () => void,
     ): Promise<UpdateStatus> => {

test/.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+    env: {
+        mocha: true,
+    },
+}

test/app-tests/loading-test.tsx

@@ -17,26 +17,34 @@ limitations under the License.
 
 /* loading.js: test the myriad paths we have for loading the application */
 
-import "fake-indexeddb/auto";
-import React from 'react';
-import { render, screen, fireEvent, waitFor, RenderResult, waitForElementToBeRemoved } from "@testing-library/react";
 import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
-import { MatrixClientPeg } from 'matrix-react-sdk/src/MatrixClientPeg';
-import MatrixChat from 'matrix-react-sdk/src/components/structures/MatrixChat';
-import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
-import MockHttpBackend from 'matrix-mock-request';
-import { makeType } from "matrix-react-sdk/src/utils/TypeUtils";
-import { ValidatedServerConfig } from 'matrix-react-sdk/src/utils/ValidatedServerConfig';
-import { IndexedDBCryptoStore } from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
-import { sleep } from "matrix-js-sdk/src/utils";
-
-import "../jest-mocks";
 import WebPlatform from '../../src/vector/platform/WebPlatform';
-import { parseQs, parseQsFromFragment } from '../../src/vector/url_utils';
-import { cleanLocalstorage, deleteIndexedDB } from "../test-utils";
+import "../jest-mocks";
+import React from 'react';
+import ReactDOM from 'react-dom';
+import ReactTestUtils from 'react-dom/test-utils';
+import MatrixReactTestUtils from 'matrix-react-test-utils';
+import * as jssdk from 'matrix-js-sdk/src/matrix';
+import {MatrixClientPeg} from 'matrix-react-sdk/src/MatrixClientPeg';
+import MatrixChat, {Views} from 'matrix-react-sdk/src/components/structures/MatrixChat';
+import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
+import * as test_utils from '../test-utils';
+import MockHttpBackend from 'matrix-mock-request';
+import {parseQs, parseQsFromFragment} from '../../src/vector/url_utils';
+import {makeType} from "matrix-react-sdk/src/utils/TypeUtils";
+import { ValidatedServerConfig } from 'matrix-react-sdk/src/utils/ValidatedServerConfig';
+import {sleep} from "../test-utils";
+import "fake-indexeddb/auto";
+import {cleanLocalstorage} from "../test-utils";
+import {IndexedDBCryptoStore} from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
+import { RoomView as RoomViewClass } from 'matrix-react-sdk/src/components/structures/RoomView';
+import LoginComponent from 'matrix-react-sdk/src/components/structures/auth/Login';
+import WelcomeComponent from "matrix-react-sdk/src/components/views/auth/Welcome";
+import EmbeddedPage from "matrix-react-sdk/src/components/structures/EmbeddedPage";
+import { AutoDiscovery } from 'matrix-js-sdk/src/matrix';
 
-const DEFAULT_HS_URL = 'http://my_server';
-const DEFAULT_IS_URL = 'http://my_is';
+const DEFAULT_HS_URL='http://my_server';
+const DEFAULT_IS_URL='http://my_is';
 
 describe('loading:', function() {
     let parentDiv;
@@ -46,7 +54,7 @@ describe('loading:', function() {
     let windowLocation;
 
     // the mounted MatrixChat
-    let matrixChat: RenderResult;
+    let matrixChat;
 
     // a promise which resolves when the MatrixChat calls onTokenLoginCompleted
     let tokenLoginCompletePromise;
@@ -66,16 +74,25 @@ describe('loading:', function() {
 
     afterEach(async function() {
         console.log(`${Date.now()}: loading: afterEach`);
-        matrixChat?.unmount();
-        // unmounting should have cleared the MatrixClientPeg
-        expect(MatrixClientPeg.get()).toBe(null);
+        try {
+            if (matrixChat) {
+                ReactDOM.unmountComponentAtNode(parentDiv);
+                parentDiv.remove();
+                parentDiv = null;
+            }
 
-        // clear the indexeddbs so we can start from a clean slate next time.
-        await Promise.all([
-            deleteIndexedDB('matrix-js-sdk:crypto'),
-            deleteIndexedDB('matrix-js-sdk:riot-web-sync'),
-        ]);
-        cleanLocalstorage();
+            // unmounting should have cleared the MatrixClientPeg
+            expect(MatrixClientPeg.get()).toBe(null);
+
+            // clear the indexeddbs so we can start from a clean slate next time.
+            await Promise.all([
+                test_utils.deleteIndexedDB('matrix-js-sdk:crypto'),
+                test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync'),
+            ]);
+            cleanLocalstorage();
+        } catch (e) {
+            console.error(e);
+        }
         console.log(`${Date.now()}: loading: afterEach complete`);
     });
 
@@ -132,8 +149,8 @@ describe('loading:', function() {
 
         const params = parseQs(windowLocation);
 
-        tokenLoginCompletePromise = new Promise<void>(resolve => {
-            matrixChat = render(
+        tokenLoginCompletePromise = new Promise(resolve => {
+            matrixChat = ReactDOM.render(
                 <MatrixChat
                     onNewScreen={onNewScreen}
                     config={config}
@@ -159,14 +176,13 @@ describe('loading:', function() {
             .respond(200, {
                 "versions": ["r0.3.0"],
                 "unstable_features": {
-                    "m.lazy_load_members": true,
-                },
+                    "m.lazy_load_members": true
+                }
             });
         const isGuest = opts && opts.isGuest;
         if (!isGuest) {
             // the call to create the LL filter
             httpBackend.when('POST', '/filter').respond(200, { filter_id: 'llfid' });
-            httpBackend.when('GET', '/pushrules').respond(200, {});
         }
         httpBackend.when('GET', '/sync')
             .check((r) => {syncRequest = r;})
@@ -186,10 +202,10 @@ describe('loading:', function() {
         it('gives a welcome page by default', function() {
             loadApp();
 
-            return sleep(1).then(async () => {
+            return sleep(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
-                await assertAtLoadingSpinner();
+                assertAtLoadingSpinner(matrixChat);
 
                 httpBackend.when('POST', '/register').check(function(req) {
                     expect(req.queryParams.kind).toEqual('guest');
@@ -200,7 +216,7 @@ describe('loading:', function() {
                 // Wait for another trip around the event loop for the UI to update
                 return awaitWelcomeComponent(matrixChat);
             }).then(() => {
-                return waitFor(() => expect(windowLocation.hash).toEqual("#/welcome"));
+                expect(windowLocation.hash).toEqual("#/welcome");
             });
         });
 
@@ -210,13 +226,13 @@ describe('loading:', function() {
             });
 
             // Pass the liveliness checks
-            httpBackend.when("GET", "/versions").respond(200, { versions: ["r0.4.0"] });
+            httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
             httpBackend.when("GET", "/api/v1").respond(200, {});
 
-            return sleep(1).then(async () => {
+            return sleep(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
-                await assertAtLoadingSpinner();
+                assertAtLoadingSpinner(matrixChat);
 
                 httpBackend.when('POST', '/register').check(function(req) {
                     expect(req.queryParams.kind).toEqual('guest');
@@ -245,20 +261,19 @@ describe('loading:', function() {
             });
         });
 
-        it.skip('should not register as a guest when using a #/login link', function() {
+        it('should not register as a guest when using a #/login link', function() {
             loadApp({
                 uriFragment: "#/login",
             });
 
             // Pass the liveliness checks
-            httpBackend.when("GET", "/versions").respond(200, { versions: ["r0.4.0"] });
+            httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
             httpBackend.when("GET", "/api/v1").respond(200, {});
 
-            return awaitLoginComponent(matrixChat).then(async () => {
-                await waitForElementToBeRemoved(() => screen.queryAllByLabelText("Loading..."));
+            return awaitLoginComponent(matrixChat).then(() => {
                 // we expect a single <Login> component
-                await screen.findByRole("main");
-                screen.getAllByText("Sign in");
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, LoginComponent);
 
                 // the only outstanding request should be a GET /login
                 // (in particular there should be no /register request for
@@ -277,7 +292,9 @@ describe('loading:', function() {
                 }
                 return completeLogin(matrixChat);
             }).then(() => {
-                expect(matrixChat.container.querySelector(".mx_HomePage")).toBeTruthy();
+                // once the sync completes, we should have a room view
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, EmbeddedPage);
                 expect(windowLocation.hash).toEqual("#/home");
             });
         });
@@ -285,8 +302,8 @@ describe('loading:', function() {
 
     describe("MatrixClient rehydrated from stored credentials:", function() {
         beforeEach(async function() {
-            localStorage.setItem("mx_hs_url", "http://localhost");
-            localStorage.setItem("mx_is_url", "http://localhost");
+            localStorage.setItem("mx_hs_url", "http://localhost" );
+            localStorage.setItem("mx_is_url", "http://localhost" );
             localStorage.setItem("mx_access_token", "access_token");
             localStorage.setItem("mx_user_id", "@me:localhost");
             localStorage.setItem("mx_last_room_id", "!last_room:id");
@@ -300,6 +317,8 @@ describe('loading:', function() {
         });
 
         it('shows the last known room by default', function() {
+            httpBackend.when('GET', '/pushrules').respond(200, {});
+
             loadApp();
 
             return awaitLoggedIn(matrixChat).then(() => {
@@ -317,6 +336,8 @@ describe('loading:', function() {
         it('shows a home page by default if we have no joined rooms', function() {
             localStorage.removeItem("mx_last_room_id");
 
+            httpBackend.when('GET', '/pushrules').respond(200, {});
+
             loadApp();
 
             return awaitLoggedIn(matrixChat).then(() => {
@@ -325,12 +346,15 @@ describe('loading:', function() {
             }).then(() => {
                 // once the sync completes, we should have a home page
                 httpBackend.verifyNoOutstandingExpectation();
-                expect(matrixChat.container.querySelector(".mx_HomePage")).toBeTruthy();
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, EmbeddedPage);
                 expect(windowLocation.hash).toEqual("#/home");
             });
         });
 
         it('shows a room view if we followed a room link', function() {
+            httpBackend.when('GET', '/pushrules').respond(200, {});
+
             loadApp({
                 uriFragment: "#/room/!room:id",
             });
@@ -354,14 +378,48 @@ describe('loading:', function() {
                 });
 
                 // give the UI a chance to display
-                return expectAndAwaitSync();
+                return awaitLoginComponent(matrixChat);
             });
 
-            it('does not show a login view', async function() {
-                await awaitRoomView(matrixChat);
+            it('shows a login view', function() {
+                // Pass the liveliness checks
+                httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+                httpBackend.when("GET", "/api/v1").respond(200, {});
 
-                await screen.findByLabelText("Spaces");
-                expect(screen.queryAllByText("Sign in")).toHaveLength(0);
+                // we expect a single <Login> component
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, LoginComponent,
+                );
+
+                // the only outstanding request should be a GET /login
+                // (in particular there should be no /register request for
+                // guest registration, nor /sync, etc).
+                const allowedRequests = [
+                    "/_matrix/client/r0/login",
+                    "/versions",
+                    "/api/v1",
+                ];
+                for (const req of httpBackend.requests) {
+                    if (req.method === 'GET' && allowedRequests.find(p => req.path.endsWith(p))) {
+                        continue;
+                    }
+
+                    throw new Error(`Unexpected HTTP request to ${req}`);
+                }
+            });
+
+            it('shows the homepage after login', function() {
+                // Pass the liveliness checks
+                httpBackend.when("GET", "/versions").respond(200, {versions: ["r0.4.0"]});
+                httpBackend.when("GET", "/api/v1").respond(200, {});
+
+                return completeLogin(matrixChat).then(() => {
+                    // we should see a home page, even though we previously had
+                    // a stored mx_last_room_id
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, EmbeddedPage);
+                    expect(windowLocation.hash).toEqual("#/home");
+                });
             });
         });
     });
@@ -370,10 +428,10 @@ describe('loading:', function() {
         it('shows a welcome page by default', function() {
             loadApp();
 
-            return sleep(1).then(async () => {
+            return sleep(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
-                await assertAtLoadingSpinner();
+                assertAtLoadingSpinner(matrixChat);
 
                 httpBackend.when('POST', '/register').check(function(req) {
                     expect(req.queryParams.kind).toEqual('guest');
@@ -387,22 +445,24 @@ describe('loading:', function() {
                 return awaitLoggedIn(matrixChat);
             }).then(() => {
                 // we are logged in - let the sync complete
-                return expectAndAwaitSync({ isGuest: true });
+                return expectAndAwaitSync({isGuest: true});
             }).then(() => {
                 // once the sync completes, we should have a welcome page
                 httpBackend.verifyNoOutstandingExpectation();
-                expect(matrixChat.container.querySelector(".mx_Welcome")).toBeTruthy();
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, WelcomeComponent);
                 expect(windowLocation.hash).toEqual("#/welcome");
             });
         });
 
         it('uses the default homeserver to register with', function() {
+
             loadApp();
 
-            return sleep(1).then(async () => {
+            return sleep(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
-                await assertAtLoadingSpinner();
+                assertAtLoadingSpinner(matrixChat);
 
                 httpBackend.when('POST', '/register').check(function(req) {
                     expect(req.path.startsWith(DEFAULT_HS_URL)).toBe(true);
@@ -416,13 +476,14 @@ describe('loading:', function() {
             }).then(() => {
                 return awaitLoggedIn(matrixChat);
             }).then(() => {
-                return expectAndAwaitSync({ isGuest: true });
+                return expectAndAwaitSync({isGuest: true});
             }).then((req) => {
                 expect(req.path.startsWith(DEFAULT_HS_URL)).toBe(true);
 
                 // once the sync completes, we should have a welcome page
                 httpBackend.verifyNoOutstandingExpectation();
-                expect(matrixChat.container.querySelector(".mx_Welcome")).toBeTruthy();
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, WelcomeComponent);
                 expect(windowLocation.hash).toEqual("#/welcome");
                 expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL);
                 expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL);
@@ -430,13 +491,14 @@ describe('loading:', function() {
         });
 
         it('shows a room view if we followed a room link', function() {
+
             loadApp({
                 uriFragment: "#/room/!room:id",
             });
-            return sleep(1).then(async () => {
+            return sleep(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
-                await assertAtLoadingSpinner();
+                assertAtLoadingSpinner(matrixChat);
 
                 httpBackend.when('POST', '/register').check(function(req) {
                     expect(req.queryParams.kind).toEqual('guest');
@@ -449,7 +511,7 @@ describe('loading:', function() {
             }).then(() => {
                 return awaitLoggedIn(matrixChat);
             }).then(() => {
-                return expectAndAwaitSync({ isGuest: true });
+                return expectAndAwaitSync({isGuest: true});
             }).then(() => {
                 // once the sync completes, we should have a room view
                 return awaitRoomView(matrixChat);
@@ -461,6 +523,7 @@ describe('loading:', function() {
 
         describe('Login as user', function() {
             beforeEach(function() {
+
                 // first we have to load the homepage
                 loadApp();
 
@@ -476,9 +539,10 @@ describe('loading:', function() {
                 }).then(() => {
                     // we got a sync spinner - let the sync complete
                     return expectAndAwaitSync();
-                }).then(async () => {
+                }).then(() => {
                     // once the sync completes, we should have a home page
-                    await waitFor(() => matrixChat.container.querySelector(".mx_HomePage"));
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, EmbeddedPage);
 
                     // we simulate a click on the 'login' button by firing off
                     // the relevant dispatch.
@@ -495,13 +559,40 @@ describe('loading:', function() {
                 });
             });
 
-            it('should give us a login page', async function() {
-                // we expect a single <Login> component
-                await screen.findByRole("main");
-                screen.getAllByText("Sign in");
-
+            it('should give us a login page', function() {
                 expect(windowLocation.hash).toEqual("#/login");
+
+                // we expect a single <Login> component
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, LoginComponent,
+                );
             });
+
+            /*
+            // ILAG renders this obsolete. I think.
+            it('should allow us to return to the app', function() {
+                const login = ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, LoginComponent
+                );
+
+                const linkText = 'Return to app';
+
+                const returnToApp = ReactTestUtils.scryRenderedDOMComponentsWithTag(
+                    login, 'a').find((e) => e.innerText === linkText);
+
+                if (!returnToApp) {
+                    throw new Error(`Couldn't find '${linkText}' link`);
+                }
+
+                ReactTestUtils.Simulate.click(returnToApp);
+
+                return sleep(1).then(() => {
+                    // we should be straight back into the home page
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, EmbeddedPage);
+                });
+            });
+            */
         });
     });
 
@@ -513,9 +604,9 @@ describe('loading:', function() {
                 queryString: "?loginToken=secretToken",
             });
 
-            return sleep(1).then(async () => {
+            return sleep(1).then(() => {
                 // we expect a spinner while we're logging in
-                await assertAtLoadingSpinner();
+                assertAtLoadingSpinner(matrixChat);
 
                 httpBackend.when('POST', '/login').check(function(req) {
                     expect(req.path).toMatch(new RegExp("^https://homeserver/"));
@@ -548,11 +639,15 @@ describe('loading:', function() {
 
     // check that we have a Login component, send a 'user:pass' login,
     // and await the HTTP requests.
-    async function completeLogin(matrixChat: RenderResult) {
+    async function completeLogin(matrixChat) {
+        // we expect a single <Login> component
+        const login = ReactTestUtils.findRenderedComponentWithType(
+            matrixChat, LoginComponent);
+
         // When we switch to the login component, it'll hit the login endpoint
         // for proof of life and to get flows. We'll only give it one option.
         httpBackend.when('GET', '/login')
-            .respond(200, { flows: [{ type: "m.login.password" }] });
+            .respond(200, {"flows": [{"type": "m.login.password"}]});
         httpBackend.flush(); // We already would have tried the GET /login request
 
         // Give the component some time to finish processing the login flows before
@@ -569,14 +664,13 @@ describe('loading:', function() {
             device_id: 'DEVICE_ID',
             access_token: 'access_token',
         });
-        fireEvent.change(matrixChat.container.querySelector("#mx_LoginForm_username"), { target: { value: "user" } });
-        fireEvent.change(matrixChat.container.querySelector("#mx_LoginForm_password"), { target: { value: "pass" } });
-        fireEvent.click(screen.getByText("Sign in", { selector: ".mx_Login_submit" }));
+        login.onPasswordLogin("user", undefined, undefined, "pass");
 
         return httpBackend.flush().then(() => {
             // Wait for another trip around the event loop for the UI to update
             return sleep(1);
         }).then(() => {
+            httpBackend.when('GET', '/pushrules').respond(200, {});
             return expectAndAwaitSync().catch((e) => {
                 throw new Error("Never got /sync after login: did the client start?");
             });
@@ -587,13 +681,18 @@ describe('loading:', function() {
 });
 
 // assert that we are on the loading page
-async function assertAtLoadingSpinner() {
-    await screen.findByRole("progressbar");
+function assertAtLoadingSpinner(matrixChat) {
+    const domComponent = ReactDOM.findDOMNode(matrixChat) as Element;
+    expect(domComponent.className).toEqual("mx_MatrixChat_splash");
+
+    // just the spinner
+    expect(domComponent.children.length).toEqual(1);
 }
 
-async function awaitLoggedIn(matrixChat: RenderResult) {
-    if (matrixChat.container.querySelector(".mx_MatrixChat_wrapper")) return; // already logged in
-
+function awaitLoggedIn(matrixChat) {
+    if (matrixChat.state.view === Views.LOGGED_IN) {
+        return Promise.resolve();
+    }
     return new Promise(resolve => {
         const onAction = ({ action }) => {
             if (action !== "on_logged_in") {
@@ -601,26 +700,55 @@ async function awaitLoggedIn(matrixChat: RenderResult) {
             }
             console.log(Date.now() + ": Received on_logged_in action");
             dis.unregister(dispatcherRef);
-            resolve(sleep(1));
+            resolve(undefined);
         };
         const dispatcherRef = dis.register(onAction);
         console.log(Date.now() + ": Waiting for on_logged_in action");
     });
 }
 
-async function awaitRoomView(matrixChat: RenderResult) {
-    await waitFor(() => matrixChat.container.querySelector(".mx_RoomView"));
+function awaitRoomView(matrixChat, retryLimit?, retryCount?) {
+    if (retryLimit === undefined) {
+        retryLimit = 5;
+    }
+    if (retryCount === undefined) {
+        retryCount = 0;
+    }
+
+    if (matrixChat.state.view !== Views.LOGGED_IN || !matrixChat.state.ready) {
+        console.log(Date.now() + " Awaiting room view: not ready yet.");
+        if (retryCount >= retryLimit) {
+            throw new Error("MatrixChat still not ready after " +
+                            retryCount + " tries");
+        }
+        return sleep(0).then(() => {
+            return awaitRoomView(matrixChat, retryLimit, retryCount + 1);
+        });
+    }
+
+    console.log(Date.now() + " Awaiting room view: now ready.");
+
+    // state looks good, check the rendered output
+    ReactTestUtils.findRenderedComponentWithType(
+        matrixChat, RoomViewClass);
+    return Promise.resolve();
 }
 
-async function awaitLoginComponent(matrixChat: RenderResult) {
-    await waitFor(() => matrixChat.container.querySelector(".mx_AuthPage"));
+function awaitLoginComponent(matrixChat, attempts?) {
+    return MatrixReactTestUtils.waitForRenderedComponentWithType(
+        matrixChat, LoginComponent, attempts,
+    );
 }
 
-async function awaitWelcomeComponent(matrixChat: RenderResult) {
-    await waitFor(() => matrixChat.container.querySelector(".mx_Welcome"));
+function awaitWelcomeComponent(matrixChat, attempts?) {
+    return MatrixReactTestUtils.waitForRenderedComponentWithType(
+        matrixChat, WelcomeComponent, attempts,
+    );
 }
 
-function moveFromWelcomeToLogin(matrixChat: RenderResult) {
+function moveFromWelcomeToLogin(matrixChat) {
+    ReactTestUtils.findRenderedComponentWithType(
+        matrixChat, WelcomeComponent);
     dis.dispatch({ action: 'start_login' });
     return awaitLoginComponent(matrixChat);
 }

test/jest-mocks.js

@@ -1,19 +1,3 @@
-/*
-Copyright 2020-2022 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
 // https://jestjs.io/docs/en/manual-mocks#mocking-methods-which-are-not-implemented-in-jsdom
 Object.defineProperty(window, 'matchMedia', {
     writable: true,

test/test-utils.js

@@ -1,25 +1,9 @@
-/*
-Copyright 2016-2022 The Matrix.org Foundation C.I.C.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-export function cleanLocalstorage(): void {
+export function cleanLocalstorage() {
     window.localStorage.clear();
 }
 
-export function deleteIndexedDB(dbName: string): Promise<void> {
-    return new Promise<void>((resolve, reject) => {
+export function deleteIndexedDB(dbName) {
+    return new Promise((resolve, reject) => {
         if (!window.indexedDB) {
             resolve();
             return;
@@ -35,7 +19,7 @@ export function deleteIndexedDB(dbName: string): Promise<void> {
 
         req.onerror = (ev) => {
             reject(new Error(
-                `${Date.now()}: unable to delete indexeddb ${dbName}: ${req.error}`,
+                `${Date.now()}: unable to delete indexeddb ${dbName}: ${ev.target.error}`,
             ));
         };
 
@@ -49,3 +33,7 @@ export function deleteIndexedDB(dbName: string): Promise<void> {
         throw e;
     });
 }
+
+export function sleep(ms) {
+    return new Promise((resolve) => { setTimeout(resolve, ms); });
+}

test/unit-tests/vector/getconfig-test.ts

@@ -26,10 +26,10 @@ describe('getVectorConfig()', () => {
     const now = 1234567890;
     const specificConfig = {
         brand: 'specific',
-    };
+    }
     const generalConfig = {
         brand: 'general',
-    };
+    }
 
     beforeEach(() => {
         document.domain = elementDomain;

test/unit-tests/vector/platform/ElectronPlatform-test.ts

@@ -14,25 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import request from 'browser-request';
+import EventEmitter from 'events';
 import { logger } from 'matrix-js-sdk/src/logger';
-import { MatrixEvent, Room } from 'matrix-js-sdk/src/matrix';
+import { MatrixClient, MatrixEvent, Room } from 'matrix-js-sdk/src/matrix';
 import { UpdateCheckStatus } from 'matrix-react-sdk/src/BasePlatform';
 import { Action } from 'matrix-react-sdk/src/dispatcher/actions';
 import dispatcher from 'matrix-react-sdk/src/dispatcher/dispatcher';
+import { MatrixClientPeg } from 'matrix-react-sdk/src/MatrixClientPeg';
 import * as rageshake from 'matrix-react-sdk/src/rageshake/rageshake';
 
 import ElectronPlatform from '../../../../src/vector/platform/ElectronPlatform';
 
 jest.mock('matrix-react-sdk/src/rageshake/rageshake', () => ({
-    flush: jest.fn(),
-}));
+    flush: jest.fn()
+}))
+
 
 describe('ElectronPlatform', () => {
-    const defaultUserAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 ' +
-        '(KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36';
+    const defaultUserAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36';
     const mockElectron = {
         on: jest.fn(),
-        send: jest.fn(),
+        send: jest.fn()
     };
 
     const dispatchSpy = jest.spyOn(dispatcher, 'dispatch');
@@ -55,25 +58,25 @@ describe('ElectronPlatform', () => {
 
     it('flushes rageshake before quitting', () => {
         new ElectronPlatform();
-        const [event, handler] = getElectronEventHandlerCall('before-quit');
-        // correct event bound
-        expect(event).toBeTruthy();
+            const [event, handler] = getElectronEventHandlerCall('before-quit');
+            // correct event bound
+            expect(event).toBeTruthy();
 
-        handler();
+            handler();
 
-        expect(logSpy).toHaveBeenCalled();
-        expect(rageshake.flush).toHaveBeenCalled();
+            expect(logSpy).toHaveBeenCalled();
+            expect(rageshake.flush).toHaveBeenCalled();
     });
 
     it('dispatches view settings action on preferences event', () => {
         new ElectronPlatform();
-        const [event, handler] = getElectronEventHandlerCall('preferences');
-        // correct event bound
-        expect(event).toBeTruthy();
+            const [event, handler] = getElectronEventHandlerCall('preferences');
+            // correct event bound
+            expect(event).toBeTruthy();
 
-        handler();
+            handler();
 
-        expect(dispatchFireSpy).toHaveBeenCalledWith(Action.ViewUserSettings);
+            expect(dispatchFireSpy).toHaveBeenCalledWith(Action.ViewUserSettings);
     });
 
     describe('updates', () => {
@@ -82,38 +85,39 @@ describe('ElectronPlatform', () => {
             const [event, handler] = getElectronEventHandlerCall('check_updates');
             // correct event bound
             expect(event).toBeTruthy();
-
+    
             handler({}, true);
             expect(dispatchSpy).toHaveBeenCalledWith({
                 action: Action.CheckUpdates,
-                status: UpdateCheckStatus.Downloading,
-            });
+                status: UpdateCheckStatus.Downloading
+            })
         });
 
         it('dispatches on check updates action when update not available', () => {
             new ElectronPlatform();
             const [, handler] = getElectronEventHandlerCall('check_updates');
-
+    
             handler({}, false);
             expect(dispatchSpy).toHaveBeenCalledWith({
                 action: Action.CheckUpdates,
-                status: UpdateCheckStatus.NotAvailable,
-            });
+                status: UpdateCheckStatus.NotAvailable
+            })
         });
 
         it('starts update check', () => {
             const platform = new ElectronPlatform();
             platform.startUpdateCheck();
-            expect(mockElectron.send).toHaveBeenCalledWith('check_updates');
+            expect(mockElectron.send).toHaveBeenCalledWith('check_updates')
         });
 
         it('installs update', () => {
             const platform = new ElectronPlatform();
             platform.installUpdate();
-            expect(mockElectron.send).toHaveBeenCalledWith('install_update');
+            expect(mockElectron.send).toHaveBeenCalledWith('install_update')
         });
     });
 
+
     it('returns human readable name', () => {
         const platform = new ElectronPlatform();
         expect(platform.getHumanReadableName()).toEqual('Electron Platform');
@@ -121,13 +125,11 @@ describe('ElectronPlatform', () => {
 
     describe("getDefaultDeviceDisplayName", () => {
         it.each([[
-            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 " +
-            "(KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36",
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36",
             "Element Desktop: macOS",
         ],
         [
-            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) " +
-            "electron/1.0.0 Chrome/53.0.2785.113 Electron/1.4.3 Safari/537.36",
+            "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) electron/1.0.0 Chrome/53.0.2785.113 Electron/1.4.3 Safari/537.36",
             "Element Desktop: Windows",
         ],
         [
@@ -149,7 +151,9 @@ describe('ElectronPlatform', () => {
         [
             "custom user agent",
             "Element Desktop: Unknown",
-        ]])("%s = %s", (userAgent, result) => {
+        ],
+
+    ])("%s = %s", (userAgent, result) => {
             delete window.navigator;
             window.navigator = { userAgent } as unknown as Navigator;
             const platform = new ElectronPlatform();
@@ -228,7 +232,7 @@ describe('ElectronPlatform', () => {
 
             const [channel, { name }] = mockElectron.send.mock.calls[0];
             expect(channel).toEqual("ipcCall");
-            expect(name).toEqual('getAvailableSpellCheckLanguages');
+            expect(name).toEqual('getAvailableSpellCheckLanguages')
         });
     });
 
@@ -239,8 +243,8 @@ describe('ElectronPlatform', () => {
             platform.getPickleKey(userId, deviceId);
 
             const [, { name, args }] = mockElectron.send.mock.calls[0];
-            expect(name).toEqual('getPickleKey');
-            expect(args).toEqual([userId, deviceId]);
+            expect(name).toEqual('getPickleKey')
+            expect(args).toEqual([userId, deviceId])
         });
 
         it('makes correct ipc call to create pickle key', () => {
@@ -249,8 +253,8 @@ describe('ElectronPlatform', () => {
             platform.createPickleKey(userId, deviceId);
 
             const [, { name, args }] = mockElectron.send.mock.calls[0];
-            expect(name).toEqual('createPickleKey');
-            expect(args).toEqual([userId, deviceId]);
+            expect(name).toEqual('createPickleKey')
+            expect(args).toEqual([userId, deviceId])
         });
 
         it('makes correct ipc call to destroy pickle key', () => {
@@ -259,8 +263,8 @@ describe('ElectronPlatform', () => {
             platform.destroyPickleKey(userId, deviceId);
 
             const [, { name, args }] = mockElectron.send.mock.calls[0];
-            expect(name).toEqual('destroyPickleKey');
-            expect(args).toEqual([userId, deviceId]);
+            expect(name).toEqual('destroyPickleKey')
+            expect(args).toEqual([userId, deviceId])
         });
     });
 

test/unit-tests/vector/platform/WebPlatform-test.ts

@@ -33,7 +33,6 @@ describe('WebPlatform', () => {
     });
 
     it('registers service worker', () => {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore - mocking readonly object
         navigator.serviceWorker = { register: jest.fn() };
         new WebPlatform();
@@ -67,8 +66,7 @@ describe('WebPlatform', () => {
     describe("getDefaultDeviceDisplayName", () => {
         it.each([[
             "https://develop.element.io/#/room/!foo:bar",
-            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) " +
-            "Chrome/105.0.0.0 Safari/537.36",
+            "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36",
             "develop.element.io: Chrome on macOS",
         ]])("%s & %s = %s", (url, userAgent, result) => {
             delete window.navigator;
@@ -84,16 +82,14 @@ describe('WebPlatform', () => {
         const mockNotification = {
             requestPermission: jest.fn(),
             permission: 'notGranted',
-        };
+        }
         beforeEach(() => {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             window.Notification = mockNotification;
             mockNotification.permission = 'notGranted';
         });
 
         it('supportsNotifications returns false when platform does not support notifications', () => {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
             window.Notification = undefined;
             expect(new WebPlatform().supportsNotifications()).toBe(false);
@@ -108,7 +104,7 @@ describe('WebPlatform', () => {
         });
 
         it('maySendNotifications returns true when notification permissions are granted', () => {
-            mockNotification.permission = 'granted';
+            mockNotification.permission = 'granted'
             expect(new WebPlatform().maySendNotifications()).toBe(true);
         });
 
@@ -119,6 +115,7 @@ describe('WebPlatform', () => {
             const result = await platform.requestNotificationPermission();
             expect(result).toEqual('test');
         });
+
     });
 
     describe('app version', () => {
@@ -127,7 +124,7 @@ describe('WebPlatform', () => {
 
         beforeEach(() => {
             jest.spyOn(MatrixClientPeg, 'userRegisteredWithinLastHours').mockReturnValue(false);
-        });
+        })
 
         afterAll(() => {
             process.env.VERSION = envVersion;
@@ -157,8 +154,7 @@ describe('WebPlatform', () => {
         });
 
         describe('pollForUpdate()', () => {
-            it('should return not available and call showNoUpdate when current version ' +
-                'matches most recent version', async () => {
+            it('should return not available and call showNoUpdate when current version matches most recent version', async () => {
                 process.env.VERSION = prodVersion;
                 fetchMock.getOnce("/version", prodVersion);
                 const platform = new WebPlatform();
@@ -187,8 +183,7 @@ describe('WebPlatform', () => {
                 expect(showNoUpdate).toHaveBeenCalled();
             });
 
-            it('should return ready and call showUpdate when current version ' +
-                'differs from most recent version', async () => {
+            it('should return ready and call showUpdate when current version differs from most recent version', async () => {
                 process.env.VERSION = '0.0.0'; // old version
                 fetchMock.getOnce("/version", prodVersion);
                 const platform = new WebPlatform();