mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge branch 'master' into develop
# Conflicts: # package.json # yarn.lock
This commit is contained in:
commit
5ae4d0b8c9
@ -1,3 +1,9 @@
|
|||||||
|
Changes in [1.11.8](https://github.com/vector-im/element-web/releases/tag/v1.11.8) (2022-09-28)
|
||||||
|
===============================================================================================
|
||||||
|
|
||||||
|
## 🐛 Bug Fixes
|
||||||
|
* Bump IDB crypto store version ([\#2705](https://github.com/matrix-org/matrix-js-sdk/pull/2705)).
|
||||||
|
|
||||||
Changes in [1.11.7](https://github.com/vector-im/element-web/releases/tag/v1.11.7) (2022-09-28)
|
Changes in [1.11.7](https://github.com/vector-im/element-web/releases/tag/v1.11.7) (2022-09-28)
|
||||||
===============================================================================================
|
===============================================================================================
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "element-web",
|
"name": "element-web",
|
||||||
"version": "1.11.7",
|
"version": "1.11.8",
|
||||||
"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": {
|
||||||
@ -61,8 +61,8 @@
|
|||||||
"gfm.css": "^1.1.2",
|
"gfm.css": "^1.1.2",
|
||||||
"jsrsasign": "^10.5.25",
|
"jsrsasign": "^10.5.25",
|
||||||
"katex": "^0.16.0",
|
"katex": "^0.16.0",
|
||||||
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
|
"matrix-js-sdk": "20.0.0",
|
||||||
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
|
"matrix-react-sdk": "3.57.0",
|
||||||
"matrix-widget-api": "^1.1.1",
|
"matrix-widget-api": "^1.1.1",
|
||||||
"prop-types": "^15.7.2",
|
"prop-types": "^15.7.2",
|
||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
|
16
yarn.lock
16
yarn.lock
@ -8266,9 +8266,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"
|
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
|
||||||
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
|
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
|
||||||
|
|
||||||
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
|
matrix-js-sdk@20.0.0:
|
||||||
version "19.7.0"
|
version "20.0.0"
|
||||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/14aa7846a5ac4559dd0489726f06d6eab54f5de5"
|
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-20.0.0.tgz#f88f2052b0fb868233616ca4b968885613759fc6"
|
||||||
|
integrity sha512-eOKTiWhvUxiPtl4bHFLJh/kQRdaR3ucTUTTvGXZAWh1Ljo6emU2VILPCQWyl7HTOzjCvkRHAvuGlBypMQZf+MQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.12.5"
|
"@babel/runtime" "^7.12.5"
|
||||||
another-json "^0.2.0"
|
another-json "^0.2.0"
|
||||||
@ -8289,9 +8290,10 @@ matrix-mock-request@^2.0.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
expect "^28.1.0"
|
expect "^28.1.0"
|
||||||
|
|
||||||
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
matrix-react-sdk@3.57.0:
|
||||||
version "3.56.0"
|
version "3.57.0"
|
||||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/fff065d6af7790fdbb9d158ecf4e647bd78dec93"
|
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.57.0.tgz#a181268f35cab374ebe5dbc3f4f7a572f956fcf5"
|
||||||
|
integrity sha512-fLfLTNuuUEgk2VbF0lZJKCevDhIykUX5Ts6jvsOxDKNTWiKMVUO+p3yvoAIY0enMYnDFQ1vKydnkDbRMV6OKYw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@babel/runtime" "^7.12.5"
|
"@babel/runtime" "^7.12.5"
|
||||||
"@matrix-org/analytics-events" "^0.2.0"
|
"@matrix-org/analytics-events" "^0.2.0"
|
||||||
@ -8330,7 +8332,7 @@ matrix-mock-request@^2.0.0:
|
|||||||
maplibre-gl "^1.15.2"
|
maplibre-gl "^1.15.2"
|
||||||
matrix-encrypt-attachment "^1.0.3"
|
matrix-encrypt-attachment "^1.0.3"
|
||||||
matrix-events-sdk "^0.0.1-beta.7"
|
matrix-events-sdk "^0.0.1-beta.7"
|
||||||
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
|
matrix-js-sdk "20.0.0"
|
||||||
matrix-widget-api "^1.1.1"
|
matrix-widget-api "^1.1.1"
|
||||||
minimist "^1.2.5"
|
minimist "^1.2.5"
|
||||||
opus-recorder "^8.0.3"
|
opus-recorder "^8.0.3"
|
||||||
|
Loading…
Reference in New Issue
Block a user