From 974da9947cdaea1e64f13868c23492418c413fd7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 12 Jun 2019 12:10:37 +0100 Subject: [PATCH 01/12] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 96458d7b..2a2f892c 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.0.0", - "matrix-react-sdk": "1.2.1", + "matrix-js-sdk": "2.0.1-rc.1", + "matrix-react-sdk": "1.2.2-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 a29e6480..8519d24a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5728,10 +5728,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.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== +matrix-js-sdk@2.0.1-rc.1: + version "2.0.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1-rc.1.tgz#2590d6741d74af6b047e362eeea1b9a76c9c2143" + integrity sha512-t4EIK3xLiGdo8HrQeXYO58iw1e/959gidMvKfup8Pw8PJbRRQWXTe4DD0/Qytzq/zgbrx+1L4NxxceOzzwiwiw== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5752,10 +5752,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -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== +matrix-react-sdk@1.2.2-rc.1: + version "1.2.2-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2-rc.1.tgz#b1644b007b2f41261a424d34625bfdd4e822a802" + integrity sha512-d66X8xbcGqAijx8gFbLh2+8jaA3Q124nTf+BfjHQQP3wuOuC5+n/cN/ZX/HBnwEOAzo3b1hsyxtSSqTDIDdgmg== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5782,7 +5782,7 @@ matrix-react-sdk@1.2.1: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "2.0.0" + matrix-js-sdk "2.0.1-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From b75138370207cd11f6473bcadd45355406d31eec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 12 Jun 2019 12:11:12 +0100 Subject: [PATCH 02/12] v1.2.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 b6107559..4f6baf50 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.1", + "version": "1.2.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From a413621efcbd26b98bbb71cfbf63fa72acb02daa Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 12 Jun 2019 12:12:16 +0100 Subject: [PATCH 03/12] Prepare changelog for v1.2.2-rc.1 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ba57244..5e8973bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +Changes in [1.2.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.1) (2019-06-12) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.1...v1.2.2-rc.1) + + * Update from Weblate + [\#10012](https://github.com/vector-im/riot-web/pull/10012) + * Add funding details for GitHub sponsor button + [\#9982](https://github.com/vector-im/riot-web/pull/9982) + * Do not fail on server liveliness checks during startup + [\#9960](https://github.com/vector-im/riot-web/pull/9960) + * Hide guest functions on the welcome page if not logged in + [\#9957](https://github.com/vector-im/riot-web/pull/9957) + * Add Albanian and West Flemish languages + [\#9953](https://github.com/vector-im/riot-web/pull/9953) + * Update from Weblate + [\#9951](https://github.com/vector-im/riot-web/pull/9951) + * Add docs for defaultCountryCode + [\#9927](https://github.com/vector-im/riot-web/pull/9927) + * Use the user's pre-existing HS when config validation fails + [\#9892](https://github.com/vector-im/riot-web/pull/9892) + * Low bandwidth mode + [\#9909](https://github.com/vector-im/riot-web/pull/9909) + * Fix Twemoji loading on Windows dev machines + [\#9869](https://github.com/vector-im/riot-web/pull/9869) + * Base Docker image on nginx:alpine, not the larger nginx:latest + [\#9848](https://github.com/vector-im/riot-web/pull/9848) + * Validate homeserver configuration prior to loading the app + [\#9779](https://github.com/vector-im/riot-web/pull/9779) + * Show resolved homeserver configuration on the mobile guide + [\#9726](https://github.com/vector-im/riot-web/pull/9726) + * Flag the validated config as the default config + [\#9721](https://github.com/vector-im/riot-web/pull/9721) + * Clarify comment on is_url and hs_url handling + [\#9719](https://github.com/vector-im/riot-web/pull/9719) + * Validate default homeserver config before loading the app + [\#9496](https://github.com/vector-im/riot-web/pull/9496) + 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) From 9af5aea687853a78754a14ec27416e72b41c5133 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 12 Jun 2019 12:12:17 +0100 Subject: [PATCH 04/12] v1.2.2-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2a2f892c..cea7c695 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.1", + "version": "1.2.2-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 589aa19246b18051c59fa84b6242bf3be7178097 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jun 2019 15:57:30 +0100 Subject: [PATCH 05/12] js-sdk & react-sdk rc.2 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index cea7c695..152d7fad 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.0.1-rc.1", - "matrix-react-sdk": "1.2.2-rc.1", + "matrix-js-sdk": "2.0.1-rc.2", + "matrix-react-sdk": "1.2.2-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 8519d24a..706a6325 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5728,10 +5728,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.0.1-rc.1: - version "2.0.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1-rc.1.tgz#2590d6741d74af6b047e362eeea1b9a76c9c2143" - integrity sha512-t4EIK3xLiGdo8HrQeXYO58iw1e/959gidMvKfup8Pw8PJbRRQWXTe4DD0/Qytzq/zgbrx+1L4NxxceOzzwiwiw== +matrix-js-sdk@2.0.1-rc.2: + version "2.0.1-rc.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1-rc.2.tgz#6a00e4264f7e27a6f71a25ee9cbd935fbfbbf759" + integrity sha512-mq93SfeI9cc+BPfjNQKNzdLmq7l3BgFos8fhMt9ToLJB/wEg4xJXU0Nc8+31dDd65IDa4tGSyyCL4mRtpT6Nmw== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5752,10 +5752,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.2.2-rc.1: - version "1.2.2-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2-rc.1.tgz#b1644b007b2f41261a424d34625bfdd4e822a802" - integrity sha512-d66X8xbcGqAijx8gFbLh2+8jaA3Q124nTf+BfjHQQP3wuOuC5+n/cN/ZX/HBnwEOAzo3b1hsyxtSSqTDIDdgmg== +matrix-react-sdk@1.2.2-rc.2: + version "1.2.2-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2-rc.2.tgz#2735ef99265cdf89e95b491cf403822c626180eb" + integrity sha512-uvc4pwj0B2FJs83pJ2mhxOUNluZ3oZrx8XQAi0u/N1grVCNQH3bsR1+0ftiHRntt54sq/j8wVGfxkuFgyXlhZA== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5782,7 +5782,7 @@ matrix-react-sdk@1.2.2-rc.1: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "2.0.1-rc.1" + matrix-js-sdk "2.0.1-rc.2" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From a86f1e8a900b3dfe27ba42341466d0e3604f4a87 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jun 2019 15:58:36 +0100 Subject: [PATCH 06/12] v1.2.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 4f6baf50..5bce6fd3 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.2-rc.1", + "version": "1.2.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 290a99ba85a82e4a25c2a4d66d55b2ee3cc5033e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jun 2019 16:02:21 +0100 Subject: [PATCH 07/12] Prepare changelog for v1.2.2-rc.2 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e8973bf..248d894a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.2.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.2) (2019-06-18) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.1...v1.2.2-rc.2) + + * Update to react-sdk and js-sdk rc.2 for registration fixes, + redaction local echo fix and removing unnecessary calls + to the integration manager. + Changes in [1.2.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.1) (2019-06-12) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.1...v1.2.2-rc.1) From db77d91500274b99c1730e7304d2fcacb98059e6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 18 Jun 2019 16:02:21 +0100 Subject: [PATCH 08/12] v1.2.2-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 152d7fad..4ecf5d23 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.2-rc.1", + "version": "1.2.2-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 48b6f8c954a9e202fcdce306d5fb7c9bf4afd9d5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 19 Jun 2019 15:55:02 +0100 Subject: [PATCH 09/12] Released js-sdk & react-sdk --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 4ecf5d23..6eba7b6f 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.0.1-rc.2", - "matrix-react-sdk": "1.2.2-rc.2", + "matrix-js-sdk": "2.0.1", + "matrix-react-sdk": "1.2.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 706a6325..155b7175 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5728,10 +5728,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.0.1-rc.2: - version "2.0.1-rc.2" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1-rc.2.tgz#6a00e4264f7e27a6f71a25ee9cbd935fbfbbf759" - integrity sha512-mq93SfeI9cc+BPfjNQKNzdLmq7l3BgFos8fhMt9ToLJB/wEg4xJXU0Nc8+31dDd65IDa4tGSyyCL4mRtpT6Nmw== +matrix-js-sdk@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1.tgz#e9691c7fc142793aa8cd79e92d45698bcc5da8c4" + integrity sha512-+yj9fBdIE65v1+46TL/eLQGohtNZGBEtOD1n3nTAVBMogyVb2bpUWnqTli0ghiOCG9MKq7tWi+G4bDBTABxuxA== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5752,10 +5752,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.2.2-rc.2: - version "1.2.2-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2-rc.2.tgz#2735ef99265cdf89e95b491cf403822c626180eb" - integrity sha512-uvc4pwj0B2FJs83pJ2mhxOUNluZ3oZrx8XQAi0u/N1grVCNQH3bsR1+0ftiHRntt54sq/j8wVGfxkuFgyXlhZA== +matrix-react-sdk@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2.tgz#09e9eae3ec3b9ef324934b69275066c667fa8a1b" + integrity sha512-K7cBzturO5+4jWWnqtuqfqHrZXuq6ckyWY/UxbNbCdsvRsO4UZz7tGBy9QSEMKhiHkqkgCaOWfSjgFgjFmCrjQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5782,7 +5782,7 @@ matrix-react-sdk@1.2.2-rc.2: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "2.0.1-rc.2" + matrix-js-sdk "2.0.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 80262314f3889c99c56f279959817cb61eabdfa3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 19 Jun 2019 15:59:10 +0100 Subject: [PATCH 10/12] v1.2.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 5bce6fd3..7c348b88 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.2-rc.2", + "version": "1.2.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 5f7ee3f4ee103197f75f902dec0522bc51a80e89 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 19 Jun 2019 16:00:42 +0100 Subject: [PATCH 11/12] Prepare changelog for v1.2.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 248d894a..411627cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.2.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2) (2019-06-19) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.2...v1.2.2) + + No changes since rc.2 + Changes in [1.2.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2-rc.2) (2019-06-18) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.1...v1.2.2-rc.2) From 672cf1a46ed84766a5d772169d50afacba23286d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 19 Jun 2019 16:00:42 +0100 Subject: [PATCH 12/12] v1.2.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6eba7b6f..51b90533 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.2-rc.2", + "version": "1.2.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {