From ee9f781adc484b9a22a0db533250116e95a28c6a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 15:37:24 +0100
Subject: [PATCH 01/20] js-sdk & react-sdk RCs
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 0e8d6273..e63160ab 100644
--- a/package.json
+++ b/package.json
@@ -60,8 +60,8 @@
"browser-request": "^0.3.3",
"extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10",
- "matrix-js-sdk": "0.10.1",
- "matrix-react-sdk": "0.12.2",
+ "matrix-js-sdk": "0.10.2-rc.1",
+ "matrix-react-sdk": "0.12.3-rc.1",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",
From 3dcf1949607eb9435b07e83708b4300799dd798e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 15:41:33 +0100
Subject: [PATCH 02/20] v0.14.2-rc.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 8c23a8ff..22fd89d4 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": "0.14.1",
+ "version": "0.14.2-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From 8e218f12b42aa2419c83962011dd7e0a4ed201f5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 15:42:38 +0100
Subject: [PATCH 03/20] Prepare changelog for v0.14.2-rc.1
---
CHANGELOG.md | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5260764..bdbc7102 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1)
+
+ * Update from Weblate.
+ [\#6602](https://github.com/vector-im/riot-web/pull/6602)
+ * Add readme bit on cross-origin renderer
+ [\#6600](https://github.com/vector-im/riot-web/pull/6600)
+ * Update from Weblate.
+ [\#6573](https://github.com/vector-im/riot-web/pull/6573)
+ * Copy media from react-sdk
+ [\#6588](https://github.com/vector-im/riot-web/pull/6588)
+ * Fix favicon
+ [\#6580](https://github.com/vector-im/riot-web/pull/6580)
+ * Update from Weblate.
+ [\#6569](https://github.com/vector-im/riot-web/pull/6569)
+ * move everything not explicitly riot (or status) branded into matrix-react-
+ sdk
+ [\#6500](https://github.com/vector-im/riot-web/pull/6500)
+ * Remove presence management
+ [\#5881](https://github.com/vector-im/riot-web/pull/5881)
+ * change vector-web repo to riot-web in changelog
+ [\#6480](https://github.com/vector-im/riot-web/pull/6480)
+ * Update from Weblate.
+ [\#6473](https://github.com/vector-im/riot-web/pull/6473)
+ * Bump source-map-loader version to avoid bug /w inline base64 maps
+ [\#6472](https://github.com/vector-im/riot-web/pull/6472)
+ * Add CSS for new group admin radio button
+ [\#6415](https://github.com/vector-im/riot-web/pull/6415)
+ * Rxl881/sticker picker styling
+ [\#6447](https://github.com/vector-im/riot-web/pull/6447)
+ * Stickerpacks
+ [\#6242](https://github.com/vector-im/riot-web/pull/6242)
+ * Force gemini on HomePage
+ [\#6368](https://github.com/vector-im/riot-web/pull/6368)
+ * Rename the Riot-Web Translations Room
+ [\#6348](https://github.com/vector-im/riot-web/pull/6348)
+ * Add disable-presence-by-hs option to sample config
+ [\#6350](https://github.com/vector-im/riot-web/pull/6350)
+ * Reword the BugReportDialog.js as per @lampholder
+ [\#6354](https://github.com/vector-im/riot-web/pull/6354)
+
Changes in [0.14.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.1) (2018-04-12)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0...v0.14.1)
From 8d4d16bde155c624d4245e45c6cad3e46b552a2a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 16:35:13 +0100
Subject: [PATCH 04/20] Bump react-sdk version
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index e63160ab..e718f745 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
"extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10",
"matrix-js-sdk": "0.10.2-rc.1",
- "matrix-react-sdk": "0.12.3-rc.1",
+ "matrix-react-sdk": "0.12.3-rc.2",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",
From 083dd4eeecf9f26c76c16564581e0c9e5a384044 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 16:36:16 +0100
Subject: [PATCH 05/20] Temporarily revert electron version bump
---
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 22fd89d4..8c23a8ff 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": "0.14.2-rc.1",
+ "version": "0.14.1",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From 981bd94615dbd49075af7bd87baab42ba97eca7d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 17:33:18 +0100
Subject: [PATCH 06/20] Change CSS dependencies to not hardcoded paths
Add add direct dependencies on the packages they come from, because
referring to them by path like this doesn't work in a frash
checkout / npm install because of how npm lays out the packages.
---
package.json | 4 ++++
src/vector/index.js | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index e718f745..f59f7878 100644
--- a/package.json
+++ b/package.json
@@ -58,8 +58,12 @@
"babel-runtime": "^6.11.6",
"bluebird": "^3.5.0",
"browser-request": "^0.3.3",
+ "draft-js": "^0.10.5",
"extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10",
+ "gemini-scrollbar": "^1.5.3",
+ "gfm.css": "^1.1.2",
+ "highlight.js": "^9.12.0",
"matrix-js-sdk": "0.10.2-rc.1",
"matrix-react-sdk": "0.12.3-rc.2",
"modernizr": "^3.1.0",
diff --git a/src/vector/index.js b/src/vector/index.js
index 63affadd..183e0b50 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -32,10 +32,10 @@ require('babel-polyfill');
// Require common CSS here; this will make webpack process it into bundle.css.
// Our own CSS (which is themed) is imported via separate webpack entry points
// in webpack.config.js
-require('matrix-react-sdk/node_modules/gemini-scrollbar/gemini-scrollbar.css');
-require('matrix-react-sdk/node_modules/gfm.css/gfm.css');
-require('matrix-react-sdk/node_modules/highlight.js/styles/github.css');
-require('matrix-react-sdk/node_modules/draft-js/dist/Draft.css');
+require('gemini-scrollbar/gemini-scrollbar.css');
+require('gfm.css/gfm.css');
+require('highlight.js/styles/github.css');
+require('draft-js/dist/Draft.css');
const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
rageshake.init().then(() => {
From 8b99a72f2c74317a3b702a30981d4999af2a940c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 17:37:35 +0100
Subject: [PATCH 07/20] v0.14.2-rc.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 8c23a8ff..22fd89d4 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": "0.14.1",
+ "version": "0.14.2-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From 5923417654039c6cc77ba884ec1d32055e56466d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 25 Apr 2018 17:39:56 +0100
Subject: [PATCH 08/20] v0.14.2-rc.1
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index f59f7878..0d2e3b5c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.14.1",
+ "version": "0.14.2-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
From 18ba570c747f2bf6f5dc9f3f590627b6dde0a493 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 11:33:44 +0100
Subject: [PATCH 09/20] Bump react-sdk version
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 0d2e3b5c..eca9d7de 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.12.0",
"matrix-js-sdk": "0.10.2-rc.1",
- "matrix-react-sdk": "0.12.3-rc.2",
+ "matrix-react-sdk": "0.12.3-rc.3",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",
From 45661dd9603a9d088bc7bac1939d4adefd2a5f67 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 11:37:49 +0100
Subject: [PATCH 10/20] changelog
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdbc7102..aecc5f8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2)
+
+ * Fix Download of attachments in e2e encrypted rooms in Firefox
+
Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1)
From 73e4fcafdc22896021baf210d8b509af5db3db15 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 11:44:36 +0100
Subject: [PATCH 11/20] v0.14.2-rc.2
---
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 22fd89d4..f4024b65 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": "0.14.2-rc.1",
+ "version": "0.14.2-rc.2",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From b8f7025f2abb20b26dfb9d7a25946cdaa0c89cc8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 11:46:38 +0100
Subject: [PATCH 12/20] v0.14.2-rc.2
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index eca9d7de..df8583a2 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.14.2-rc.1",
+ "version": "0.14.2-rc.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
From 1eb82d97ae514fa61db54fa8061f95b724aa94d8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 15:25:20 +0100
Subject: [PATCH 13/20] Fix dependencies to the same versions as react-sdk
Otherwise Things Get Weird, eg. headers in the left panel end up in
the wrong place because the gemini scrollbar CSS has changed
between versions.
---
package.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index df8583a2..b76ae22c 100644
--- a/package.json
+++ b/package.json
@@ -58,12 +58,12 @@
"babel-runtime": "^6.11.6",
"bluebird": "^3.5.0",
"browser-request": "^0.3.3",
- "draft-js": "^0.10.5",
+ "draft-js": "^0.11.0-alpha",
"extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10",
- "gemini-scrollbar": "^1.5.3",
- "gfm.css": "^1.1.2",
- "highlight.js": "^9.12.0",
+ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
+ "gfm.css": "^1.1.1",
+ "highlight.js": "^9.0.0",
"matrix-js-sdk": "0.10.2-rc.1",
"matrix-react-sdk": "0.12.3-rc.3",
"modernizr": "^3.1.0",
From 6dad8e695e4a3b8e2623398dc21598a1cd78f498 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 15:35:51 +0100
Subject: [PATCH 14/20] v0.14.2-rc.3
---
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 f4024b65..b3b65040 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": "0.14.2-rc.2",
+ "version": "0.14.2-rc.3",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From 3d1c2fa5f12e2f7db1d05de6cf6348b7790703b2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 15:38:17 +0100
Subject: [PATCH 15/20] Prepare changelog for v0.14.2-rc.3
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aecc5f8b..b26fecc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3)
+
+ * Fix CSS dependency versions to be the same as those in react-sdk to fix
+ left panel header positions.
+
Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2)
From 137665685d429902349cae8a250e58ce785767f0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Apr 2018 15:38:18 +0100
Subject: [PATCH 16/20] v0.14.2-rc.3
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index b76ae22c..2e9cd6c3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.14.2-rc.2",
+ "version": "0.14.2-rc.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
From ff8f617fc6e34428f8bdd47e86e8f5f7d04c46d6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 30 Apr 2018 13:42:38 +0100
Subject: [PATCH 17/20] Released react-sdk & js-sdk
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index 2e9cd6c3..98638e35 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
- "matrix-js-sdk": "0.10.2-rc.1",
- "matrix-react-sdk": "0.12.3-rc.3",
+ "matrix-js-sdk": "0.10.2",
+ "matrix-react-sdk": "0.12.3",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",
From 9235c0dcfad316dfe55f2242af7892ea4dd1be1e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 30 Apr 2018 13:43:04 +0100
Subject: [PATCH 18/20] v0.14.2
---
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 b3b65040..2eb681ec 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": "0.14.2-rc.3",
+ "version": "0.14.2",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
From 8afdbab9d5e9a7d641dd67990f1eb466eddfd717 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 30 Apr 2018 13:44:23 +0100
Subject: [PATCH 19/20] Prepare changelog for v0.14.2
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b26fecc1..43b22740 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.14.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2) (2018-04-30)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.3...v0.14.2)
+
+ * No changes since rc.3
+
Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26)
======================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3)
From 76d4a4f3fe7b6aa9188fd3ea3fda5c2c0dc58860 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 30 Apr 2018 13:44:23 +0100
Subject: [PATCH 20/20] v0.14.2
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 98638e35..26bde29d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
- "version": "0.14.2-rc.3",
+ "version": "0.14.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {