Merge branch 'master' into develop
This commit is contained in:
RiotRobot
commit
c4545341ea
3 changed files with 55 additions and 20 deletions
33
CHANGELOG.md
33
CHANGELOG.md
|
|
@ -1,3 +1,36 @@
|
|||
Changes in [1.7.15](https://github.com/vector-im/element-web/releases/tag/v1.7.15) (2020-12-07)
|
||||
===============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.15-rc.1...v1.7.15)
|
||||
|
||||
* Upgrade to React SDK 3.10.0 and JS SDK 9.3.0
|
||||
|
||||
Changes in [1.7.15-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.15-rc.1) (2020-12-02)
|
||||
=========================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14...v1.7.15-rc.1)
|
||||
|
||||
* Upgrade to React SDK 3.10.0-rc.1 and JS SDK 9.3.0-rc.1
|
||||
* Include KaTeX CSS as a dependency
|
||||
[\#15843](https://github.com/vector-im/element-web/pull/15843)
|
||||
* Translations update from Weblate
|
||||
[\#15884](https://github.com/vector-im/element-web/pull/15884)
|
||||
* added katex.min.css to webpack for math support (main PR in matrix-react-
|
||||
sdk)
|
||||
[\#15277](https://github.com/vector-im/element-web/pull/15277)
|
||||
* Rebrand package name and other details
|
||||
[\#15828](https://github.com/vector-im/element-web/pull/15828)
|
||||
* Bump highlight.js from 9.18.1 to 10.1.2
|
||||
[\#15819](https://github.com/vector-im/element-web/pull/15819)
|
||||
* Update branding of packaging artifacts
|
||||
[\#15810](https://github.com/vector-im/element-web/pull/15810)
|
||||
* Update the react-sdk reference in the lockfile
|
||||
[\#15814](https://github.com/vector-im/element-web/pull/15814)
|
||||
* Update widget API for good measure in Element Web
|
||||
[\#15812](https://github.com/vector-im/element-web/pull/15812)
|
||||
* Stop publishing Element to NPM
|
||||
[\#15811](https://github.com/vector-im/element-web/pull/15811)
|
||||
* Add inotify instance limit info to README
|
||||
[\#15795](https://github.com/vector-im/element-web/pull/15795)
|
||||
|
||||
Changes in [1.7.14](https://github.com/vector-im/element-web/releases/tag/v1.7.14) (2020-11-23)
|
||||
===============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.14-rc.1...v1.7.14)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "element-web",
|
||||
"version": "1.7.14",
|
||||
"version": "1.7.15",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
|
@ -60,8 +60,8 @@
|
|||
"highlight.js": "^10.1.2",
|
||||
"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.3.0",
|
||||
"matrix-react-sdk": "3.10.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",
|
||||
|
|
|
|||
36
yarn.lock
36
yarn.lock
|
|
@ -1048,10 +1048,10 @@
|
|||
dependencies:
|
||||
regenerator-runtime "^0.13.4"
|
||||
|
||||
"@babel/runtime@^7.11.2":
|
||||
version "7.11.2"
|
||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
|
||||
integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
|
||||
"@babel/runtime@^7.12.5":
|
||||
version "7.12.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
|
||||
integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
|
||||
dependencies:
|
||||
regenerator-runtime "^0.13.4"
|
||||
|
||||
|
|
@ -7782,10 +7782,10 @@ loglevel@^1.6.8:
|
|||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
|
||||
integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
|
||||
|
||||
loglevel@^1.7.0:
|
||||
version "1.7.0"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
|
||||
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
|
||||
loglevel@^1.7.1:
|
||||
version "1.7.1"
|
||||
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
|
||||
integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
|
||||
|
||||
lolex@^5.0.0:
|
||||
version "5.1.2"
|
||||
|
|
@ -7925,16 +7925,17 @@ 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.2.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6661bde6088e6e43f31198e8532432e162aef33c"
|
||||
matrix-js-sdk@9.3.0:
|
||||
version "9.3.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.3.0.tgz#e5fa3f6cb5a56e5c5386ecf3110dc35072170dbb"
|
||||
integrity sha512-rzvYJS5mMP42iQVfGokX8DgmJpTUH+k15vATyB5JyBq/3r/kP22tN78RgoNxYzrIP/R4rB4OHUFNtgGzBH2u8g==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.11.2"
|
||||
"@babel/runtime" "^7.12.5"
|
||||
another-json "^0.2.0"
|
||||
browser-request "^0.3.3"
|
||||
bs58 "^4.0.1"
|
||||
content-type "^1.0.4"
|
||||
loglevel "^1.7.0"
|
||||
loglevel "^1.7.1"
|
||||
qs "^6.9.4"
|
||||
request "^2.88.2"
|
||||
unhomoglyph "^1.0.6"
|
||||
|
|
@ -7947,9 +7948,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.9.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/826466179aeeaf0a678e2d820f45031e6ab51dd0"
|
||||
matrix-react-sdk@3.10.0:
|
||||
version "3.10.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.10.0.tgz#07575b7dc5f12093a1dab313068673a82a939dfc"
|
||||
integrity sha512-LatG4kCKKy7ybUnvpoV3p6KEMSaECBIh0alw1JisuVBMw4nAYXEIbM1kGOI0h2vBF2826YqwXGj/vEyFHr7Euw==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.10.5"
|
||||
await-lock "^2.0.1"
|
||||
|
|
@ -7978,7 +7980,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.3.0"
|
||||
matrix-widget-api "^0.1.0-beta.10"
|
||||
minimist "^1.2.5"
|
||||
pako "^1.0.11"
|
||||
|
|
|
|||
Loading…
Reference in a new issue