From 4fced076b74e5e02966d1200d5859d8ea2d6d70e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Feb 2020 14:33:57 +0000 Subject: [PATCH 01/12] Upgrade matrix-js-sdk to 5.1.0-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e008efd8c0..2b34a21ee7 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "5.1.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index e9948b8f87..ee9b60abc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7595,6 +7595,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc" integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw== +matrix-js-sdk@5.1.0-rc.1: + version "5.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0-rc.1.tgz#48154133f1c8bc19557164a24535d6d45d1cf482" + integrity sha512-3pf8NOziyaldtJkYsas9Cq/b8TloGMY89KRA4tJLRDCdMrlBEJoQ4qb9MCmhS53Yb8N4ysI7qUUC21FtBryAVQ== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "5.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a998006842ae558f02819ca84fbaad43685cc10b" From a4d01a5f04e942a787badab2eff93ed047e83ea5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Feb 2020 14:34:56 +0000 Subject: [PATCH 02/12] Upgrade matrix-react-sdk to 2.2.0-rc.1 --- package.json | 2 +- yarn.lock | 73 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 2b34a21ee7..d6ec427622 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "5.1.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "2.2.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index ee9b60abc6..a555ab35e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2479,12 +2479,30 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= -buffer-from@^1.0.0: +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + +buffer-from@^1.0.0, buffer-from@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== @@ -2508,7 +2526,7 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -buffer@^5.1.0: +buffer@^5.1.0, buffer@^5.4.3: version "5.4.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz#3fbc9c69eb713d323e3fc1a895eee0710c072115" integrity sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A== @@ -3877,6 +3895,11 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" +dijkstrajs@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b" + integrity sha1-082BIh4+pAdCz83lVtTpnpjdxxs= + dir-glob@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" @@ -6506,7 +6529,7 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isarray@^2.0.5: +isarray@^2.0.1, isarray@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== @@ -7610,20 +7633,6 @@ matrix-js-sdk@5.1.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "5.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a998006842ae558f02819ca84fbaad43685cc10b" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7632,9 +7641,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 "2.1.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/b1a3d8ad63d570d638f858f715d09d63b664e0a3" +matrix-react-sdk@2.2.0-rc.1: + version "2.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.0-rc.1.tgz#02f94cbc99e5822db22928a3fc357e2fa8cb4b10" + integrity sha512-M7ldy6sC+vqYmFVxUGfufrKRiO2qHITvMeuJCsPVhdfZTgLwyJXCdXpxzXeHbTAGNa5ranfUiaOi7I60au1JUw== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7662,11 +7672,12 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "5.1.0-rc.1" minimist "^1.2.0" pako "^1.0.5" png-chunks-extract "^1.0.0" prop-types "^15.5.8" + qrcode "^1.4.4" qrcode-react "^0.1.16" qs "^6.6.0" react "^16.9.0" @@ -8916,6 +8927,11 @@ png-chunks-extract@^1.0.0: dependencies: crc-32 "^0.3.0" +pngjs@^3.3.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" + integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== + portfinder@^1.0.25: version "1.0.25" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca" @@ -9885,6 +9901,19 @@ qrcode-react@^0.1.16: dependencies: qr.js "0.0.0" +qrcode@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.4.4.tgz#f0c43568a7e7510a55efc3b88d9602f71963ea83" + integrity sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q== + dependencies: + buffer "^5.4.3" + buffer-alloc "^1.2.0" + buffer-from "^1.1.1" + dijkstrajs "^1.0.1" + isarray "^2.0.1" + pngjs "^3.3.0" + yargs "^13.2.4" + qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -12817,7 +12846,7 @@ yargs@13.2.4: y18n "^4.0.0" yargs-parser "^13.1.0" -yargs@^13.3.0: +yargs@^13.2.4, yargs@^13.3.0: version "13.3.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== From 00244d542889a1d9719c923b3e3f6ee55ef35ef0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Feb 2020 14:35:20 +0000 Subject: [PATCH 03/12] v1.5.11-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 3dc7c79b00..77e0ef8968 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.5.10", + "version": "1.5.11-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From b29a3721d2c304e889f134849bdaa21498c02dfa Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Feb 2020 14:37:19 +0000 Subject: [PATCH 04/12] Prepare changelog for v1.5.11-rc.1 --- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 652146c79b..16bf500a28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +Changes in [1.5.11-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.11-rc.1) (2020-02-26) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.10...v1.5.11-rc.1) + + * Upgrade to JS SDK 5.1.0-rc.1 and React SDK 2.2.0-rc.1 + * Change Windows signing to warning when missing token + [\#12523](https://github.com/vector-im/riot-web/pull/12523) + * Modernizr remove t3st/es6/contains + [\#12524](https://github.com/vector-im/riot-web/pull/12524) + * Switch out any eval-using Modernizr rules + [\#12519](https://github.com/vector-im/riot-web/pull/12519) + * Update from Weblate + [\#12522](https://github.com/vector-im/riot-web/pull/12522) + * Notify electron of language changes + [\#12487](https://github.com/vector-im/riot-web/pull/12487) + * Relax macOS notarisation check to print a warning + [\#12503](https://github.com/vector-im/riot-web/pull/12503) + * Clarify supported tier means desktop OSes + [\#12486](https://github.com/vector-im/riot-web/pull/12486) + * Use noreferrer in addition to noopener for edge case browsers + [\#12477](https://github.com/vector-im/riot-web/pull/12477) + * Document start / end composer shortcuts + [\#12466](https://github.com/vector-im/riot-web/pull/12466) + * Update from Weblate + [\#12480](https://github.com/vector-im/riot-web/pull/12480) + * Remove buildkite pipeline + [\#12464](https://github.com/vector-im/riot-web/pull/12464) + * Remove exec so release script continues + [\#12435](https://github.com/vector-im/riot-web/pull/12435) + * Use Persistent Storage where possible + [\#12425](https://github.com/vector-im/riot-web/pull/12425) + Changes in [1.5.10](https://github.com/vector-im/riot-web/releases/tag/v1.5.10) (2020-02-19) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.9...v1.5.10) From 03f63397ff444fd3d0d38451fdb21871a6f46134 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Feb 2020 14:37:19 +0000 Subject: [PATCH 05/12] v1.5.11-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d6ec427622..9a42004934 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.5.10", + "version": "1.5.11-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 749d7e8e4c33b2c92832f25a45650a38781937cd Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 28 Feb 2020 11:42:08 +0000 Subject: [PATCH 06/12] Remove will-navigate comment after Electron fix Electron 8.0.2 and later (which we're now using) resolves this issue with `will-navigate`. --- electron_app/src/webcontents-handler.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/electron_app/src/webcontents-handler.js b/electron_app/src/webcontents-handler.js index c95869007f..bbfb2e7da7 100644 --- a/electron_app/src/webcontents-handler.js +++ b/electron_app/src/webcontents-handler.js @@ -174,18 +174,6 @@ function onEditableContextMenu(ev, params) { module.exports = (webContents) => { webContents.on('new-window', onWindowOrNavigate); - // XXX: The below now does absolutely nothing because of - // https://github.com/electron/electron/issues/8841 - // Whilst this isn't a security issue since without - // node integration and with the sandbox, it should be - // no worse than opening the site in Chrome, it obviously - // means the user has to restart Riot to make it usable - // again (often unintuitive because it minimises to the - // system tray). We therefore need to be vigilant about - // putting target="_blank" on links in Riot (although - // we should generally be doing this anyway since links - // navigating you away from Riot in the browser is - // also annoying). webContents.on('will-navigate', onWindowOrNavigate); webContents.on('context-menu', function(ev, params) { From fb656ce8bdcb0cfe377ad80d30b7d6a3177b52e8 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 2 Mar 2020 11:09:06 +0000 Subject: [PATCH 07/12] Remove will-navigate as we expect it to be broken like pre-8.0.2 --- electron_app/src/webcontents-handler.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron_app/src/webcontents-handler.js b/electron_app/src/webcontents-handler.js index bbfb2e7da7..f0aaf4a4f1 100644 --- a/electron_app/src/webcontents-handler.js +++ b/electron_app/src/webcontents-handler.js @@ -174,7 +174,8 @@ function onEditableContextMenu(ev, params) { module.exports = (webContents) => { webContents.on('new-window', onWindowOrNavigate); - webContents.on('will-navigate', onWindowOrNavigate); + // XXX: https://github.com/vector-im/riot-web/issues/8247 + // webContents.on('will-navigate', onWindowOrNavigate); webContents.on('context-menu', function(ev, params) { if (params.linkURL || params.srcURL) { From e71dcacd2d1f7d66b33bfd7ea1f80595bdef14ad Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Mar 2020 17:47:32 +0000 Subject: [PATCH 08/12] Upgrade matrix-js-sdk to 5.1.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a42004934..7a53c99b8a 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "5.1.0-rc.1", + "matrix-js-sdk": "5.1.0", "matrix-react-sdk": "2.2.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index a555ab35e5..83f6691e14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7618,6 +7618,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz#6dff66c99d55ecf739ca53c492e626f1d12a33cc" integrity sha512-pWB896KPGSGkp1XtyzRBftpTzwSOL0Gfk0wLvxt4f2mgzjY19o0LxJ3U25vNWTzsh7da+KTbuXQoQ3lOJZ8WHw== +matrix-js-sdk@5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0.tgz#9b3b02af227ecc2d0cc35fb7312c92b8a6754293" + integrity sha512-IGRq5iACiKp3iIxAghwtdBPrbdgORowc0i8YuIMkZZMpRJDXnNaudt2BFwyQdukV7gvzz7F0sfxBUerySfOnKA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@5.1.0-rc.1: version "5.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0-rc.1.tgz#48154133f1c8bc19557164a24535d6d45d1cf482" From 620414187f34af9e690352596a1344ea55013bcd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Mar 2020 17:47:53 +0000 Subject: [PATCH 09/12] Upgrade matrix-react-sdk to 2.2.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 7a53c99b8a..40767e3649 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "5.1.0", - "matrix-react-sdk": "2.2.0-rc.1", + "matrix-react-sdk": "2.2.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 83f6691e14..da829520e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7633,21 +7633,6 @@ matrix-js-sdk@5.1.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@5.1.0-rc.1: - version "5.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0-rc.1.tgz#48154133f1c8bc19557164a24535d6d45d1cf482" - integrity sha512-3pf8NOziyaldtJkYsas9Cq/b8TloGMY89KRA4tJLRDCdMrlBEJoQ4qb9MCmhS53Yb8N4ysI7qUUC21FtBryAVQ== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7656,10 +7641,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.2.0-rc.1: - version "2.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.0-rc.1.tgz#02f94cbc99e5822db22928a3fc357e2fa8cb4b10" - integrity sha512-M7ldy6sC+vqYmFVxUGfufrKRiO2qHITvMeuJCsPVhdfZTgLwyJXCdXpxzXeHbTAGNa5ranfUiaOi7I60au1JUw== +matrix-react-sdk@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.0.tgz#72f719b4d046a28d44188c03817f5b3b139bb8d4" + integrity sha512-hw7ok+yrRTdD3mt8rQc+kCrctzsGDaS1dEYI+HdBhNQxMing1gavZ61UU6kWB5gB1S6swvZ96q07sO14NosgnA== dependencies: "@babel/runtime" "^7.8.3" blueimp-canvas-to-blob "^3.5.0" @@ -7687,7 +7672,7 @@ matrix-react-sdk@2.2.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "5.1.0-rc.1" + matrix-js-sdk "5.1.0" minimist "^1.2.0" pako "^1.0.5" png-chunks-extract "^1.0.0" From 8710f7d1967f7062539d6602a714fd2f4b97c2f6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Mar 2020 17:47:58 +0000 Subject: [PATCH 10/12] v1.5.11 --- 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 77e0ef8968..ed75a56ce0 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.5.11-rc.1", + "version": "1.5.11", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 0c4048484ecf767335d11094b8d8a2e34aa727d7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Mar 2020 17:51:00 +0000 Subject: [PATCH 11/12] Prepare changelog for v1.5.11 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16bf500a28..684c82f484 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.5.11](https://github.com/vector-im/riot-web/releases/tag/v1.5.11) (2020-03-02) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.11-rc.1...v1.5.11) + + * Upgrade to JS SDK 5.1.0 and React SDK 2.2.0 + * Fix SSO flows for Electron 8.0.2 by disabling will-navigate + [\#12585](https://github.com/vector-im/riot-web/pull/12585) + Changes in [1.5.11-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.11-rc.1) (2020-02-26) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.10...v1.5.11-rc.1) From 43b70bf7206540e2cc82ec98631493bdc1c85057 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Mar 2020 17:51:01 +0000 Subject: [PATCH 12/12] v1.5.11 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40767e3649..4d819671fe 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.5.11-rc.1", + "version": "1.5.11", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {