Merge tag 'v1.10.14' into sc

* Make Lao translation available ([\element-hq#22358](element-hq#22358)). Fixes element-hq#22327. * Option to disable hardware acceleration on Element Desktop ([\element-hq#22295](element-hq#22295)). Contributed by @novocaine. * Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\element-hq#7790](matrix-org/matrix-react-sdk#7790)). Contributed by @johannes-krude. * Live location sharing - open location in OpenStreetMap ([\element-hq#8695](matrix-org/matrix-react-sdk#8695)). Contributed by @kerryarchibald. * Show a dialog when Jitsi encounters an error ([\element-hq#8701](matrix-org/matrix-react-sdk#8701)). Fixes element-hq#22284. * Add support for setting the `avatar_url` of widgets by integration managers. ([\element-hq#8550](matrix-org/matrix-react-sdk#8550)). Contributed by @Fox32. * Add an option to ignore (block) a user when reporting their events ([\element-hq#8471](matrix-org/matrix-react-sdk#8471)). * Add the option to disable hardware acceleration ([\element-hq#8655](matrix-org/matrix-react-sdk#8655)). Contributed by @novocaine. * Slightly better presentation of read receipts to screen reader users ([\element-hq#8662](matrix-org/matrix-react-sdk#8662)). Fixes element-hq#22293. Contributed by @pvagner. * Add jump to related event context menu item ([\element-hq#6775](matrix-org/matrix-react-sdk#6775)). Fixes element-hq#19883. * Add public room directory hook ([\element-hq#8626](matrix-org/matrix-react-sdk#8626)). * Stop Jitsi if we time out while connecting to a video room ([\element-hq#22301](element-hq#22301)). Fixes element-hq#22283. * Remove inline margin from UTD error message inside a reply tile on ThreadView ([\element-hq#8708](matrix-org/matrix-react-sdk#8708)). Fixes element-hq#22376. Contributed by @luixxiul. * Move unread notification dots of the threads list to the expected position ([\element-hq#8700](matrix-org/matrix-react-sdk#8700)). Fixes element-hq#22350. Contributed by @luixxiul. * Prevent overflow of grid items on a bubble with UTD generally ([\element-hq#8697](matrix-org/matrix-react-sdk#8697)). Contributed by @luixxiul. * Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\element-hq#8704](matrix-org/matrix-react-sdk#8704)). Fixes element-hq#22365. Contributed by @luixxiul. * Fix - AccessibleButton does not set disabled attribute ([\element-hq#8682](matrix-org/matrix-react-sdk#8682)). Contributed by @kerryarchibald. * Fix font not resetting when logging out ([\element-hq#8670](matrix-org/matrix-react-sdk#8670)). Fixes element-hq#17228. * Fix local aliases section of room settings not working for some homeservers (ie ([\element-hq#8698](matrix-org/matrix-react-sdk#8698)). Fixes element-hq#22337. * Align EventTile_line with display name on message bubble ([\element-hq#8692](matrix-org/matrix-react-sdk#8692)). Fixes element-hq#22343. Contributed by @luixxiul. * Convert references to direct chat -> direct message ([\element-hq#8694](matrix-org/matrix-react-sdk#8694)). Contributed by @novocaine. * Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\element-hq#8687](matrix-org/matrix-react-sdk#8687)). * Make the empty thread panel fill BaseCard ([\element-hq#8690](matrix-org/matrix-react-sdk#8690)). Fixes element-hq#22338. Contributed by @luixxiul. * Fix edge case around composer handling gendered facepalm emoji ([\element-hq#8686](matrix-org/matrix-react-sdk#8686)). * Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\element-hq#8688](matrix-org/matrix-react-sdk#8688)). Fixes element-hq#21914. Contributed by @luixxiul. * Apply the same max-width to image tile on the thread timeline as message bubble ([\element-hq#8669](matrix-org/matrix-react-sdk#8669)). Fixes element-hq#22313. Contributed by @luixxiul. * Fix dropdown button size for picture-in-picture CallView ([\element-hq#8680](matrix-org/matrix-react-sdk#8680)). Fixes element-hq#22316. Contributed by @luixxiul. * Live location sharing - fix square border for image-less avatar (PSF-1052) ([\element-hq#8679](matrix-org/matrix-react-sdk#8679)). Contributed by @kerryarchibald. * Stop connecting to a video room if the widget messaging disappears ([\element-hq#8660](matrix-org/matrix-react-sdk#8660)). * Fix file button and audio player overflowing from message bubble ([\element-hq#8666](matrix-org/matrix-react-sdk#8666)). Fixes element-hq#22308. Contributed by @luixxiul. * Don't show broken composer format bar when selection is whitespace ([\element-hq#8673](matrix-org/matrix-react-sdk#8673)). Fixes element-hq#10788. * Fix media upload http 413 handling ([\element-hq#8674](matrix-org/matrix-react-sdk#8674)). * Fix emoji picker for editing thread responses ([\element-hq#8671](matrix-org/matrix-react-sdk#8671)). Fixes matrix-org/element-web-rageshakes#13129. * Map attribution while sharing live location is now visible ([\element-hq#8621](matrix-org/matrix-react-sdk#8621)). Fixes element-hq#22236. Contributed by @weeman1337. * Fix info tile overlapping the time stamp on TimelineCard ([\element-hq#8639](matrix-org/matrix-react-sdk#8639)). Fixes element-hq#22256. Contributed by @luixxiul. * Fix position of wide images on IRC / modern layout ([\element-hq#8667](matrix-org/matrix-react-sdk#8667)). Fixes element-hq#22309. Contributed by @luixxiul. * Fix other user's displayName being wrapped on the bubble message layout ([\element-hq#8456](matrix-org/matrix-react-sdk#8456)). Fixes element-hq#22004. Contributed by @luixxiul. * Set spacing declarations to elements in mx_EventTile_mediaLine ([\element-hq#8665](matrix-org/matrix-react-sdk#8665)). Fixes element-hq#22307. Contributed by @luixxiul. * Fix wide image overflowing from the thumbnail container ([\element-hq#8663](matrix-org/matrix-react-sdk#8663)). Fixes element-hq#22303. Contributed by @luixxiul. * Fix styles of "Show all" link button on ReactionsRow ([\element-hq#8658](matrix-org/matrix-react-sdk#8658)). Fixes element-hq#22300. Contributed by @luixxiul. * Automatically log in after registration ([\element-hq#8654](matrix-org/matrix-react-sdk#8654)). Fixes element-hq#19305. Contributed by @justjanne. * Fix offline status in window title not working reliably ([\element-hq#8656](matrix-org/matrix-react-sdk#8656)). * Align input area with event body's first letter in a thread on IRC/modern layout ([\element-hq#8636](matrix-org/matrix-react-sdk#8636)). Fixes element-hq#22252. Contributed by @luixxiul. * Fix crash on null idp for SSO buttons ([\element-hq#8650](matrix-org/matrix-react-sdk#8650)). Contributed by @hughns. * Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\element-hq#8648](matrix-org/matrix-react-sdk#8648)). Fixes element-hq#22279. * Show notifications even when Element is focused ([\element-hq#8590](matrix-org/matrix-react-sdk#8590)). Contributed by @sumnerevans. * Remove padding from the buttons on edit message composer of a event tile on a thread ([\element-hq#8632](matrix-org/matrix-react-sdk#8632)). Contributed by @luixxiul. * ensure metaspace changes correctly notify listeners ([\element-hq#8611](matrix-org/matrix-react-sdk#8611)). Fixes element-hq#21006. Contributed by @justjanne. * Hide image banner on stickers, they have a tooltip already ([\element-hq#8641](matrix-org/matrix-react-sdk#8641)). Fixes element-hq#22244. * Adjust EditMessageComposer style declarations ([\element-hq#8631](matrix-org/matrix-react-sdk#8631)). Fixes element-hq#22231. Contributed by @luixxiul.
SchildiChat · Jun 7, 2022 · 4b5042b · 4b5042b
2 parents 2d9b672 + b7b5408
commit 4b5042b
Show file tree

Hide file tree

Showing 16 changed files with 1,003 additions and 648 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -30,6 +30,8 @@ module.exports = {
 
             // We disable this while we're transitioning
             "@typescript-eslint/no-explicit-any": "off",
+            // We're okay with assertion errors when we ask for them
+            "@typescript-eslint/no-non-null-assertion": "off",
 
             // Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
             "no-restricted-imports": ["error", {

diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -2,6 +2,7 @@ name: Pull Request
 on:
   pull_request_target:
     types: [ opened, edited, labeled, unlabeled, synchronize ]
+concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
 jobs:
   changelog:
     name: Preview Changelog

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -5,7 +5,7 @@ on:
     types:
       - completed
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
   cancel-in-progress: true
 jobs:
   prdetails:

diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -28,39 +28,7 @@ jobs:
 
   i18n_lint:
     name: "i18n Check"
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: "Get modified files"
-        id: changed_files
-        if: github.event_name == 'pull_request'
-        uses: tj-actions/changed-files@v19
-        with:
-          files: |
-            src/i18n/strings/*
-          files_ignore: |
-            src/i18n/strings/en_EN.json
-      - name: "Assert only en_EN was modified"
-        if: |
-          github.event_name == 'pull_request' &&
-          github.actor != 'RiotTranslateBot' &&
-          steps.changed_files.outputs.any_modified == 'true'
-        run: |
-          echo "You can only modify en_EN.json, do not touch any of the other i18n files as Weblate will be confused"
-          exit 1
-      - uses: actions/setup-node@v3
-        with:
-          cache: 'yarn'
-
-      # Does not need branch matching as only analyses this layer
-      - name: Install Deps
-        run: "yarn install --pure-lockfile"
-
-      - name: i18n Check
-        run: "yarn run diff-i18n"
+    uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
 
   js_lint:
     name: "ESLint"

diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
@@ -2,7 +2,7 @@ name: Move labelled issues to correct projects
 
 on:
   issues:
-    types: [ labeled ]
+    types: [labeled]
 
 jobs:
   apply_Z-Labs_label:
@@ -100,9 +100,6 @@ jobs:
     runs-on: ubuntu-latest
     if: >
       contains(github.event.issue.labels.*.name, 'A-New-Search-Experience') ||
-      contains(github.event.issue.labels.*.name, 'A-Spaces') ||
-      contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
-      contains(github.event.issue.labels.*.name, 'A-Subspaces') ||
       contains(github.event.issue.labels.*.name, 'Team: Delight') ||
       contains(github.event.issue.labels.*.name, 'Z-IA') ||
       contains(github.event.issue.labels.*.name, 'Z-NewUserJourney')

diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
@@ -2,35 +2,9 @@ name: Move P1 bugs to boards
 
 on:
   issues:
-    types: [ labeled, unlabeled ]
+    types: [labeled, unlabeled]
 
 jobs:
-  p1_issues_to_team_workboard:
-    runs-on: ubuntu-latest
-    if: >
-      (!contains(github.event.issue.labels.*.name, 'A-E2EE') &&
-       !contains(github.event.issue.labels.*.name, 'A-E2EE-Cross-Signing') &&
-       !contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') &&
-       !contains(github.event.issue.labels.*.name, 'A-E2EE-Key-Backup') &&
-       !contains(github.event.issue.labels.*.name, 'A-E2EE-SAS-Verification') &&
-       !contains(github.event.issue.labels.*.name, 'A-Spaces') &&
-       !contains(github.event.issue.labels.*.name, 'A-Spaces-Settings') &&
-       !contains(github.event.issue.labels.*.name, 'A-Subspaces')) &&
-      (contains(github.event.issue.labels.*.name, 'T-Defect') &&
-       contains(github.event.issue.labels.*.name, 'S-Critical') &&
-       (contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-        contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
-       contains(github.event.issue.labels.*.name, 'S-Major') &&
-       contains(github.event.issue.labels.*.name, 'O-Frequent') ||
-       contains(github.event.issue.labels.*.name, 'A11y') &&
-       contains(github.event.issue.labels.*.name, 'O-Frequent'))
-    steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
-        with:
-          project: Web App Team
-          column: P1
-          repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
   P1_issues_to_crypto_team_workboard:
     runs-on: ubuntu-latest
     if: >

diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ electron/pub
 .vscode
 .vscode/
 .env
+/coverage
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,60 @@
+Changes in [1.10.14](https://github.com/vector-im/element-web/releases/tag/v1.10.14) (2022-06-07)
+=================================================================================================
+
+## ✨ Features
+ * Make Lao translation available ([\#22358](https://github.com/vector-im/element-web/pull/22358)). Fixes #22327.
+ * Option to disable hardware acceleration on Element Desktop ([\#22295](https://github.com/vector-im/element-web/pull/22295)). Contributed by @novocaine.
+ * Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\#7790](https://github.com/matrix-org/matrix-react-sdk/pull/7790)). Contributed by @johannes-krude.
+ * Live location sharing - open location in OpenStreetMap ([\#8695](https://github.com/matrix-org/matrix-react-sdk/pull/8695)). Contributed by @kerryarchibald.
+ * Show a dialog when Jitsi encounters an error ([\#8701](https://github.com/matrix-org/matrix-react-sdk/pull/8701)). Fixes #22284.
+ * Add support for setting the `avatar_url` of widgets by integration managers. ([\#8550](https://github.com/matrix-org/matrix-react-sdk/pull/8550)). Contributed by @Fox32.
+ * Add an option to ignore (block) a user when reporting their events ([\#8471](https://github.com/matrix-org/matrix-react-sdk/pull/8471)).
+ * Add the option to disable hardware acceleration ([\#8655](https://github.com/matrix-org/matrix-react-sdk/pull/8655)). Contributed by @novocaine.
+ * Slightly better presentation of read receipts to screen reader users ([\#8662](https://github.com/matrix-org/matrix-react-sdk/pull/8662)). Fixes #22293. Contributed by @pvagner.
+ * Add jump to related event context menu item ([\#6775](https://github.com/matrix-org/matrix-react-sdk/pull/6775)). Fixes #19883.
+ * Add public room directory hook ([\#8626](https://github.com/matrix-org/matrix-react-sdk/pull/8626)).
+
+## 🐛 Bug Fixes
+ * Stop Jitsi if we time out while connecting to a video room ([\#22301](https://github.com/vector-im/element-web/pull/22301)). Fixes #22283.
+ * Remove inline margin from UTD error message inside a reply tile on ThreadView ([\#8708](https://github.com/matrix-org/matrix-react-sdk/pull/8708)). Fixes #22376. Contributed by @luixxiul.
+ * Move unread notification dots of the threads list to the expected position ([\#8700](https://github.com/matrix-org/matrix-react-sdk/pull/8700)). Fixes #22350. Contributed by @luixxiul.
+ * Prevent overflow of grid items on a bubble with UTD generally ([\#8697](https://github.com/matrix-org/matrix-react-sdk/pull/8697)). Contributed by @luixxiul.
+ * Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\#8704](https://github.com/matrix-org/matrix-react-sdk/pull/8704)). Fixes #22365. Contributed by @luixxiul.
+ * Fix - AccessibleButton does not set disabled attribute ([\#8682](https://github.com/matrix-org/matrix-react-sdk/pull/8682)). Contributed by @kerryarchibald.
+ * Fix font not resetting when logging out ([\#8670](https://github.com/matrix-org/matrix-react-sdk/pull/8670)). Fixes #17228.
+ * Fix local aliases section of room settings not working for some homeservers (ie ([\#8698](https://github.com/matrix-org/matrix-react-sdk/pull/8698)). Fixes #22337.
+ * Align EventTile_line with display name on message bubble ([\#8692](https://github.com/matrix-org/matrix-react-sdk/pull/8692)). Fixes #22343. Contributed by @luixxiul.
+ * Convert references to direct chat -> direct message ([\#8694](https://github.com/matrix-org/matrix-react-sdk/pull/8694)). Contributed by @novocaine.
+ * Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\#8687](https://github.com/matrix-org/matrix-react-sdk/pull/8687)).
+ * Make the empty thread panel fill BaseCard ([\#8690](https://github.com/matrix-org/matrix-react-sdk/pull/8690)). Fixes #22338. Contributed by @luixxiul.
+ * Fix edge case around composer handling gendered facepalm emoji ([\#8686](https://github.com/matrix-org/matrix-react-sdk/pull/8686)).
+ * Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\#8688](https://github.com/matrix-org/matrix-react-sdk/pull/8688)). Fixes #21914. Contributed by @luixxiul.
+ * Apply the same max-width to image tile on the thread timeline as message bubble ([\#8669](https://github.com/matrix-org/matrix-react-sdk/pull/8669)). Fixes #22313. Contributed by @luixxiul.
+ * Fix dropdown button size for picture-in-picture CallView ([\#8680](https://github.com/matrix-org/matrix-react-sdk/pull/8680)). Fixes #22316. Contributed by @luixxiul.
+ * Live location sharing - fix square border for image-less avatar (PSF-1052) ([\#8679](https://github.com/matrix-org/matrix-react-sdk/pull/8679)). Contributed by @kerryarchibald.
+ * Stop connecting to a video room if the widget messaging disappears ([\#8660](https://github.com/matrix-org/matrix-react-sdk/pull/8660)).
+ * Fix file button and audio player overflowing from message bubble ([\#8666](https://github.com/matrix-org/matrix-react-sdk/pull/8666)). Fixes #22308. Contributed by @luixxiul.
+ * Don't show broken composer format bar when selection is whitespace ([\#8673](https://github.com/matrix-org/matrix-react-sdk/pull/8673)). Fixes #10788.
+ * Fix media upload http 413 handling ([\#8674](https://github.com/matrix-org/matrix-react-sdk/pull/8674)).
+ * Fix emoji picker for editing thread responses ([\#8671](https://github.com/matrix-org/matrix-react-sdk/pull/8671)). Fixes matrix-org/element-web-rageshakes#13129.
+ * Map attribution while sharing live location is now visible ([\#8621](https://github.com/matrix-org/matrix-react-sdk/pull/8621)). Fixes #22236. Contributed by @weeman1337.
+ * Fix info tile overlapping the time stamp on TimelineCard ([\#8639](https://github.com/matrix-org/matrix-react-sdk/pull/8639)). Fixes #22256. Contributed by @luixxiul.
+ * Fix position of wide images on IRC / modern layout ([\#8667](https://github.com/matrix-org/matrix-react-sdk/pull/8667)). Fixes #22309. Contributed by @luixxiul.
+ * Fix other user's displayName being wrapped on the bubble message layout ([\#8456](https://github.com/matrix-org/matrix-react-sdk/pull/8456)). Fixes #22004. Contributed by @luixxiul.
+ * Set spacing declarations to elements in mx_EventTile_mediaLine ([\#8665](https://github.com/matrix-org/matrix-react-sdk/pull/8665)). Fixes #22307. Contributed by @luixxiul.
+ * Fix wide image overflowing from the thumbnail container ([\#8663](https://github.com/matrix-org/matrix-react-sdk/pull/8663)). Fixes #22303. Contributed by @luixxiul.
+ * Fix styles of "Show all" link button on ReactionsRow ([\#8658](https://github.com/matrix-org/matrix-react-sdk/pull/8658)). Fixes #22300. Contributed by @luixxiul.
+ * Automatically log in after registration ([\#8654](https://github.com/matrix-org/matrix-react-sdk/pull/8654)). Fixes #19305. Contributed by @justjanne.
+ * Fix offline status in window title not working reliably ([\#8656](https://github.com/matrix-org/matrix-react-sdk/pull/8656)).
+ * Align input area with event body's first letter in a thread on IRC/modern layout ([\#8636](https://github.com/matrix-org/matrix-react-sdk/pull/8636)). Fixes #22252. Contributed by @luixxiul.
+ * Fix crash on null idp for SSO buttons ([\#8650](https://github.com/matrix-org/matrix-react-sdk/pull/8650)). Contributed by @hughns.
+ * Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\#8648](https://github.com/matrix-org/matrix-react-sdk/pull/8648)). Fixes #22279.
+ * Show notifications even when Element is focused ([\#8590](https://github.com/matrix-org/matrix-react-sdk/pull/8590)). Contributed by @sumnerevans.
+ * Remove padding from the buttons on edit message composer of a event tile on a thread ([\#8632](https://github.com/matrix-org/matrix-react-sdk/pull/8632)). Contributed by @luixxiul.
+ * ensure metaspace changes correctly notify listeners ([\#8611](https://github.com/matrix-org/matrix-react-sdk/pull/8611)). Fixes #21006. Contributed by @justjanne.
+ * Hide image banner on stickers, they have a tooltip already ([\#8641](https://github.com/matrix-org/matrix-react-sdk/pull/8641)). Fixes #22244.
+ * Adjust EditMessageComposer style declarations ([\#8631](https://github.com/matrix-org/matrix-react-sdk/pull/8631)). Fixes #22231. Contributed by @luixxiul.
+
 Changes in [1.10.13](https://github.com/vector-im/element-web/releases/tag/v1.10.13) (2022-05-24)
 =================================================================================================
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.10.13",
+  "version": "1.10.14",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -58,8 +58,8 @@
     "gfm.css": "^1.1.2",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "18.0.0",
-    "matrix-react-sdk": "3.45.0",
+    "matrix-js-sdk": "18.1.0",
+    "matrix-react-sdk": "3.46.0",
     "matrix-widget-api": "^0.1.0-beta.18",
     "prop-types": "^15.7.2",
     "react": "17.0.2",
@@ -123,7 +123,7 @@
     "jest-sonar-reporter": "^2.0.0",
     "json-loader": "^0.5.7",
     "loader-utils": "^1.4.0",
-    "matrix-mock-request": "^1.2.3",
+    "matrix-mock-request": "^2.0.0",
     "matrix-react-test-utils": "^0.2.3",
     "matrix-web-i18n": "^1.2.0",
     "mini-css-extract-plugin": "^0.12.0",

diff --git a/release.sh b/release.sh
@@ -43,7 +43,7 @@ do
     fi
 done
 
-./node_modules/matrix-js-sdk/release.sh -n -z "$orig_args"
+./node_modules/matrix-js-sdk/release.sh -n "$orig_args"
 
 release="${1#v}"
 tag="v${release}"

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
@@ -35,6 +35,7 @@ const INCLUDE_LANGS = [
     {'value': 'ja', 'label': '日本語'},
     {'value': 'kab', 'label': 'Taqbaylit'},
     {'value': 'ko', 'label': '한국어'},
+    {'value': 'lo', 'label': 'ລາວ'},
     {'value': 'lt', 'label': 'Lietuvių'},
     {'value': 'lv', 'label': 'Latviešu'},
     {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},

diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts
@@ -156,6 +156,15 @@ const ack = (ev: CustomEvent<IWidgetApiRequest>) => widgetApi.transport.reply(ev
                     ack(ev);
                 },
             );
+            widgetApi.on(`action:${ElementWidgetActions.ForceHangupCall}`,
+                (ev: CustomEvent<IWidgetApiRequest>) => {
+                    meetApi?.dispose();
+                    notifyHangup();
+                    meetApi = null;
+                    closeConference();
+                    ack(ev);
+                },
+            );
             widgetApi.on(`action:${ElementWidgetActions.MuteAudio}`,
                 async (ev: CustomEvent<IWidgetApiRequest>) => {
                     ack(ev);
@@ -291,12 +300,12 @@ function createJWTToken() {
     );
 }
 
-async function notifyHangup() {
+async function notifyHangup(errorMessage?: string) {
     if (widgetApi) {
         // We send the hangup event before setAlwaysOnScreen, because the latter
         // can cause the receiving side to instantly stop listening.
         try {
-            await widgetApi.transport.send(ElementWidgetActions.HangupCall, {});
+            await widgetApi.transport.send(ElementWidgetActions.HangupCall, { errorMessage });
         } finally {
             await widgetApi.setAlwaysOnScreen(false);
         }
@@ -357,6 +366,12 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
             startAudioOnly,
             startWithAudioMuted: audioDevice == null,
             startWithVideoMuted: videoDevice == null,
+            // Request some log levels for inclusion in rageshakes
+            // Ideally we would capture all possible log levels, but this can
+            // cause Jitsi Meet to try to post various circular data structures
+            // back over the iframe API, and therefore end up crashing
+            // https://github.com/jitsi/jitsi-meet/issues/11585
+            apiLogLevels: ["warn", "error"],
         } as any,
         jwt: jwt,
     };
@@ -403,15 +418,15 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
         if (error.isFatal) {
             // We got disconnected. Since Jitsi Meet might send us back to the
             // prejoin screen, we're forced to act as if we hung up entirely.
-            notifyHangup();
+            notifyHangup(error.message);
             meetApi = null;
             closeConference();
         }
     });
 
     meetApi.on("audioMuteStatusChanged", ({ muted }) => {
         const action = muted ? ElementWidgetActions.MuteAudio : ElementWidgetActions.UnmuteAudio;
-        widgetApi.transport.send(action, {});
+        widgetApi?.transport.send(action, {});
     });
 
     meetApi.on("videoMuteStatusChanged", ({ muted }) => {
@@ -421,10 +436,10 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
             // otherwise the React SDK will mistakenly think the user turned off
             // their video by hand
             setTimeout(() => {
-                if (meetApi) widgetApi.transport.send(ElementWidgetActions.MuteVideo, {});
+                if (meetApi) widgetApi?.transport.send(ElementWidgetActions.MuteVideo, {});
             }, 200);
         } else {
-            widgetApi.transport.send(ElementWidgetActions.UnmuteVideo, {});
+            widgetApi?.transport.send(ElementWidgetActions.UnmuteVideo, {});
         }
     });
 
@@ -435,4 +450,9 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
             });
         });
     });
+
+    // Patch logs into rageshakes
+    meetApi.on("log", ({ logLevel, args }) =>
+        (parent as unknown as typeof global).mx_rage_logger?.log(logLevel, ...args),
+    );
 }
diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
@@ -414,6 +414,18 @@ export default class ElectronPlatform extends VectorBasePlatform {
         return this.ipcCall('setMinimizeToTrayEnabled', enabled);
     }
 
+    public supportsTogglingHardwareAcceleration(): boolean {
+        return true;
+    }
+
+    public async getHardwareAccelerationEnabled(): Promise<boolean> {
+        return this.ipcCall('getHardwareAccelerationEnabled');
+    }
+
+    public async setHardwareAccelerationEnabled(enabled: boolean): Promise<void> {
+        return this.ipcCall('setHardwareAccelerationEnabled', enabled);
+    }
+
     async canSelfUpdate(): Promise<boolean> {
         const feedUrl = await this.ipcCall('getUpdateFeedUrl');
         return Boolean(feedUrl);