PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into develop

Browse source
This commit is contained in:
RiotRobot 2020-08-05 16:18:51 +01:00
commit 322a708d81
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
CHANGELOG.md
View file

@ -1,3 +1,27 @@
Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05)
=============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3-rc.1...v1.7.3)
* Upgrade to React SDK 3.1.0 and JS SDK 8.0.1
Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1)
* Upgrade to React SDK 3.1.0-rc.1 and JS SDK 8.0.1-rc.1
* Make Lojban translation available
[\#14703](https://github.com/vector-im/riot-web/pull/14703)
* Update from Weblate
[\#14841](https://github.com/vector-im/riot-web/pull/14841)
* Remove redundant lint dependencies
[\#14810](https://github.com/vector-im/riot-web/pull/14810)
* Bump elliptic from 6.5.2 to 6.5.3
[\#14826](https://github.com/vector-im/riot-web/pull/14826)
* Update mobile config intercept URL
[\#14796](https://github.com/vector-im/riot-web/pull/14796)
* Fix typo in https://
[\#14791](https://github.com/vector-im/riot-web/pull/14791)
Changes in [1.7.2](https://github.com/vector-im/riot-web/releases/tag/v1.7.2) (2020-07-27)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.1...v1.7.2)

6
package.json
View file

@ -1,7 +1,7 @@
{
"name": "riot-web",
"productName": "Riot",
"version": "1.7.2",
"version": "1.7.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -59,8 +59,8 @@
"browser-request": "^0.3.3",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "8.0.1",
"matrix-react-sdk": "3.1.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2",
"react": "^16.9.0",

16
yarn.lock
View file

@ -7312,9 +7312,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 "8.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d"
matrix-js-sdk@8.0.1:
version "8.0.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e"
integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA==
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"
@ -7334,9 +7335,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.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673"
matrix-react-sdk@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0.tgz#d8349942e6aa705195b30415c96d7576b783f011"
integrity sha512-LNSm4gX+c9Z2z39QyaQTSZmIAEI5nmIZ7uVq2X3ktn0NwmGwTcvC983t68ooHmIzAqVmh4JrscgzmdvPqk/YPw==
dependencies:
"@babel/runtime" "^7.10.5"
await-lock "^2.0.1"
@ -7364,7 +7366,7 @@ matrix-mock-request@^1.2.3:
is-ip "^2.0.0"
linkifyjs "^2.1.9"
lodash "^4.17.19"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "8.0.1"
minimist "^1.2.5"
pako "^1.0.11"
parse5 "^5.1.1"