From f771f607d6543730521484da1b11978657d688cd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 11:39:07 +0100 Subject: [PATCH 01/22] Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index aa2290b1..22cdf99f 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": "2.1.1", - "matrix-react-sdk": "1.3.1", + "matrix-js-sdk": "2.2.0-rc.1", + "matrix-react-sdk": "1.4.0-rc.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 1c156180..471471ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5847,10 +5847,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@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.1.1.tgz#c4d9ed81e18e2c2fce9fff168fdf41f37c390b6a" - integrity sha512-dpVuwrQjOJn8eqtP9TRoSX6WIbdZG7+RCmqkJtfvpjB+iNgtDhodIWfrNearSBhJYezipUFu9nrt9akKfWBXxQ== +matrix-js-sdk@2.2.0-rc.1: + version "2.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0-rc.1.tgz#6f1a559db2dadcb43c3c1f8a27a880ecdf4ea410" + integrity sha512-gjhe8CBM1okbhic+tGBqWhwKAEFp9hns3DoJandf6veAF01ZfBInGaQPMHtxufIRFfmJtd7CoRiV8pr9tY3S3g== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5871,10 +5871,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.3.1.tgz#47bcb451684e09c7306db9751000e4c5af713bb7" - integrity sha512-qQ9O7sBkcTWbUUkv82fSZVXyXVNkL9WJkWqrAlzTUzf8pzVENqtKunQeDbrfzuYan2bHre+ot14KFwSkywOhcw== +matrix-react-sdk@1.4.0-rc.1: + version "1.4.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0-rc.1.tgz#c66f13fff2a913230ab29c2efe0324cb9b0cb77e" + integrity sha512-E6CGgfnsVZrZCNSBx+F8VjkxOVn4QGITxZCrawgcqoiAU+MVijEse+M4Kym9D59DRVXa4RTnls34hKqHRDLKRw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5901,7 +5901,7 @@ matrix-react-sdk@1.3.1: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "2.3.2" - matrix-js-sdk "2.1.1" + matrix-js-sdk "2.2.0-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From a23386bdb428b822d0ca2aa657afbfef064449b5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 11:39:59 +0100 Subject: [PATCH 02/22] v1.3.0-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 754bee5d..0b44bbfe 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.4", + "version": "1.3.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 56b0c333c01c4060d605c9f02d9ce692eb0dcdf9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 11:43:40 +0100 Subject: [PATCH 03/22] Prepare changelog for v1.3.0-rc.1 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ceb729b8..1906a42c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +Changes in [1.3.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.1) (2019-07-12) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.4...v1.3.0-rc.1) + + * Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1 + * Update from Weblate + [\#10328](https://github.com/vector-im/riot-web/pull/10328) + * Upgrade dependencies + [\#10308](https://github.com/vector-im/riot-web/pull/10308) + * Upgrade dependencies + [\#10260](https://github.com/vector-im/riot-web/pull/10260) + Changes in [1.2.4](https://github.com/vector-im/riot-web/releases/tag/v1.2.4) (2019-07-11) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.3...v1.2.4) From a28144bbc0efce71977e08e64adcccd08b8c47ea Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 11:43:41 +0100 Subject: [PATCH 04/22] v1.3.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 22cdf99f..9942bd91 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.4", + "version": "1.3.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From fde90afe584713f59ec0a80df1354cadb870f0ab Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 12 Jul 2019 17:02:12 +0100 Subject: [PATCH 05/22] Convert install-app-deps to subcommand --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1fe79e1..7b35a4c6 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle", "build:dev": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle:dev", "dist": "scripts/package.sh", - "install:electron": "install-app-deps", + "install:electron": "electron-builder install-app-deps", "electron": "yarn install:electron && electron .", "start:res": "node scripts/copy-res.js -w", "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development", From be601d4654986327a5327d5955fa440421571b0e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 17:37:01 +0100 Subject: [PATCH 06/22] Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 9942bd91..43b14cbc 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": "2.2.0-rc.1", - "matrix-react-sdk": "1.4.0-rc.1", + "matrix-js-sdk": "2.2.0-rc.2", + "matrix-react-sdk": "1.4.0-rc.2", "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 471471ad..52e6ca13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5847,10 +5847,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@2.2.0-rc.1: - version "2.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0-rc.1.tgz#6f1a559db2dadcb43c3c1f8a27a880ecdf4ea410" - integrity sha512-gjhe8CBM1okbhic+tGBqWhwKAEFp9hns3DoJandf6veAF01ZfBInGaQPMHtxufIRFfmJtd7CoRiV8pr9tY3S3g== +matrix-js-sdk@2.2.0-rc.2: + version "2.2.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0-rc.2.tgz#aeb2357c9ea69591657d0d6c0fba8fcbcf0e40c7" + integrity sha512-glT0/yV6+AypedNi7K0Xugjj0Q9bOQRVEbVfhO2O22ei+qqkCAUsGqGssCIumvfNh9QAh+OXCfn4goLFrANtew== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5871,10 +5871,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.4.0-rc.1: - version "1.4.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0-rc.1.tgz#c66f13fff2a913230ab29c2efe0324cb9b0cb77e" - integrity sha512-E6CGgfnsVZrZCNSBx+F8VjkxOVn4QGITxZCrawgcqoiAU+MVijEse+M4Kym9D59DRVXa4RTnls34hKqHRDLKRw== +matrix-react-sdk@1.4.0-rc.2: + version "1.4.0-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0-rc.2.tgz#3b19107b6cd2adafd8c59c265c0ac19031b7b7fa" + integrity sha512-GATvYpBxb2HlcvRFuu7F6x0SOUrbjrfICN0reH9N5WJb+de3BjxMndsX1D1d9eaWTP2MbbKAIaFhXfj+UhtLRA== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5901,7 +5901,7 @@ matrix-react-sdk@1.4.0-rc.1: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "2.3.2" - matrix-js-sdk "2.2.0-rc.1" + matrix-js-sdk "2.2.0-rc.2" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 88c8ea0d5a4e92a37e051775ae51f8f15031a559 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 17:38:06 +0100 Subject: [PATCH 07/22] v1.3.0-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 0b44bbfe..9c28777d 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.3.0-rc.1", + "version": "1.3.0-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 4f7061aaa8c05eea0e59b5935ddd4fe88b22d979 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 17:40:07 +0100 Subject: [PATCH 08/22] Prepare changelog for v1.3.0-rc.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1906a42c..a13bcd7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.3.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.2) (2019-07-12) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.1...v1.3.0-rc.2) + + * Upgrade to React SDK 1.4.0-rc.2 and JS SDK 2.2.0-rc.2 + * Fix regression from Riot 1.3.0-rc.1 when listing devices in user settings + Changes in [1.3.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.1) (2019-07-12) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.4...v1.3.0-rc.1) From 6259fba6adec7398a6a5398932b94d1a985b3629 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 12 Jul 2019 17:40:07 +0100 Subject: [PATCH 09/22] v1.3.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 43b14cbc..494c7f7c 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.3.0-rc.1", + "version": "1.3.0-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From fab0d70f219353bf468c7256ffca7caab6430c83 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 15 Jul 2019 17:31:13 +0100 Subject: [PATCH 10/22] react-sdk rc.3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 494c7f7c..7dc84e44 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "2.2.0-rc.2", - "matrix-react-sdk": "1.4.0-rc.2", + "matrix-react-sdk": "1.4.0-rc.3", "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 52e6ca13..33415988 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5871,10 +5871,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.4.0-rc.2: - version "1.4.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0-rc.2.tgz#3b19107b6cd2adafd8c59c265c0ac19031b7b7fa" - integrity sha512-GATvYpBxb2HlcvRFuu7F6x0SOUrbjrfICN0reH9N5WJb+de3BjxMndsX1D1d9eaWTP2MbbKAIaFhXfj+UhtLRA== +matrix-react-sdk@1.4.0-rc.3: + version "1.4.0-rc.3" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0-rc.3.tgz#8f77586b32327e4a6f6c3eb56019f5e59813690a" + integrity sha512-93YWuT8vw65iOGHHE+nFrjGQbIOKks1UnSqjnYOESBnIvJsslLDOYhnqAHOyMdQJRxIA/eLrpVKEvBqf457xuw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" From f20d38f13141cfca997b6d23059136bf4070a77f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 15 Jul 2019 17:32:06 +0100 Subject: [PATCH 11/22] v1.3.0-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 9c28777d..e45048c1 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.3.0-rc.2", + "version": "1.3.0-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 8b215bf6d4ebe8f55b4743e19a51f90872e94d7c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 15 Jul 2019 17:34:37 +0100 Subject: [PATCH 12/22] Prepare changelog for v1.3.0-rc.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a13bcd7f..1fabfe85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.3.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.3) (2019-07-15) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.2...v1.3.0-rc.3) + + * Update to react-sdk rc.3 to fix a bug where a room admin could generate a room + that would cause Riot to error, and some stuck notifications. + Changes in [1.3.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.2) (2019-07-12) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.1...v1.3.0-rc.2) From 343279ee5d0d9da9e4302b10c4493e16dc65f138 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 15 Jul 2019 17:34:38 +0100 Subject: [PATCH 13/22] v1.3.0-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7dc84e44..58621c73 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.3.0-rc.2", + "version": "1.3.0-rc.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 2cf1aabcba9d3f5e45d7fea47439b44dfe4052a3 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 16 Jul 2019 12:49:10 +0200 Subject: [PATCH 14/22] cachebust config file requests --- src/vector/getconfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/getconfig.js b/src/vector/getconfig.js index 392b32fe..984b1051 100644 --- a/src/vector/getconfig.js +++ b/src/vector/getconfig.js @@ -37,7 +37,7 @@ export async function getVectorConfig(relativeLocation) { function getConfig(configJsonFilename) { return new Promise(function(resolve, reject) { request( - { method: "GET", url: configJsonFilename }, + { method: "GET", url: configJsonFilename, qs: { cachebuster: Date.now() } }, (err, response, body) => { try { if (err || response.status < 200 || response.status >= 300) { From 7731f936766d3426bc80c1ee6cf60ee05717145c Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 18 Jul 2019 10:46:19 +0100 Subject: [PATCH 15/22] Remove edits feature flag from docs and config Part of https://github.com/vector-im/riot-web/issues/10282 --- config.sample.json | 3 +-- docs/labs.md | 7 ------- electron_app/riot.im/config.json | 3 +-- riot.im/develop/config.json | 3 +-- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/config.sample.json b/config.sample.json index ac22b5bf..7c75635b 100644 --- a/config.sample.json +++ b/config.sample.json @@ -22,8 +22,7 @@ "features": { "feature_groups": "labs", "feature_pinning": "labs", - "feature_reactions": "labs", - "feature_message_editing": "labs" + "feature_reactions": "labs" }, "default_federate": true, "default_theme": "light", diff --git a/docs/labs.md b/docs/labs.md index 3d568a2b..65b71b34 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -35,11 +35,4 @@ That's it. Now should see your new counter under the header. reactions from other people. This feature is currently under active development, and only portions have been implemented so far. -## Message editing - -`feature_message_editing` allows editing messages after they have been sent, -accessible from the reaction/context bar when hovering a message. -This feature is currently under active development, -and only portions have been implemented so far. - [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index e24d8ecf..27311da2 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -31,8 +31,7 @@ }, "features": { "feature_lazyloading": "enable", - "feature_reactions": "enable", - "feature_message_editing": "enable" + "feature_reactions": "enable" }, "enable_presence_by_hs_url": { "https://matrix.org": false diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index b687235c..86623e7e 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -26,8 +26,7 @@ "feature_sas": "labs", "feature_room_breadcrumbs": "labs", "feature_state_counters": "labs", - "feature_reactions": "enable", - "feature_message_editing": "enable" + "feature_reactions": "enable" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From 8398ec5358716efecf101c9bb7016a48aed7372f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 18 Jul 2019 10:48:43 +0100 Subject: [PATCH 16/22] Remove reactions feature flag from docs and config Part of https://github.com/vector-im/riot-web/issues/10282 --- config.sample.json | 3 +-- docs/labs.md | 6 ------ electron_app/riot.im/config.json | 3 +-- riot.im/develop/config.json | 3 +-- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/config.sample.json b/config.sample.json index 7c75635b..751e2839 100644 --- a/config.sample.json +++ b/config.sample.json @@ -21,8 +21,7 @@ "showLabsSettings": false, "features": { "feature_groups": "labs", - "feature_pinning": "labs", - "feature_reactions": "labs" + "feature_pinning": "labs" }, "default_federate": true, "default_theme": "light", diff --git a/docs/labs.md b/docs/labs.md index 65b71b34..579bb1e1 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -29,10 +29,4 @@ Once enabled, send a custom state event to a room to set values: That's it. Now should see your new counter under the header. -## Reactions - -`feature_reactions` allows reacting to messages with emoji and displaying -reactions from other people. This feature is currently under active development, -and only portions have been implemented so far. - [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 27311da2..a995a4e9 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -30,8 +30,7 @@ } }, "features": { - "feature_lazyloading": "enable", - "feature_reactions": "enable" + "feature_lazyloading": "enable" }, "enable_presence_by_hs_url": { "https://matrix.org": false diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index 86623e7e..2c295053 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -25,8 +25,7 @@ "feature_tabbed_settings": "labs", "feature_sas": "labs", "feature_room_breadcrumbs": "labs", - "feature_state_counters": "labs", - "feature_reactions": "enable" + "feature_state_counters": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { From b4038287915ae1c4055f1021ca436b57956c6d68 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 18 Jul 2019 10:46:19 +0100 Subject: [PATCH 17/22] Remove edits feature flag from docs and config Part of https://github.com/vector-im/riot-web/issues/10282 --- config.sample.json | 3 +-- docs/labs.md | 7 ------- electron_app/riot.im/config.json | 3 +-- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config.sample.json b/config.sample.json index 55bf12c3..f0b85bbc 100644 --- a/config.sample.json +++ b/config.sample.json @@ -23,8 +23,7 @@ "features": { "feature_groups": "labs", "feature_pinning": "labs", - "feature_reactions": "labs", - "feature_message_editing": "labs" + "feature_reactions": "labs" }, "default_federate": true, "default_theme": "light", diff --git a/docs/labs.md b/docs/labs.md index 3d568a2b..65b71b34 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -35,11 +35,4 @@ That's it. Now should see your new counter under the header. reactions from other people. This feature is currently under active development, and only portions have been implemented so far. -## Message editing - -`feature_message_editing` allows editing messages after they have been sent, -accessible from the reaction/context bar when hovering a message. -This feature is currently under active development, -and only portions have been implemented so far. - [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index e24d8ecf..27311da2 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -31,8 +31,7 @@ }, "features": { "feature_lazyloading": "enable", - "feature_reactions": "enable", - "feature_message_editing": "enable" + "feature_reactions": "enable" }, "enable_presence_by_hs_url": { "https://matrix.org": false From 06ce10b3515c234832928dfb89ca0834e3fd027b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 18 Jul 2019 10:48:43 +0100 Subject: [PATCH 18/22] Remove reactions feature flag from docs and config Part of https://github.com/vector-im/riot-web/issues/10282 --- config.sample.json | 3 +-- docs/labs.md | 6 ------ electron_app/riot.im/config.json | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config.sample.json b/config.sample.json index f0b85bbc..7e26d200 100644 --- a/config.sample.json +++ b/config.sample.json @@ -22,8 +22,7 @@ "showLabsSettings": false, "features": { "feature_groups": "labs", - "feature_pinning": "labs", - "feature_reactions": "labs" + "feature_pinning": "labs" }, "default_federate": true, "default_theme": "light", diff --git a/docs/labs.md b/docs/labs.md index 65b71b34..579bb1e1 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -29,10 +29,4 @@ Once enabled, send a custom state event to a room to set values: That's it. Now should see your new counter under the header. -## Reactions - -`feature_reactions` allows reacting to messages with emoji and displaying -reactions from other people. This feature is currently under active development, -and only portions have been implemented so far. - [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 27311da2..a995a4e9 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -30,8 +30,7 @@ } }, "features": { - "feature_lazyloading": "enable", - "feature_reactions": "enable" + "feature_lazyloading": "enable" }, "enable_presence_by_hs_url": { "https://matrix.org": false From 72f3f1afeefbaec59a9cf0b215eb92a7a71447b9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 18 Jul 2019 15:53:25 +0100 Subject: [PATCH 19/22] Upgrade to JS SDK 2.2.0 and React SDK 1.4.0 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 58621c73..5ba68312 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": "2.2.0-rc.2", - "matrix-react-sdk": "1.4.0-rc.3", + "matrix-js-sdk": "2.2.0", + "matrix-react-sdk": "1.4.0", "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 33415988..2140bdab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5847,10 +5847,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@2.2.0-rc.2: - version "2.2.0-rc.2" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0-rc.2.tgz#aeb2357c9ea69591657d0d6c0fba8fcbcf0e40c7" - integrity sha512-glT0/yV6+AypedNi7K0Xugjj0Q9bOQRVEbVfhO2O22ei+qqkCAUsGqGssCIumvfNh9QAh+OXCfn4goLFrANtew== +matrix-js-sdk@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0.tgz#c96a2caa4c92e5998443027579d7e76d4bcd4d21" + integrity sha512-gab7wuscgTKbXY5x136t9qSnDbOuq785ezd++NoFLEau0YjDos0YKolAm0TValUC9LY30CoVqqMfyPJ68CMezQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5871,10 +5871,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.4.0-rc.3: - version "1.4.0-rc.3" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0-rc.3.tgz#8f77586b32327e4a6f6c3eb56019f5e59813690a" - integrity sha512-93YWuT8vw65iOGHHE+nFrjGQbIOKks1UnSqjnYOESBnIvJsslLDOYhnqAHOyMdQJRxIA/eLrpVKEvBqf457xuw== +matrix-react-sdk@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0.tgz#dd7a6b9f73355174eeba37ce4ae4eb8bba98d57d" + integrity sha512-kZIkTU4tYNzOJX0hcWRWiyswuHJBP2svnbDg+GvCXFsDKZM566G3Hg5gU11QFVFAmQokO3DVazpQi6nlKt5dCg== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5901,7 +5901,7 @@ matrix-react-sdk@1.4.0-rc.3: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "2.3.2" - matrix-js-sdk "2.2.0-rc.2" + matrix-js-sdk "2.2.0" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 1bd846454c8d6faf42425169b558d4ea8d4fb928 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 18 Jul 2019 15:53:39 +0100 Subject: [PATCH 20/22] v1.3.0 --- 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 e45048c1..edf10ed2 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.3.0-rc.3", + "version": "1.3.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 096303955e194193425459328b7747f8e5e66565 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 18 Jul 2019 15:56:14 +0100 Subject: [PATCH 21/22] Prepare changelog for v1.3.0 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fabfe85..e74228e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [1.3.0](https://github.com/vector-im/riot-web/releases/tag/v1.3.0) (2019-07-18) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.3...v1.3.0) + + * Upgrade to React SDK 1.4.0 and JS SDK 2.2.0 + * Message editing and reactions features enabled + * Remove edits and reactions feature flags from docs and config + [\#10365](https://github.com/vector-im/riot-web/pull/10365) + Changes in [1.3.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.3) (2019-07-15) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.2...v1.3.0-rc.3) From 7d07642befbc17a9ec61e73916663d0cd9bc5ae6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 18 Jul 2019 15:56:14 +0100 Subject: [PATCH 22/22] v1.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ba68312..13f3249f 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.3.0-rc.3", + "version": "1.3.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {