Merge tag 'v1.10.8' into sc

* Live location sharing: live share warning in room ([\element-hq#8100](matrix-org/matrix-react-sdk#8100)). * Add simple live share warning ([\element-hq#8066](matrix-org/matrix-react-sdk#8066)). * extract reusable styled live beacon icon ([\element-hq#8103](matrix-org/matrix-react-sdk#8103)). * Don't restore MemberInfo from RightPanel history when viewing a room ([\element-hq#8090](matrix-org/matrix-react-sdk#8090)). Fixes element-hq#21487. * Allow sending files as replies as per MSC3676 ([\element-hq#8020](matrix-org/matrix-react-sdk#8020)). Fixes element-hq#7156. * kill beacons on expiry ([\element-hq#8075](matrix-org/matrix-react-sdk#8075)). * enable geolocation behaviour in location picker for live share type ([\element-hq#8068](matrix-org/matrix-react-sdk#8068)). * Improve formatting features in the editor ([\#7104](matrix-org/matrix-react-sdk#7104)). Fixes element-hq#19501. Contributed by @alexanderstephan. * Support MSC3026 busy presence ([\element-hq#8043](matrix-org/matrix-react-sdk#8043)). * Show displayname in non-narrow thread summeries ([\element-hq#8036](matrix-org/matrix-react-sdk#8036)). Fixes element-hq#19646. * Tweak search dialog based on new designs ([\element-hq#7980](matrix-org/matrix-react-sdk#7980)). Fixes element-hq#21285 and element-hq#21289. * fallback to event text in location body when map unavailable ([\element-hq#7982](matrix-org/matrix-react-sdk#7982)). Fixes element-hq#20655. * Send pin drop location share events ([\#7967](matrix-org/matrix-react-sdk#7967)). * fix quicktime video thumbnailing ([\element-hq#8108](matrix-org/matrix-react-sdk#8108)). Fixes element-hq#21505. * Fix scroll behaviour in space panel ([\element-hq#8111](matrix-org/matrix-react-sdk#8111)). Fixes element-hq#21467. * Fix emoting with emoji or pills ([\element-hq#8105](matrix-org/matrix-react-sdk#8105)). Fixes element-hq#21497. * Remove padding of InviteDialog & fix visual regression ([\element-hq#8076](matrix-org/matrix-react-sdk#8076)). Fixes element-hq#20631. Contributed by @luixxiul. * Fixes mx_MLocationBody_markerBorder ([\element-hq#8069](matrix-org/matrix-react-sdk#8069)). Fixes element-hq#21444. Contributed by @luixxiul. * Make margin and padding of mx_InviteDialog_other consistent ([\#8063](matrix-org/matrix-react-sdk#8063)). Fixes element-hq#20631. Contributed by @luixxiul. * Fix freeze/crash when 1:1 calling ([\element-hq#8057](matrix-org/matrix-react-sdk#8057)). Fixes element-hq#21181. * Don't assume that widget IDs are unique ([\#8052](matrix-org/matrix-react-sdk#8052)). Fixes element-hq#21399. * Fix the header of Space landing page ([\element-hq#8048](matrix-org/matrix-react-sdk#8048)). Fixes element-hq#21402. Contributed by @luixxiul. * Fix buttons alignment of Space list header ([\element-hq#8047](matrix-org/matrix-react-sdk#8047)). Fixes element-hq#21401. Contributed by @luixxiul. * Fix null-guarding regression around reply_to_event dispatch ([\element-hq#8039](matrix-org/matrix-react-sdk#8039)). * Fix clicking on copy link to thread wrongly opening thread ([\element-hq#8038](matrix-org/matrix-react-sdk#8038)). Fixes element-hq#20653. * Fix regression around replying to search results ([\element-hq#8035](matrix-org/matrix-react-sdk#8035)). Fixes element-hq#21389. * Share shared history keys in the background ([\element-hq#8031](matrix-org/matrix-react-sdk#8031)). Fixes element-hq#21192. * Paginate responses to pinned polls ([\element-hq#8025](matrix-org/matrix-react-sdk#8025)). Fixes element-hq#21382. * Fix incorrect usage of unstable variant of `is_falling_back` ([\element-hq#8016](matrix-org/matrix-react-sdk#8016)). * Fix issues with ThreadSummary in msc-enabled mode ([\element-hq#8018](matrix-org/matrix-react-sdk#8018)). Fixes matrix-org/element-web-rageshakes#11401 and matrix-org/element-web-rageshakes#11400. * Fix alignment of polls within threads ([\element-hq#8017](matrix-org/matrix-react-sdk#8017)). Fixes element-hq#21235. * Fix issues with thread summaries being wrong or stale ([\element-hq#8015](matrix-org/matrix-react-sdk#8015)). Fixes element-hq#21363 and element-hq#21204. * Fix button border color of LeaveSpaceDialog ([\element-hq#8010](matrix-org/matrix-react-sdk#8010)). Fixes element-hq#21365. Contributed by @luixxiul. * Fix room list scroll jumps ([\element-hq#7991](matrix-org/matrix-react-sdk#7991)). Fixes element-hq#19322. * Fix a variety of issues with HTML → Markdown conversion ([\element-hq#8004](matrix-org/matrix-react-sdk#8004)). Fixes element-hq#10648, element-hq#20718, element-hq#10722, element-hq#10389, element-hq#17610 element-hq#9984 and element-hq#20140. * Wrap EventTile rather than its children in an error boundary ([\element-hq#7945](matrix-org/matrix-react-sdk#7945)). * Normalized shortcut formatting for quote expansion control ([\element-hq#7995](matrix-org/matrix-react-sdk#7995)). Fixes element-hq#19685. Contributed by @Sinharitik589. * Fix buttons and text layout on Security Key dialog ([\element-hq#7996](matrix-org/matrix-react-sdk#7996)). Fixes element-hq#21330. Contributed by @luixxiul. * Fix formatting not being applied after links ([\element-hq#7990](matrix-org/matrix-react-sdk#7990)). Fixes element-hq#20091.
SchildiChat · Apr 1, 2022 · 2c28fa8 · 2c28fa8
2 parents a73f1c5 + d34b628
commit 2c28fa8
Show file tree

Hide file tree

Showing 27 changed files with 700 additions and 348 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -12,6 +12,11 @@ module.exports = {
         // Things we do that break the ideal style
         "quotes": "off",
     },
+    settings: {
+        react: {
+            version: 'detect'
+        }
+    },
     overrides: [{
         files: ["src/**/*.{ts,tsx}"],
         extends: [

diff --git a/.github/ISSUE_TEMPLATE/config.ylm → .github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.ylm → .github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report a security vulnerability
-    url: https://github.com/vector-im/element-web/security/policy
-    about: Please review our security policy for more details
   - name: Questions & support
     url: https://matrix.to/#/#element-web:matrix.org
     about: Please ask and answer questions here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,49 @@
+Changes in [1.10.8-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.10.8-rc.1) (2022-03-22)
+=========================================================================================================
+
+## ✨ Features
+ * Live location sharing: live share warning in room ([\#8100](https://github.com/matrix-org/matrix-react-sdk/pull/8100)).
+ * Add simple live share warning ([\#8066](https://github.com/matrix-org/matrix-react-sdk/pull/8066)).
+ * extract reusable styled live beacon icon ([\#8103](https://github.com/matrix-org/matrix-react-sdk/pull/8103)).
+ * Don't restore MemberInfo from RightPanel history when viewing a room ([\#8090](https://github.com/matrix-org/matrix-react-sdk/pull/8090)). Fixes #21487.
+ * Allow sending files as replies as per MSC3676 ([\#8020](https://github.com/matrix-org/matrix-react-sdk/pull/8020)). Fixes #7156.
+ * kill beacons on expiry ([\#8075](https://github.com/matrix-org/matrix-react-sdk/pull/8075)).
+ * enable geolocation behaviour in location picker for live share type ([\#8068](https://github.com/matrix-org/matrix-react-sdk/pull/8068)).
+ * Improve formatting features in the editor ([\#7104](https://github.com/matrix-org/matrix-react-sdk/pull/7104)). Fixes #19501. Contributed by @alexanderstephan.
+ * Support MSC3026 busy presence ([\#8043](https://github.com/matrix-org/matrix-react-sdk/pull/8043)).
+ * Show displayname in non-narrow thread summeries ([\#8036](https://github.com/matrix-org/matrix-react-sdk/pull/8036)). Fixes #19646.
+ * Tweak search dialog based on new designs ([\#7980](https://github.com/matrix-org/matrix-react-sdk/pull/7980)). Fixes #21285 and #21289.
+ * fallback to event text in location body when map unavailable ([\#7982](https://github.com/matrix-org/matrix-react-sdk/pull/7982)). Fixes #20655.
+ * Send pin drop location share events ([\#7967](https://github.com/matrix-org/matrix-react-sdk/pull/7967)).
+
+## 🐛 Bug Fixes
+ * fix quicktime video thumbnailing ([\#8108](https://github.com/matrix-org/matrix-react-sdk/pull/8108)). Fixes #21505.
+ * Fix scroll behaviour in space panel ([\#8111](https://github.com/matrix-org/matrix-react-sdk/pull/8111)). Fixes #21467.
+ * Fix emoting with emoji or pills ([\#8105](https://github.com/matrix-org/matrix-react-sdk/pull/8105)). Fixes #21497.
+ * Remove padding of InviteDialog & fix visual regression ([\#8076](https://github.com/matrix-org/matrix-react-sdk/pull/8076)). Fixes #20631. Contributed by @luixxiul.
+ * Fixes mx_MLocationBody_markerBorder ([\#8069](https://github.com/matrix-org/matrix-react-sdk/pull/8069)). Fixes #21444. Contributed by @luixxiul.
+ * Make margin and padding of mx_InviteDialog_other consistent ([\#8063](https://github.com/matrix-org/matrix-react-sdk/pull/8063)). Fixes #20631. Contributed by @luixxiul.
+ * Fix freeze/crash when 1:1 calling ([\#8057](https://github.com/matrix-org/matrix-react-sdk/pull/8057)). Fixes #21181.
+ * Don't assume that widget IDs are unique ([\#8052](https://github.com/matrix-org/matrix-react-sdk/pull/8052)). Fixes #21399.
+ * Fix the header of Space landing page ([\#8048](https://github.com/matrix-org/matrix-react-sdk/pull/8048)). Fixes #21402. Contributed by @luixxiul.
+ * Fix buttons alignment of Space list header ([\#8047](https://github.com/matrix-org/matrix-react-sdk/pull/8047)). Fixes #21401. Contributed by @luixxiul.
+ * Fix null-guarding regression around reply_to_event dispatch ([\#8039](https://github.com/matrix-org/matrix-react-sdk/pull/8039)).
+ * Fix clicking on copy link to thread wrongly opening thread ([\#8038](https://github.com/matrix-org/matrix-react-sdk/pull/8038)). Fixes #20653.
+ * Fix regression around replying to search results ([\#8035](https://github.com/matrix-org/matrix-react-sdk/pull/8035)). Fixes #21389.
+ * Share shared history keys in the background ([\#8031](https://github.com/matrix-org/matrix-react-sdk/pull/8031)). Fixes #21192.
+ * Paginate responses to pinned polls ([\#8025](https://github.com/matrix-org/matrix-react-sdk/pull/8025)). Fixes #21382.
+ * Fix incorrect usage of unstable variant of `is_falling_back` ([\#8016](https://github.com/matrix-org/matrix-react-sdk/pull/8016)).
+ * Fix issues with ThreadSummary in msc-enabled mode ([\#8018](https://github.com/matrix-org/matrix-react-sdk/pull/8018)). Fixes matrix-org/element-web-rageshakes#11401 and matrix-org/element-web-rageshakes#11400.
+ * Fix alignment of polls within threads ([\#8017](https://github.com/matrix-org/matrix-react-sdk/pull/8017)). Fixes #21235.
+ * Fix issues with thread summaries being wrong or stale ([\#8015](https://github.com/matrix-org/matrix-react-sdk/pull/8015)). Fixes #21363 and #21204.
+ * Fix button border color of LeaveSpaceDialog ([\#8010](https://github.com/matrix-org/matrix-react-sdk/pull/8010)). Fixes #21365. Contributed by @luixxiul.
+ * Fix room list scroll jumps ([\#7991](https://github.com/matrix-org/matrix-react-sdk/pull/7991)). Fixes #19322.
+ * Fix a variety of issues with HTML → Markdown conversion ([\#8004](https://github.com/matrix-org/matrix-react-sdk/pull/8004)). Fixes #10648, #20718, #10722, #10389, #17610 #9984 and #20140.
+ * Wrap EventTile rather than its children in an error boundary ([\#7945](https://github.com/matrix-org/matrix-react-sdk/pull/7945)).
+ * Normalized shortcut formatting for quote expansion control ([\#7995](https://github.com/matrix-org/matrix-react-sdk/pull/7995)). Fixes #19685. Contributed by @Sinharitik589.
+ * Fix buttons and text layout on Security Key dialog ([\#7996](https://github.com/matrix-org/matrix-react-sdk/pull/7996)). Fixes #21330. Contributed by @luixxiul.
+ * Fix formatting not being applied after links ([\#7990](https://github.com/matrix-org/matrix-react-sdk/pull/7990)). Fixes #20091.
+
 Changes in [1.10.7](https://github.com/vector-im/element-web/releases/tag/v1.10.7) (2022-03-15)
 ===============================================================================================
 

diff --git a/README.md b/README.md
@@ -125,7 +125,7 @@ Ensure you have the latest LTS version of Node.js installed.
 Using `yarn` instead of `npm` is recommended. Please see the Yarn [install
 guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it already.
 
-1. Install or update `node.js` so that your `node` is at least v14.x.
+1. Install or update `node.js` so that your `node` is at least the current recommended LTS.
 1. Install `yarn` if not present already.
 1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`.
 1. Switch to the element-web directory: `cd element-web`.

diff --git a/config.sample.json b/config.sample.json
@@ -24,9 +24,10 @@
     ],
     "defaultCountryCode": "GB",
     "showLabsSettings": true,
+    "features": { },
     "default_federate": true,
     "default_theme": "light",
-    "roomDirectory": {
+    "room_directory": {
         "servers": [
             "matrix.org"
         ]
@@ -35,11 +36,11 @@
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
     },
-    "settingDefaults": {
+    "setting_defaults": {
         "breadcrumbs": true
     },
     "jitsi": {
-        "preferredDomain": "meet.jit.si"
+        "preferred_domain": "meet.jit.si"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }