Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-05-31 12:02:00 +01:00
commit ada47d476c
4 changed files with 19 additions and 13 deletions

View file

@ -1,3 +1,9 @@
Changes in [1.2.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.1) (2019-05-31)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0...v1.2.1)
* Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1 to fix key backup and native emoji height
Changes in [1.2.0](https://github.com/vector-im/riot-web/releases/tag/v1.2.0) (2019-05-29) Changes in [1.2.0](https://github.com/vector-im/riot-web/releases/tag/v1.2.0) (2019-05-29)
========================================================================================== ==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0) [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0)

View file

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "1.2.0", "version": "1.2.1",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"dependencies": { "dependencies": {

View file

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "electron_app/src/electron-main.js", "main": "electron_app/src/electron-main.js",
"version": "1.2.0", "version": "1.2.1",
"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": {
@ -73,8 +73,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2", "gfm.css": "^1.1.2",
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"matrix-js-sdk": "1.2.0", "matrix-js-sdk": "2.0.0",
"matrix-react-sdk": "1.2.0", "matrix-react-sdk": "1.2.1",
"modernizr": "^3.6.0", "modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",

View file

@ -5728,10 +5728,10 @@ math-random@^1.0.1:
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
matrix-js-sdk@1.2.0: matrix-js-sdk@2.0.0:
version "1.2.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0.tgz#1e18f7bead2b31f1b6886299f3198f545eb7d19e" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.0.tgz#1bbca0170c190a42eeda739f52f2995b446225ee"
integrity sha512-XqxIm30/ePPQxMpoSZ6560nVZN296E7DI4twGKspII+Pvc0u7p+UHTh3OXwTtPOj3eVo0ptKv3kn/a5SmYzXmQ== integrity sha512-2/NV9hepV8QnX3xl1oaS7VS9tqsBKqCh9/pp+dAYFMA1A5PJACMFjE2M1KnW3JvHH+uDvag4fa7rraMwwGOK+A==
dependencies: dependencies:
another-json "^0.2.0" another-json "^0.2.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
@ -5752,10 +5752,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0" bluebird "^3.5.0"
expect "^1.20.2" expect "^1.20.2"
matrix-react-sdk@1.2.0: matrix-react-sdk@1.2.1:
version "1.2.0" version "1.2.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0.tgz#8c8c204607763932c99851b2f24b27d3e27b66a5" resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.1.tgz#18eb0fc54f4c12a6f2ab15f0920c891d12d55981"
integrity sha512-FXUluS8gNUjHEeTFNOkpD5LgQTZM/UBxNPBYiqyVzEOWpJBVy49kJaVvEU/uzLCpHk3mde30PmTl9khAf2yVNQ== integrity sha512-5uiwOsVTJ6uwWKzlK1Q7o95L8s+gmm5wpAXywCduCYODjINLb3d66rToLxYCsznd/qO4aAUvLT3xPSXt97ha9Q==
dependencies: dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0" babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
@ -5782,7 +5782,7 @@ matrix-react-sdk@1.2.0:
linkifyjs "^2.1.6" linkifyjs "^2.1.6"
lodash "^4.13.1" lodash "^4.13.1"
lolex "2.3.2" lolex "2.3.2"
matrix-js-sdk "1.2.0" matrix-js-sdk "2.0.0"
optimist "^0.6.1" optimist "^0.6.1"
pako "^1.0.5" pako "^1.0.5"
png-chunks-extract "^1.0.0" png-chunks-extract "^1.0.0"