mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge branch 'master' into develop
This commit is contained in:
commit
b0fc8572ad
18
CHANGELOG.md
18
CHANGELOG.md
@ -1,3 +1,21 @@
|
||||
Changes in [1.7.17](https://github.com/vector-im/element-web/releases/tag/v1.7.17) (2021-01-18)
|
||||
===============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17-rc.1...v1.7.17)
|
||||
|
||||
* Upgrade to React SDK 3.12.0 and JS SDK 9.5.0
|
||||
|
||||
Changes in [1.7.17-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.17-rc.1) (2021-01-13)
|
||||
=========================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16...v1.7.17-rc.1)
|
||||
|
||||
* Upgrade to React SDK 3.12.0-rc.1 and JS SDK 9.5.0-rc.1
|
||||
* Translations update from Weblate
|
||||
[\#16131](https://github.com/vector-im/element-web/pull/16131)
|
||||
* webplatform: Fix notification closing
|
||||
[\#16028](https://github.com/vector-im/element-web/pull/16028)
|
||||
* Stop building code and types for Element layer
|
||||
[\#15999](https://github.com/vector-im/element-web/pull/15999)
|
||||
|
||||
Changes in [1.7.16](https://github.com/vector-im/element-web/releases/tag/v1.7.16) (2020-12-21)
|
||||
===============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.16-rc.1...v1.7.16)
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "element-web",
|
||||
"version": "1.7.16",
|
||||
"version": "1.7.17",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
@ -58,8 +58,8 @@
|
||||
"highlight.js": "^10.4.1",
|
||||
"jsrsasign": "^9.1.5",
|
||||
"katex": "^0.12.0",
|
||||
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
|
||||
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
|
||||
"matrix-js-sdk": "9.5.0",
|
||||
"matrix-react-sdk": "3.12.0",
|
||||
"matrix-widget-api": "^0.1.0-beta.10",
|
||||
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
|
||||
"prop-types": "^15.7.2",
|
||||
|
16
yarn.lock
16
yarn.lock
@ -7899,9 +7899,10 @@ mathml-tag-names@^2.1.1:
|
||||
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
|
||||
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
|
||||
|
||||
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
|
||||
version "9.4.1"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1717fcf499b943517213f2a81c41ffec0b50748e"
|
||||
matrix-js-sdk@9.5.0:
|
||||
version "9.5.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.0.tgz#2f54e73b0fbb03e85b3f81f41da9d33b028c4b30"
|
||||
integrity sha512-Fg1SGrZ4N2WAtgbK5mEoOfDwTGV83noJ3VUJ9z3rparbQCBr8Rd8ppHBD8RgshVWGdJMPJ4EQBwhQUgHeyhz9g==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
another-json "^0.2.0"
|
||||
@ -7921,9 +7922,10 @@ matrix-mock-request@^1.2.3:
|
||||
bluebird "^3.5.0"
|
||||
expect "^1.20.2"
|
||||
|
||||
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
||||
version "3.11.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e551e7ac40a66954e1170528d80b97c34f08342e"
|
||||
matrix-react-sdk@3.12.0:
|
||||
version "3.12.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.0.tgz#fd81e11c8486f132f7e412bd96be45aae7f32566"
|
||||
integrity sha512-4sDtch/ciG7ekAbmI5BlZPfvHS0u/2l9fS9vUHGxcq6AGld1HHIVWUn4jg4LH14TAKY2OHIK6WK/OPPaYgyO0Q==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.10.5"
|
||||
await-lock "^2.0.1"
|
||||
@ -7952,7 +7954,7 @@ matrix-mock-request@^1.2.3:
|
||||
katex "^0.12.0"
|
||||
linkifyjs "^2.1.9"
|
||||
lodash "^4.17.19"
|
||||
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
|
||||
matrix-js-sdk "9.5.0"
|
||||
matrix-widget-api "^0.1.0-beta.10"
|
||||
minimist "^1.2.5"
|
||||
pako "^1.0.11"
|
||||
|
Loading…
Reference in New Issue
Block a user