OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

pull/16292/head
RiotRobot 2021-01-26 12:26:47 +00:00
parent f728189445 9a1b667c27
commit e66d500b02
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
Changes in [1.7.18](https://github.com/vector-im/element-web/releases/tag/v1.7.18) (2021-01-26)
===============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.17...v1.7.18)
* Upgrade to React SDK 3.12.1 and JS SDK 9.5.1
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)

6
package.json
View File

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.7.17",
"version": "1.7.18",
"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.1",
"matrix-react-sdk": "3.12.1",
"matrix-widget-api": "0.1.0-beta.11",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"prop-types": "^15.7.2",

18
yarn.lock
View File

@ -7904,9 +7904,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.5.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/214a9df3823e602400b24d9a81cfc7b7df0a863b"
matrix-js-sdk@9.5.1:
version "9.5.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.5.1.tgz#f2e27b7131a8d1a75fd2a803434e63fe672415ef"
integrity sha512-01YbRuU50BDYytTZ5fdmdoQLqOGDT2F7X6vDBrYHpdaRN2jWuLCspQlOKFJKgv73gNhw9V9jfoZN+NxuwuUpUQ==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -7926,9 +7927,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.12.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6c8e6096da01cdc3153d2b120d9e9e3f5a482078"
matrix-react-sdk@3.12.1:
version "3.12.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.12.1.tgz#4f527404220427328d96462bc8a0cf065b9b31bf"
integrity sha512-RM//2mm5Bh4k7XQuYjbe8u/hSgXnxGgpq4/YcKmH2hKqdg46IVyVcoPrCswtdWqt0hpO3taoORrMwpGy3QhHBQ==
dependencies:
"@babel/runtime" "^7.10.5"
await-lock "^2.0.1"
@ -7957,9 +7959,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-widget-api "^0.1.0-beta.10"
minimist "^1.2.5"
matrix-js-sdk "9.5.1"
pako "^1.0.11"
parse5 "^5.1.1"
png-chunks-extract "^1.0.0"