From 7c03bd128b6b8ed45a52c9459d4689478f637628 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 31 May 2019 11:52:42 +0100
Subject: [PATCH 1/4] Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1
---
package.json | 4 ++--
yarn.lock | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/package.json b/package.json
index 879fbf7a01..973d9d79d7 100644
--- a/package.json
+++ b/package.json
@@ -73,8 +73,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
- "matrix-js-sdk": "1.2.0",
- "matrix-react-sdk": "1.2.0",
+ "matrix-js-sdk": "2.0.0",
+ "matrix-react-sdk": "1.2.1",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
"prop-types": "^15.6.2",
diff --git a/yarn.lock b/yarn.lock
index e17c9d2950..823d6c3ae7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5742,10 +5742,10 @@ math-random@^1.0.1:
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
-matrix-js-sdk@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0.tgz#1e18f7bead2b31f1b6886299f3198f545eb7d19e"
- integrity sha512-XqxIm30/ePPQxMpoSZ6560nVZN296E7DI4twGKspII+Pvc0u7p+UHTh3OXwTtPOj3eVo0ptKv3kn/a5SmYzXmQ==
+matrix-js-sdk@2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.0.tgz#1bbca0170c190a42eeda739f52f2995b446225ee"
+ integrity sha512-2/NV9hepV8QnX3xl1oaS7VS9tqsBKqCh9/pp+dAYFMA1A5PJACMFjE2M1KnW3JvHH+uDvag4fa7rraMwwGOK+A==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"
@@ -5766,10 +5766,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
-matrix-react-sdk@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0.tgz#8c8c204607763932c99851b2f24b27d3e27b66a5"
- integrity sha512-FXUluS8gNUjHEeTFNOkpD5LgQTZM/UBxNPBYiqyVzEOWpJBVy49kJaVvEU/uzLCpHk3mde30PmTl9khAf2yVNQ==
+matrix-react-sdk@1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.1.tgz#18eb0fc54f4c12a6f2ab15f0920c891d12d55981"
+ integrity sha512-5uiwOsVTJ6uwWKzlK1Q7o95L8s+gmm5wpAXywCduCYODjINLb3d66rToLxYCsznd/qO4aAUvLT3xPSXt97ha9Q==
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"
@@ -5796,7 +5796,7 @@ matrix-react-sdk@1.2.0:
linkifyjs "^2.1.6"
lodash "^4.13.1"
lolex "2.3.2"
- matrix-js-sdk "1.2.0"
+ matrix-js-sdk "2.0.0"
optimist "^0.6.1"
pako "^1.0.5"
png-chunks-extract "^1.0.0"
From 6b93053a80d88fe98287c2ba37a424680deb787a Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 31 May 2019 11:53:34 +0100
Subject: [PATCH 2/4] v1.2.1
---
electron_app/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/electron_app/package.json b/electron_app/package.json
index ee8aa7903e..b6107559e7 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.2.0",
+ "version": "1.2.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
From 947e5ab582898f31cd38d02f249c00cb7d36fc48 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 31 May 2019 11:59:31 +0100
Subject: [PATCH 3/4] Prepare changelog for v1.2.1
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1efb2c347f..9ba572442f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0)
From 7446799e4b0e3e65122f5642b5f3a8c59aae15bf Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Fri, 31 May 2019 11:59:31 +0100
Subject: [PATCH 4/4] v1.2.1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 973d9d79d7..4ca8682adb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "1.2.0",
+ "version": "1.2.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {