Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 95b2f3e

Browse files
committed
Merge branch 'master' into develop
2 parents bdc4ca0 + 6df8423 commit 95b2f3e

File tree

3 files changed

+43
-6
lines changed

3 files changed

+43
-6
lines changed

CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
Changes in [3.106.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.106.0) (2024-08-13)
2+
=======================================================================================================
3+
## ✨ Features
4+
5+
* Invite dialog: display MXID on its own line ([#11756](https://github.com/matrix-org/matrix-react-sdk/pull/11756)). Contributed by @AndrewFerr.
6+
* Align RoomSummaryCard styles with Figma ([#12793](https://github.com/matrix-org/matrix-react-sdk/pull/12793)). Contributed by @t3chguy.
7+
* Extract Extensions into their own right panel tab ([#12844](https://github.com/matrix-org/matrix-react-sdk/pull/12844)). Contributed by @t3chguy.
8+
* Remove topic from new room header and expand right panel topic ([#12842](https://github.com/matrix-org/matrix-react-sdk/pull/12842)). Contributed by @t3chguy.
9+
* Rework how the onboarding notifications task works ([#12839](https://github.com/matrix-org/matrix-react-sdk/pull/12839)). Contributed by @t3chguy.
10+
* Update toast styles to match Figma ([#12833](https://github.com/matrix-org/matrix-react-sdk/pull/12833)). Contributed by @t3chguy.
11+
* Warn users on unsupported browsers before they lack features ([#12830](https://github.com/matrix-org/matrix-react-sdk/pull/12830)). Contributed by @t3chguy.
12+
* Add sign out button to settings profile section ([#12666](https://github.com/matrix-org/matrix-react-sdk/pull/12666)). Contributed by @dbkr.
13+
* Remove MatrixRTC realted import ES lint exceptions using a index.ts for matrixrtc ([#12780](https://github.com/matrix-org/matrix-react-sdk/pull/12780)). Contributed by @toger5.
14+
* Fix unwanted ringing of other devices even though the user is already connected to the call. ([#12742](https://github.com/matrix-org/matrix-react-sdk/pull/12742)). Contributed by @toger5.
15+
* Acknowledge `DeviceMute` widget actions ([#12790](https://github.com/matrix-org/matrix-react-sdk/pull/12790)). Contributed by @toger5.
16+
17+
## 🐛 Bug Fixes
18+
19+
* Fix formatting of rich text emotes ([#12862](https://github.com/matrix-org/matrix-react-sdk/pull/12862)). Contributed by @dbkr.
20+
* Fixed custom emotes background color #27745 ([#12798](https://github.com/matrix-org/matrix-react-sdk/pull/12798)). Contributed by @asimdelvi.
21+
* Ignore permalink\_prefix when serializing pills ([#11726](https://github.com/matrix-org/matrix-react-sdk/pull/11726)). Contributed by @herkulessi.
22+
* Deflake the chat export test ([#12854](https://github.com/matrix-org/matrix-react-sdk/pull/12854)). Contributed by @dbkr.
23+
* Fix alignment of RTL messages ([#12837](https://github.com/matrix-org/matrix-react-sdk/pull/12837)). Contributed by @dbkr.
24+
* Handle media download errors better ([#12848](https://github.com/matrix-org/matrix-react-sdk/pull/12848)). Contributed by @t3chguy.
25+
* Make micIcon display on primary ([#11908](https://github.com/matrix-org/matrix-react-sdk/pull/11908)). Contributed by @kdanielm.
26+
* Fix compound typography font component issues ([#12826](https://github.com/matrix-org/matrix-react-sdk/pull/12826)). Contributed by @t3chguy.
27+
* Allow Chrome page translator to translate messages in rooms ([#11113](https://github.com/matrix-org/matrix-react-sdk/pull/11113)). Contributed by @lukaszpolowczyk.
28+
29+
130
Changes in [3.105.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.105.1) (2024-08-06)
231
=======================================================================================================
332
Fixes for CVE-2024-42347 / GHSA-f83w-wqhc-cfp4

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.105.1",
3+
"version": "3.106.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -26,7 +26,7 @@
2626
"engines": {
2727
"node": ">=20.0.0"
2828
},
29-
"main": "./src/index.ts",
29+
"main": "./lib/index.ts",
3030
"matrix_src_main": "./src/index.ts",
3131
"matrix_lib_main": "./lib/index.ts",
3232
"matrix_lib_typings": "./lib/index.d.ts",
@@ -250,5 +250,6 @@
250250
"outputDirectory": "coverage",
251251
"outputName": "jest-sonar-report.xml",
252252
"relativePaths": true
253-
}
253+
},
254+
"typings": "./lib/index.d.ts"
254255
}

yarn.lock

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,6 +1857,11 @@
18571857
dependencies:
18581858
eslint-plugin-unicorn "^54.0.0"
18591859

1860+
"@matrix-org/olm@3.2.15":
1861+
version "3.2.15"
1862+
resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec"
1863+
integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q==
1864+
18601865
"@matrix-org/react-sdk-module-api@^2.4.0":
18611866
version "2.4.0"
18621867
resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.4.0.tgz#5e4552acbe728141f42c1d54d75dcb4efea9301c"
@@ -6908,12 +6913,14 @@ matrix-events-sdk@0.0.1:
69086913
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
69096914
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
69106915

6911-
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
6912-
version "34.2.0"
6913-
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b8e40ad2a8c26b0cb96def2f95fe16b088530e77"
6916+
matrix-js-sdk@34.3.0:
6917+
version "34.3.0"
6918+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.3.0.tgz#9ce3f6c6bb8b1931eec3f9984f4387fef8768001"
6919+
integrity sha512-vd5j8VUkEmwqGdg7istFsA/ugAaf+cmw2FkgKfefxkEWK4Qx7HZprFnOJK+A6cSqCnBjha4CvHNS4p0D8vmDHw==
69146920
dependencies:
69156921
"@babel/runtime" "^7.12.5"
69166922
"@matrix-org/matrix-sdk-crypto-wasm" "^7.0.0"
6923+
"@matrix-org/olm" "3.2.15"
69176924
another-json "^0.2.0"
69186925
bs58 "^6.0.0"
69196926
content-type "^1.0.4"

0 commit comments

Comments
 (0)