Matrix/element-web
Matrix/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-09-10 07:05:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
RiotRobot 2020-08-17 13:16:44 +01:00
commit cc31d336dd
3 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CHANGELOG.md
View file

@ -1,3 +1,26 @@
Changes in [1.7.4](https://github.com/vector-im/element-web/releases/tag/v1.7.4) (2020-08-17)
=============================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4-rc.1...v1.7.4)
* Upgrade to React SDK 3.2.0 and JS SDK 8.1.0
Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13)
=======================================================================================================
[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1)
* Upgrade to React SDK 3.2.0-rc.1 and JS SDK 8.1.0-rc.1
* Update policy links to element.io
[\#14905](https://github.com/vector-im/element-web/pull/14905)
* Update from Weblate
[\#14949](https://github.com/vector-im/element-web/pull/14949)
* Try to close notification on all platforms which support it, not just
electron
[\#14939](https://github.com/vector-im/element-web/pull/14939)
* Update bug report submission URL
[\#14903](https://github.com/vector-im/element-web/pull/14903)
* Fix arm docker build
[\#14522](https://github.com/vector-im/element-web/pull/14522)
Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05)
=============================================================================================

6
package.json
View file

@ -1,7 +1,7 @@
{
"name": "riot-web",
"productName": "Riot",
"version": "1.7.3",
"version": "1.7.4",
"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.1.0",
"matrix-react-sdk": "3.2.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.1"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0"
matrix-js-sdk@8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0.tgz#c4e48b03a54455dda3d3e1c539ce31dbb46790ac"
integrity sha512-id/J1rBmooQWebCNO4we5W4w816+6LR503H6N1A3jn2CZl2etg86HOScmtGmw+4qkzjKJI5QkL30tvDyAJ+lxA==
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.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/45b79a0b7c9237c6b4dbafd37c1a234ed2b7cf35"
matrix-react-sdk@3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0.tgz#4523003c8dd72f9d7c9b53d5bec3cd67fe41c52f"
integrity sha512-yywvU2lJR0s/P3Suf5SDf3Aa/vHDZjwDiR14DBsHKdP97TyugA3LKogVkjfi192+m2sMFtl8AB/raplhSz/lNg==
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.1.0"
minimist "^1.2.5"
pako "^1.0.11"
parse5 "^5.1.1"