Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2021-06-21 17:05:14 +01:00
commit 905273c90c
3 changed files with 34 additions and 10 deletions

View File

@ -1,3 +1,25 @@
Changes in [1.7.31](https://github.com/vector-im/element-web/releases/tag/v1.7.31) (2021-06-21)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.31-rc.1...v1.7.31)
* Upgrade to React SDK 3.24.0 and JS SDK 12.0.0
Changes in [1.7.31-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.31-rc.1) (2021-06-15)
=========================================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30...v1.7.31-rc.1)
* Upgrade to React SDK 3.24.0-rc.1 and JS SDK 12.0.0-rc.1
* Translations update from Weblate
[\#17655](https://github.com/vector-im/element-web/pull/17655)
* Upgrade matrix-react-test-utils for React 17 peer deps
[\#17653](https://github.com/vector-im/element-web/pull/17653)
* Fix lint errors in Webpack config
[\#17626](https://github.com/vector-im/element-web/pull/17626)
* Preload only `woff2` fonts
[\#17614](https://github.com/vector-im/element-web/pull/17614)
* ⚛️ Upgrade to React@17
[\#17601](https://github.com/vector-im/element-web/pull/17601)
Changes in [1.7.30](https://github.com/vector-im/element-web/releases/tag/v1.7.30) (2021-06-07) Changes in [1.7.30](https://github.com/vector-im/element-web/releases/tag/v1.7.30) (2021-06-07)
=============================================================================================== ===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30-rc.1...v1.7.30) [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.30-rc.1...v1.7.30)

View File

@ -1,6 +1,6 @@
{ {
"name": "element-web", "name": "element-web",
"version": "1.7.30", "version": "1.7.31",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {
@ -60,8 +60,8 @@
"highlight.js": "^10.5.0", "highlight.js": "^10.5.0",
"jsrsasign": "^10.1.5", "jsrsasign": "^10.1.5",
"katex": "^0.12.0", "katex": "^0.12.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-js-sdk": "12.0.0",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-react-sdk": "3.24.0",
"matrix-widget-api": "^0.1.0-beta.14", "matrix-widget-api": "^0.1.0-beta.14",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^17.0.2", "react": "^17.0.2",

View File

@ -7647,9 +7647,10 @@ mathml-tag-names@^2.1.3:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": matrix-js-sdk@12.0.0:
version "11.2.0" version "12.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35ecbed29d16982deff27a8c37b05167738225a2" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.0.0.tgz#8ee7cc37661476341d0c792a1a12bc78b19f9fdd"
integrity sha512-DHeq87Sx9Dv37FYyvZkmA1VYsQUNaVgc3QzMUkFwoHt1T4EZzgyYpdsp3uYruJzUW0ACvVJcwFdrU4e1VS97dQ==
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
another-json "^0.2.0" another-json "^0.2.0"
@ -7669,9 +7670,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0" bluebird "^3.5.0"
expect "^1.20.2" expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": matrix-react-sdk@3.24.0:
version "3.23.0" version "3.24.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3eca1cbec32c134869069def28fb0d85566607e7" resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.24.0.tgz#da312338d790c7d4d8166ac2d5df983bda2e5445"
integrity sha512-I53P7ArdqfSLFrXB2jpb5ne8lvmw9uVYWhhvFaWgHIE1fuiTowx0SZaAl5bDH1XddHIbLwL+y8BsX95Yo5F7zQ==
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
await-lock "^2.1.0" await-lock "^2.1.0"
@ -7698,7 +7700,7 @@ matrix-mock-request@^1.2.3:
katex "^0.12.0" katex "^0.12.0"
linkifyjs "^2.1.9" linkifyjs "^2.1.9"
lodash "^4.17.20" lodash "^4.17.20"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-js-sdk "12.0.0"
matrix-widget-api "^0.1.0-beta.14" matrix-widget-api "^0.1.0-beta.14"
minimist "^1.2.5" minimist "^1.2.5"
opus-recorder "^8.0.3" opus-recorder "^8.0.3"