Skip to content

Commit

Permalink
Merge tag 'v1.11.10' into upgrade/element-web-v1.11.10
Browse files Browse the repository at this point in the history
* Use correct default for notification silencing ([\#9388](matrix-org/matrix-react-sdk#9388)). Fixes element-hq/element-web#23456.
  • Loading branch information
estellecomment committed Oct 21, 2022
2 parents bc9c2c3 + bd5d22d commit c5e8906
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
14 changes: 9 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
Changes in [1.11.9-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.11.9-rc.2) (2022-10-05)
=========================================================================================================
Changes in [1.11.10](https://github.com/vector-im/element-web/releases/tag/v1.11.10) (2022-10-11)
=================================================================================================

## 🐛 Bug Fixes
* Use the correct sender key when checking shared secret ([\#2730](https://github.com/matrix-org/matrix-js-sdk/pull/2730)). Fixes vector-im/element-web#23374.
* Use correct default for notification silencing ([\#9388](https://github.com/matrix-org/matrix-react-sdk/pull/9388)). Fixes vector-im/element-web#23456.

Changes in [1.11.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.9-rc.1) (2022-10-04)
=========================================================================================================
Changes in [1.11.9](https://github.com/vector-im/element-web/releases/tag/v1.11.9) (2022-10-11)
===============================================================================================

## Deprecations
* Legacy Piwik config.json option `piwik.policy_url` is deprecated in favour of `privacy_policy_url`. Support will be removed in the next release.

## ✨ Features
* Device manager - select all devices ([\#9330](https://github.com/matrix-org/matrix-react-sdk/pull/9330)). Contributed by @kerryarchibald.
Expand All @@ -22,6 +25,7 @@ Changes in [1.11.9-rc.1](https://github.com/vector-im/element-web/releases/tag/v
* Read receipts for threads ([\#9239](https://github.com/matrix-org/matrix-react-sdk/pull/9239)). Fixes #23191.

## 🐛 Bug Fixes
* Use the correct sender key when checking shared secret ([\#2730](https://github.com/matrix-org/matrix-js-sdk/pull/2730)). Fixes vector-im/element-web#23374.
* Fix device selection in pre-join screen for Element Call video rooms ([\#9321](https://github.com/matrix-org/matrix-react-sdk/pull/9321)). Fixes #23331.
* Don't render a 1px high room topic if the room topic is empty ([\#9317](https://github.com/matrix-org/matrix-react-sdk/pull/9317)). Contributed by @Arnei.
* Don't show feedback prompts when that UIFeature is disabled ([\#9305](https://github.com/matrix-org/matrix-react-sdk/pull/9305)). Fixes #23327.
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "element-web",
"productName": "Tchap",
"version": "4.0.5_1.11.9-rc.2",
"version": "4.0.5_1.11.10",
"description": "A feature-rich client for Matrix.org",
"author": "DINUM",
"repository": {
Expand Down Expand Up @@ -70,8 +70,8 @@
"gfm.css": "^1.1.2",
"jsrsasign": "^10.5.25",
"katex": "^0.16.0",
"matrix-js-sdk": "20.1.0-rc.2",
"matrix-react-sdk": "3.58.0-rc.2",
"matrix-js-sdk": "20.1.0",
"matrix-react-sdk": "3.58.1",
"matrix-widget-api": "^1.1.1",
"prop-types": "^15.7.2",
"react": "17.0.2",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8913,10 +8913,10 @@ matrix-events-sdk@^0.0.1-beta.7:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==

matrix-js-sdk@20.1.0-rc.2:
version "20.1.0-rc.2"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-20.1.0-rc.2.tgz#f20ca324c68406734f7c80c41576f3c16cd4245b"
integrity sha512-X8/JBbw6ulmVcUQ9xwWkH7FR9O5YE54jADCkOhNShwvceCXFHRbXUL2eG/LeNQG+JPp2HgAnwCltDnwOc3ZwGA==
matrix-js-sdk@20.1.0:
version "20.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-20.1.0.tgz#d235c9125a79901e7e0eb667178bbbdb26710266"
integrity sha512-AjuWVmerJ8aEAIgD6QfmSIg0RrvA8vzvOV+ycvSGg4DgiFlVZbFvBxkVZTRdZ5icJe1/XMaCEf5OZ9Ha2hXUUg==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
Expand All @@ -8937,10 +8937,10 @@ matrix-mock-request@^2.0.0:
dependencies:
expect "^28.1.0"

matrix-react-sdk@3.58.0-rc.2:
version "3.58.0-rc.2"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.58.0-rc.2.tgz#4f1f8c876282daef2624e12aaa04385c03443168"
integrity sha512-8PAxMw5OgItF+PgRz0OTC3nboSSJ4iUDoNlAF6vQ1ctMrfsbnQS5w7DygFMLK0okLgwH0u7LtTuLPs9qvCBIOQ==
matrix-react-sdk@3.58.1:
version "3.58.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.58.1.tgz#cf3f9bf6c2932d18c65fc1ea4a8752f78d774f4e"
integrity sha512-u0qPj3o4CbizYsXL3Y0sPm5h4PiZXRXwsCrSHwUvp+nrcIJHskzrAt6PZGsW/xtzQ74jdxnlbgJr4a+btGRfZQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.2.0"
Expand Down Expand Up @@ -8979,7 +8979,7 @@ matrix-react-sdk@3.58.0-rc.2:
maplibre-gl "^1.15.2"
matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "^0.0.1-beta.7"
matrix-js-sdk "20.1.0-rc.2"
matrix-js-sdk "20.1.0"
matrix-widget-api "^1.1.1"
minimist "^1.2.5"
opus-recorder "^8.0.3"
Expand Down

0 comments on commit c5e8906

Please sign in to comment.