Merge tag 'v1.9.3' into develop

* Convert the "Cryptography" settings panel to an HTML table to assist screen reader users. ([\element-hq#6968](matrix-org/matrix-react-sdk#6968)). Contributed by [andybalaam](https://github.com/andybalaam). * Swap order of private space creation and tweak copy ([\element-hq#6967](matrix-org/matrix-react-sdk#6967)). Fixes element-hq#18768 and element-hq#18768. * Add spacing to Room settings - Notifications subsection ([\#6962](matrix-org/matrix-react-sdk#6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema). * Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\element-hq#6955](matrix-org/matrix-react-sdk#6955)). Contributed by [andybalaam](https://github.com/andybalaam). * Fix space invite edge cases ([\element-hq#6884](matrix-org/matrix-react-sdk#6884)). Fixes element-hq#19010 element-hq#17345 and element-hq#19010. * Allow options to cascade kicks/bans throughout spaces ([\element-hq#6829](matrix-org/matrix-react-sdk#6829)). Fixes element-hq#18969 and element-hq#18969. * Make public space alias field mandatory again ([\element-hq#6921](matrix-org/matrix-react-sdk#6921)). Fixes element-hq#19003 and element-hq#19003. * Add progress bar to restricted room upgrade dialog ([\element-hq#6919](matrix-org/matrix-react-sdk#6919)). Fixes element-hq#19146 and element-hq#19146. * Add customisation point for visibility of invites and room creation ([\element-hq#6922](matrix-org/matrix-react-sdk#6922)). Fixes element-hq#19331 and element-hq#19331. * Inhibit `Unable to get validated threepid` error during UIA ([\element-hq#6928](matrix-org/matrix-react-sdk#6928)). Fixes element-hq#18883 and element-hq#18883. * Tweak room list skeleton UI height and behaviour ([\element-hq#6926](matrix-org/matrix-react-sdk#6926)). Fixes element-hq#18231 element-hq#16581 and element-hq#18231. * If public room creation fails, retry without publishing it ([\#6872](matrix-org/matrix-react-sdk#6872)). Fixes element-hq#19194 and element-hq#19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr). * Iterate invite your teammates to Space view ([\element-hq#6925](matrix-org/matrix-react-sdk#6925)). Fixes element-hq#18772 and element-hq#18772. * Make placeholder more grey when no input ([\element-hq#6840](matrix-org/matrix-react-sdk#6840)). Fixes element-hq#17243 and element-hq#17243. Contributed by [wlach](https://github.com/wlach). * Respect tombstones in locally known rooms for Space children ([\element-hq#6906](matrix-org/matrix-react-sdk#6906)). Fixes element-hq#19246 element-hq#19256 and element-hq#19246. * Improve emoji shortcodes generated from annotations ([\element-hq#6907](matrix-org/matrix-react-sdk#6907)). Fixes element-hq#19304 and element-hq#19304. * Hide kick & ban options in UserInfo when looking at own profile ([\element-hq#6911](matrix-org/matrix-react-sdk#6911)). Fixes element-hq#19066 and element-hq#19066. * Add progress bar to Community to Space migration tool ([\element-hq#6887](matrix-org/matrix-react-sdk#6887)). Fixes element-hq#19216 and element-hq#19216. * Fix leave space cancel button exploding ([\element-hq#6966](matrix-org/matrix-react-sdk#6966)). * Fix edge case behaviour of the space join spinner for guests ([\element-hq#6972](matrix-org/matrix-react-sdk#6972)). Fixes element-hq#19359 and element-hq#19359. * Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\element-hq#6965](matrix-org/matrix-react-sdk#6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner). * Fix text overflows button on Home page ([\#6898](matrix-org/matrix-react-sdk#6898)). Fixes element-hq#19180 and element-hq#19180. Contributed by [oliver-pham](https://github.com/oliver-pham). * Space Room View should react to join rule changes down /sync ([\#6945](matrix-org/matrix-react-sdk#6945)). Fixes element-hq#19390 and element-hq#19390. * Hide leave section button if user isn't in the room e.g peeking ([\element-hq#6920](matrix-org/matrix-react-sdk#6920)). Fixes element-hq#17410 and element-hq#17410. * Fix bug where room list would get stuck showing no rooms ([\element-hq#6939](matrix-org/matrix-react-sdk#6939)). Fixes element-hq#19373 and element-hq#19373. * Update room settings dialog title when room name changes ([\element-hq#6916](matrix-org/matrix-react-sdk#6916)). Fixes element-hq#17480 and element-hq#17480. Contributed by [psrpinto](https://github.com/psrpinto). * Fix editing losing emote-ness and rainbow-ness of messages ([\element-hq#6931](matrix-org/matrix-react-sdk#6931)). Fixes element-hq#19350 and element-hq#19350. * Remove semicolon from notifications panel ([\element-hq#6930](matrix-org/matrix-react-sdk#6930)). Contributed by [robintown](https://github.com/robintown). * Prevent profile image in left panel's backdrop from being selected ([\element-hq#6924](matrix-org/matrix-react-sdk#6924)). Contributed by [rom4nik](https://github.com/rom4nik). * Validate that the phone number verification field is filled before allowing user to submit ([\element-hq#6918](matrix-org/matrix-react-sdk#6918)). Fixes element-hq#19316 and element-hq#19316. Contributed by [VFermat](https://github.com/VFermat). * Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\element-hq#6917](matrix-org/matrix-react-sdk#6917)). Contributed by [LoganArnett](https://github.com/LoganArnett). * Use FocusLock around ContextMenus to simplify focus management ([\element-hq#6311](matrix-org/matrix-react-sdk#6311)). Fixes element-hq#19259 and element-hq#19259. * Fix space hierarchy pagination ([\element-hq#6908](matrix-org/matrix-react-sdk#6908)). Fixes element-hq#19276 and element-hq#19276. * Fix spaces keyboard shortcuts not working for last space ([\element-hq#6909](matrix-org/matrix-react-sdk#6909)). Fixes element-hq#19255 and element-hq#19255. * Use fallback avatar only for DMs with 2 people. ([\element-hq#6895](matrix-org/matrix-react-sdk#6895)). Fixes element-hq#18747 and element-hq#18747. Contributed by [andybalaam](https://github.com/andybalaam).
williamkray · Oct 25, 2021 · fc62e0a · fc62e0a
2 parents 6e8c8fc + e794234
commit fc62e0a
Show file tree

Hide file tree

Showing 20 changed files with 670 additions and 505 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-desktop.yml b/.github/ISSUE_TEMPLATE/bug-desktop.yml
@@ -23,12 +23,12 @@ body:
   - type: textarea
     id: result
     attributes:
-      label: What happened?
+      label: Outcome
       placeholder: Tell us what went wrong
       value: |
-        ### What did you expect?
+        #### What did you expect?
 
-        ### What happened?
+        #### What happened instead?
     validations:
       required: true
   - type: input
@@ -65,9 +65,9 @@ body:
   - type: dropdown
     id: rageshake
     attributes:
-      label: Have you submitted a rageshake?
+      label: Will you send logs?
       description:  |
-        Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type /rageshake into the message entry area followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers.
+        Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
       options:
         - 'Yes'
         - 'No'

diff --git a/.github/ISSUE_TEMPLATE/bug-web.yml b/.github/ISSUE_TEMPLATE/bug-web.yml
@@ -23,12 +23,12 @@ body:
   - type: textarea
     id: result
     attributes:
-      label: What happened?
+      label: Outcome
       placeholder: Tell us what went wrong
       value: |
-        ### What did you expect?
+        #### What did you expect?
 
-        ### What happened?
+        #### What happened instead?
     validations:
       required: true
   - type: input
@@ -65,9 +65,9 @@ body:
   - type: dropdown
     id: rageshake
     attributes:
-      label: Have you submitted a rageshake?
+      label: Will you send logs?
       description:  |
-        Did you know that you can send a /rageshake command from the web applicaiton to submit logs for this issue? Trigger the defect, then type /rageshake into the message entry area followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers.
+        Did you know that you can send a /rageshake command from the web application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
       options:
         - 'Yes'
         - 'No'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,106 @@
+Changes in [1.9.3](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3) (2021-10-25)
+=================================================================================================
+
+## ✨ Features
+ * Convert the "Cryptography" settings panel to an HTML table to assist screen reader users. ([\#6968](https://github.com/matrix-org/matrix-react-sdk/pull/6968)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Swap order of private space creation and tweak copy ([\#6967](https://github.com/matrix-org/matrix-react-sdk/pull/6967)). Fixes #18768 and #18768.
+ * Add spacing to Room settings - Notifications subsection ([\#6962](https://github.com/matrix-org/matrix-react-sdk/pull/6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
+ * Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](https://github.com/matrix-org/matrix-react-sdk/pull/6955)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Fix space invite edge cases ([\#6884](https://github.com/matrix-org/matrix-react-sdk/pull/6884)). Fixes #19010 #17345 and #19010.
+ * Allow options to cascade kicks/bans throughout spaces ([\#6829](https://github.com/matrix-org/matrix-react-sdk/pull/6829)). Fixes #18969 and #18969.
+ * Make public space alias field mandatory again ([\#6921](https://github.com/matrix-org/matrix-react-sdk/pull/6921)). Fixes #19003 and #19003.
+ * Add progress bar to restricted room upgrade dialog ([\#6919](https://github.com/matrix-org/matrix-react-sdk/pull/6919)). Fixes #19146 and #19146.
+ * Add customisation point for visibility of invites and room creation ([\#6922](https://github.com/matrix-org/matrix-react-sdk/pull/6922)). Fixes #19331 and #19331.
+ * Inhibit `Unable to get validated threepid` error during UIA ([\#6928](https://github.com/matrix-org/matrix-react-sdk/pull/6928)). Fixes #18883 and #18883.
+ * Tweak room list skeleton UI height and behaviour ([\#6926](https://github.com/matrix-org/matrix-react-sdk/pull/6926)). Fixes #18231 #16581 and #18231.
+ * If public room creation fails, retry without publishing it ([\#6872](https://github.com/matrix-org/matrix-react-sdk/pull/6872)). Fixes #19194 and #19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
+ * Iterate invite your teammates to Space view ([\#6925](https://github.com/matrix-org/matrix-react-sdk/pull/6925)). Fixes #18772 and #18772.
+ * Make placeholder more grey when no input ([\#6840](https://github.com/matrix-org/matrix-react-sdk/pull/6840)). Fixes #17243 and #17243. Contributed by [wlach](https://github.com/wlach).
+ * Respect tombstones in locally known rooms for Space children ([\#6906](https://github.com/matrix-org/matrix-react-sdk/pull/6906)). Fixes #19246 #19256 and #19246.
+ * Improve emoji shortcodes generated from annotations ([\#6907](https://github.com/matrix-org/matrix-react-sdk/pull/6907)). Fixes #19304 and #19304.
+ * Hide kick & ban options in UserInfo when looking at own profile ([\#6911](https://github.com/matrix-org/matrix-react-sdk/pull/6911)). Fixes #19066 and #19066.
+ * Add progress bar to Community to Space migration tool ([\#6887](https://github.com/matrix-org/matrix-react-sdk/pull/6887)). Fixes #19216 and #19216.
+
+## 🐛 Bug Fixes
+ * Fix leave space cancel button exploding ([\#6966](https://github.com/matrix-org/matrix-react-sdk/pull/6966)).
+ * Fix edge case behaviour of the space join spinner for guests ([\#6972](https://github.com/matrix-org/matrix-react-sdk/pull/6972)). Fixes #19359 and #19359.
+ * Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](https://github.com/matrix-org/matrix-react-sdk/pull/6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix text overflows button on Home page ([\#6898](https://github.com/matrix-org/matrix-react-sdk/pull/6898)). Fixes #19180 and #19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
+ * Space Room View should react to join rule changes down /sync ([\#6945](https://github.com/matrix-org/matrix-react-sdk/pull/6945)). Fixes #19390 and #19390.
+ * Hide leave section button if user isn't in the room e.g peeking ([\#6920](https://github.com/matrix-org/matrix-react-sdk/pull/6920)). Fixes #17410 and #17410.
+ * Fix bug where room list would get stuck showing no rooms ([\#6939](https://github.com/matrix-org/matrix-react-sdk/pull/6939)). Fixes #19373 and #19373.
+ * Update room settings dialog title when room name changes ([\#6916](https://github.com/matrix-org/matrix-react-sdk/pull/6916)). Fixes #17480 and #17480. Contributed by [psrpinto](https://github.com/psrpinto).
+ * Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](https://github.com/matrix-org/matrix-react-sdk/pull/6931)). Fixes #19350 and #19350.
+ * Remove semicolon from notifications panel ([\#6930](https://github.com/matrix-org/matrix-react-sdk/pull/6930)). Contributed by [robintown](https://github.com/robintown).
+ * Prevent profile image in left panel's backdrop from being selected ([\#6924](https://github.com/matrix-org/matrix-react-sdk/pull/6924)). Contributed by [rom4nik](https://github.com/rom4nik).
+ * Validate that the phone number verification field is filled before allowing user to submit ([\#6918](https://github.com/matrix-org/matrix-react-sdk/pull/6918)). Fixes #19316 and #19316. Contributed by [VFermat](https://github.com/VFermat).
+ * Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](https://github.com/matrix-org/matrix-react-sdk/pull/6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
+ * Use FocusLock around ContextMenus to simplify focus management ([\#6311](https://github.com/matrix-org/matrix-react-sdk/pull/6311)). Fixes #19259 and #19259.
+ * Fix space hierarchy pagination ([\#6908](https://github.com/matrix-org/matrix-react-sdk/pull/6908)). Fixes #19276 and #19276.
+ * Fix spaces keyboard shortcuts not working for last space ([\#6909](https://github.com/matrix-org/matrix-react-sdk/pull/6909)). Fixes #19255 and #19255.
+ * Use fallback avatar only for DMs with 2 people. ([\#6895](https://github.com/matrix-org/matrix-react-sdk/pull/6895)). Fixes #18747 and #18747. Contributed by [andybalaam](https://github.com/andybalaam).
+
+Changes in [1.9.3-rc.3](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3-rc.3) (2021-10-25)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * Remove highlightjs CSS ([\#19483](https://github.com/vector-im/element-web/pull/19483)). Fixes vector-im/element-web#19476
+
+
+Changes in [1.9.3-rc.2](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3-rc.2) (2021-10-20)
+===========================================================================================================
+
+## 🐛 Bug Fixes
+ * Fix conflicting CSS on syntax highlighted blocks ([\#6991](https://github.com/matrix-org/matrix-react-sdk/pull/6991)). Fixes vector-im/element-web#19445
+
+Changes in [1.9.3-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3-rc.1) (2021-10-19)
+===========================================================================================================
+
+## ✨ Features
+ * Swap order of private space creation and tweak copy ([\#6967](https://github.com/matrix-org/matrix-react-sdk/pull/6967)). Fixes #18768 and #18768.
+ * Add spacing to Room settings - Notifications subsection ([\#6962](https://github.com/matrix-org/matrix-react-sdk/pull/6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
+ * Convert the "Cryptography" settings panel to an HTML to assist screen reader users. ([\#6968](https://github.com/matrix-org/matrix-react-sdk/pull/6968)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](https://github.com/matrix-org/matrix-react-sdk/pull/6955)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Fix space invite edge cases ([\#6884](https://github.com/matrix-org/matrix-react-sdk/pull/6884)). Fixes #19010 #17345 and #19010.
+ * Allow options to cascade kicks/bans throughout spaces ([\#6829](https://github.com/matrix-org/matrix-react-sdk/pull/6829)). Fixes #18969 and #18969.
+ * Make public space alias field mandatory again ([\#6921](https://github.com/matrix-org/matrix-react-sdk/pull/6921)). Fixes #19003 and #19003.
+ * Add progress bar to restricted room upgrade dialog ([\#6919](https://github.com/matrix-org/matrix-react-sdk/pull/6919)). Fixes #19146 and #19146.
+ * Add customisation point for visibility of invites and room creation ([\#6922](https://github.com/matrix-org/matrix-react-sdk/pull/6922)). Fixes #19331 and #19331.
+ * Inhibit `Unable to get validated threepid` error during UIA ([\#6928](https://github.com/matrix-org/matrix-react-sdk/pull/6928)). Fixes #18883 and #18883.
+ * Tweak room list skeleton UI height and behaviour ([\#6926](https://github.com/matrix-org/matrix-react-sdk/pull/6926)). Fixes #18231 #16581 and #18231.
+ * If public room creation fails, retry without publishing it ([\#6872](https://github.com/matrix-org/matrix-react-sdk/pull/6872)). Fixes #19194 and #19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
+ * Iterate invite your teammates to Space view ([\#6925](https://github.com/matrix-org/matrix-react-sdk/pull/6925)). Fixes #18772 and #18772.
+ * Make placeholder more grey when no input ([\#6840](https://github.com/matrix-org/matrix-react-sdk/pull/6840)). Fixes #17243 and #17243. Contributed by [wlach](https://github.com/wlach).
+ * Respect tombstones in locally known rooms for Space children ([\#6906](https://github.com/matrix-org/matrix-react-sdk/pull/6906)). Fixes #19246 #19256 and #19246.
+ * Improve emoji shortcodes generated from annotations ([\#6907](https://github.com/matrix-org/matrix-react-sdk/pull/6907)). Fixes #19304 and #19304.
+ * Hide kick & ban options in UserInfo when looking at own profile ([\#6911](https://github.com/matrix-org/matrix-react-sdk/pull/6911)). Fixes #19066 and #19066.
+ * Add progress bar to Community to Space migration tool ([\#6887](https://github.com/matrix-org/matrix-react-sdk/pull/6887)). Fixes #19216 and #19216.
+
+## 🐛 Bug Fixes
+ * Fix leave space cancel button exploding ([\#6966](https://github.com/matrix-org/matrix-react-sdk/pull/6966)).
+ * Fix edge case behaviour of the space join spinner for guests ([\#6972](https://github.com/matrix-org/matrix-react-sdk/pull/6972)). Fixes #19359 and #19359.
+ * Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](https://github.com/matrix-org/matrix-react-sdk/pull/6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix text overflows button on Home page ([\#6898](https://github.com/matrix-org/matrix-react-sdk/pull/6898)). Fixes #19180 and #19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
+ * Space Room View should react to join rule changes down /sync ([\#6945](https://github.com/matrix-org/matrix-react-sdk/pull/6945)). Fixes #19390 and #19390.
+ * Hide leave section button if user isn't in the room e.g peeking ([\#6920](https://github.com/matrix-org/matrix-react-sdk/pull/6920)). Fixes #17410 and #17410.
+ * Fix bug where room list would get stuck showing no rooms ([\#6939](https://github.com/matrix-org/matrix-react-sdk/pull/6939)). Fixes #19373 and #19373.
+ * Update room settings dialog title when room name changes ([\#6916](https://github.com/matrix-org/matrix-react-sdk/pull/6916)). Fixes #17480 and #17480. Contributed by [psrpinto](https://github.com/psrpinto).
+ * Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](https://github.com/matrix-org/matrix-react-sdk/pull/6931)). Fixes #19350 and #19350.
+ * Remove semicolon from notifications panel ([\#6930](https://github.com/matrix-org/matrix-react-sdk/pull/6930)). Contributed by [robintown](https://github.com/robintown).
+ * Prevent profile image in left panel's backdrop from being selected ([\#6924](https://github.com/matrix-org/matrix-react-sdk/pull/6924)). Contributed by [rom4nik](https://github.com/rom4nik).
+ * Validate that the phone number verification field is filled before allowing user to submit ([\#6918](https://github.com/matrix-org/matrix-react-sdk/pull/6918)). Fixes #19316 and #19316. Contributed by [VFermat](https://github.com/VFermat).
+ * Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](https://github.com/matrix-org/matrix-react-sdk/pull/6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
+ * Use FocusLock around ContextMenus to simplify focus management ([\#6311](https://github.com/matrix-org/matrix-react-sdk/pull/6311)). Fixes #19259 and #19259.
+ * Fix space hierarchy pagination ([\#6908](https://github.com/matrix-org/matrix-react-sdk/pull/6908)). Fixes #19276 and #19276.
+ * Fix spaces keyboard shortcuts not working for last space ([\#6909](https://github.com/matrix-org/matrix-react-sdk/pull/6909)). Fixes #19255 and #19255.
+ * Use fallback avatar only for DMs with 2 people. ([\#6895](https://github.com/matrix-org/matrix-react-sdk/pull/6895)). Fixes #18747 and #18747. Contributed by [andybalaam](https://github.com/andybalaam).
+
+Changes in [1.9.2](https://github.com/vector-im/element-desktop/releases/tag/v1.9.2) (2021-10-12)
+=================================================================================================
+
+## 🐛 Bug Fixes
+ * Upgrade to matrix-js-sdk#14.0.1
+
 Changes in [1.9.1](https://github.com/vector-im/element-desktop/releases/tag/v1.9.1) (2021-10-11)
 =================================================================================================
 
@@ -30,7 +133,6 @@ Changes in [1.9.1-rc.2](https://github.com/vector-im/element-desktop/releases/ta
 ===========================================================================================================
 
 ## 🐛 Bug Fixes
- * [Release] Fix space hierarchy pagination ([\#6910](https://github.com/matrix-org/matrix-react-sdk/pull/6910)).
 
 Changes in [1.9.1-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.9.1-rc.1) (2021-10-04)
 ===========================================================================================================

diff --git a/docs/labs.md b/docs/labs.md
@@ -130,6 +130,15 @@ Enables sending hidden read receipts as per [MSC2285](https://github.com/matrix-
 
 Adds a "Message layout" section under `Settings -> Appearance`, where the user can select their preferred message layout (e.g. IRC or Modern). Additionally, adds a new "Message bubbles" layout.
 
-## Pseudonymous Analytics opt-in
+## Pseudonymous Analytics opt-in (`feature_pseudonymous_analytics_opt_in`)
 
 Opts in to collection of pseudonymous analytics data via Posthog. See https://github.com/matrix-org/matrix-react-sdk/pull/6495
+
+## Polls (`feature_polls`) [In Development]
+
+Polls are a way to gauge interest from your community about a certain topic with a simple voting mechanic
+within the message timeline. Note that this feature is currently under active development and therefore is
+entirely incomplete and may not work at all - it is not recommended for general use at this time.
+
+Bug reports, feature requests, etc are not currently accepted for this feature flag. A later stage of
+development will provide opportunities for feedback.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "element-web",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -58,11 +58,10 @@
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
     "browser-request": "^0.3.3",
     "gfm.css": "^1.1.2",
-    "highlight.js": "^10.5.0",
     "jsrsasign": "^10.2.0",
     "katex": "^0.12.0",
-    "matrix-js-sdk": "14.0.0",
-    "matrix-react-sdk": "3.32.0",
+    "matrix-js-sdk": "15.0.0",
+    "matrix-react-sdk": "3.33.0",
     "matrix-widget-api": "^0.1.0-beta.16",
     "prop-types": "^15.7.2",
     "react": "17.0.2",

diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
@@ -16,6 +16,7 @@ limitations under the License.
 
 import "matrix-react-sdk/src/@types/global"; // load matrix-react-sdk's type extensions first
 import type { Renderer } from "react-dom";
+import type { logger } from "matrix-js-sdk/src/logger";
 
 type ElectronChannel =
     "app_onAction" |
@@ -36,6 +37,7 @@ type ElectronChannel =
 declare global {
     interface Window {
         mxSendRageshake: (text: string, withLogs?: boolean) => void;
+        matrixLogger: typeof logger;
         matrixChat: ReturnType<Renderer>;
 
         // electron-only