From 2356524d1c0bd67ae3493a8f00ff35646244ee4d Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 13:55:06 +0100 Subject: [PATCH 01/13] bump matrix-js-sdk and matrix-react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a3c0e6845e..fa113a8e09 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.11.0", - "matrix-react-sdk": "0.13.4", + "matrix-js-sdk": "0.11.1-rc.1", + "matrix-react-sdk": "0.13.5-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 81dfe506ac7d175757d02a570b8ffa8cae6996d2 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 14:42:14 +0100 Subject: [PATCH 02/13] v0.16.5-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 7a508cd273..56306f40fc 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.16.4", + "version": "0.16.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From f3214b7891736d1d571d5c6407b84213fe2bb88a Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 14:43:05 +0100 Subject: [PATCH 03/13] Prepare changelog for v0.16.5-rc.1 --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db1f959378..0658e08946 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +Changes in [0.16.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.5-rc.1) (2018-09-27) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4...v0.16.5-rc.1) + + * Update from Weblate. + [\#7395](https://github.com/vector-im/riot-web/pull/7395) + * Reduce the number of terminals required to build riot-web to 1 + [\#7355](https://github.com/vector-im/riot-web/pull/7355) + * Small typo in release notes v0.16.3 + [\#7274](https://github.com/vector-im/riot-web/pull/7274) + Changes in [0.16.4](https://github.com/vector-im/riot-web/releases/tag/v0.16.4) (2018-09-10) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4-rc.1...v0.16.4) From 44791a65b8968cdcad39cd6b709798fc4d2cb864 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 14:46:42 +0100 Subject: [PATCH 04/13] Revert "v0.16.5-rc.1" This reverts commit 81dfe506ac7d175757d02a570b8ffa8cae6996d2. --- 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 56306f40fc..7a508cd273 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.16.5-rc.1", + "version": "0.16.4", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 582b67c42e68851a08e31c4cc2b4eb68d1570179 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 14:48:40 +0100 Subject: [PATCH 05/13] v0.16.5-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 7a508cd273..56306f40fc 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.16.4", + "version": "0.16.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 57cdd26d4de89f1546a1cd59d39cf120bc0914d2 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 27 Sep 2018 14:50:38 +0100 Subject: [PATCH 06/13] v0.16.5-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa113a8e09..a43074fc52 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.16.4", + "version": "0.16.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From a2c7ef542401514efab75199d88a9e5c4123730b Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 27 Sep 2018 18:19:33 +0100 Subject: [PATCH 07/13] Don't show custom server bit on matrix.org On mobile guide Part of https://github.com/vector-im/riot-web/issues/7378 --- src/vector/mobile_guide/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index b2d007ac53..2c4785f390 100644 --- a/src/vector/mobile_guide/index.js +++ b/src/vector/mobile_guide/index.js @@ -13,6 +13,7 @@ async function initPage() { if (config && config['default_hs_url']) { hsUrl = config['default_hs_url']; } + if (hsUrl && !hsUrl.endsWith('/')) hsUrl += '/'; if (hsUrl && hsUrl !== 'https://matrix.org/') { document.getElementById('step2_container').style.display = 'block'; document.getElementById('hs_url').innerHTML = hsUrl; From 2a8c7b260a434793c9a3cc71cfaecbe22077eca9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 28 Sep 2018 11:23:46 +0100 Subject: [PATCH 08/13] Don't show mobile guide if deep linking Other part of https://github.com/vector-im/riot-web/issues/7378 --- src/vector/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vector/index.js b/src/vector/index.js index ff6b12856c..1d873f2081 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -251,7 +251,9 @@ async function loadApp() { // don't try to redirect to the native apps if we're // verifying a 3pid (but after we've loaded the config) - const preventRedirect = Boolean(fragparts.params.client_secret); + // or if the user is following a deep link + // (https://github.com/vector-im/riot-web/issues/7378) + const preventRedirect = fragparts.params.client_secret || fragparts.location.length > 0; if (!preventRedirect) { const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; From b9688acdf5bfe5111fbd9d471a23cbdf30ca1ee9 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 1 Oct 2018 16:16:25 +0200 Subject: [PATCH 09/13] bump both SDKs to latest version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a43074fc52..ed06f56ab7 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.11.1-rc.1", - "matrix-react-sdk": "0.13.5-rc.1", + "matrix-js-sdk": "0.11.1", + "matrix-react-sdk": "0.13.5", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 957fde964bbf6d3d59c8b3dd45c0f6c7daa8da50 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 1 Oct 2018 16:48:52 +0200 Subject: [PATCH 10/13] v0.16.5 --- 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 56306f40fc..206811e323 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.16.5-rc.1", + "version": "0.16.5", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 5fc53f19f4bdf9f24044cd003af36656cb839c25 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 1 Oct 2018 16:51:39 +0200 Subject: [PATCH 11/13] Prepare changelog for v0.16.5 --- CHANGELOG.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0658e08946..26b6f881c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5) + + * Don't show mobile guide if deep linking + [\#7415](https://github.com/vector-im/riot-web/pull/7415) + * Don't show custom server bit on matrix.org + [\#7408](https://github.com/vector-im/riot-web/pull/7408) + Changes in [0.16.5-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.5-rc.1) (2018-09-27) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4...v0.16.5-rc.1) @@ -235,7 +244,7 @@ Changes in [0.15.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.1 ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.1...v0.15.0-rc.2) - * Update to matrix-react-sdk 0.12.4-rc.2 + * Update to matrix-react-sdk 0.12.4-rc.2 Changes in [0.15.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.1) (2018-05-09) ====================================================================================================== @@ -339,7 +348,7 @@ Changes in [0.14.0-rc.6](https://github.com/vector-im/riot-web/releases/tag/v0.1 ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0-rc.5...v0.14.0-rc.6) - * Bump react-sdk to [rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6) + * Bump react-sdk to [rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6) Changes in [0.14.0-rc.5](https://github.com/vector-im/riot-web/releases/tag/v0.14.0-rc.5) (2018-04-09) ====================================================================================================== From 712d020dfaa07820d3ace99de11cacc5f10b7f72 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 1 Oct 2018 16:51:39 +0200 Subject: [PATCH 12/13] v0.16.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed06f56ab7..5409da7f96 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.16.5-rc.1", + "version": "0.16.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From e3557539004b36d670c7895017395e519c95ba52 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 1 Oct 2018 17:01:07 +0200 Subject: [PATCH 13/13] also update package-lock file --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index ab3b6f0dde..c3987416ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "0.16.4", + "version": "0.16.5", "lockfileVersion": 1, "requires": true, "dependencies": {