From f07e3c3b2502d50ac8d5a0a248cbdbb65e0723b3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 20 Nov 2019 18:31:32 +0000 Subject: [PATCH 01/12] react-sdk & js-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 27 +++++++++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 5af5963b22..e86825f1fa 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.4.3", - "matrix-react-sdk": "1.7.2", + "matrix-js-sdk": "2.4.4-rc.1", + "matrix-react-sdk": "1.7.3-rc.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 3a7cc580da..b781ed8cb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3337,7 +3337,7 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -escape-html@~1.0.3: +escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= @@ -4259,6 +4259,11 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + glob2base@^0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" @@ -5955,10 +5960,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.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.3.tgz#23b78cc707a02eb0ce7eecb3aa50129e46dd5b6e" - integrity sha512-8qTqILd/NmTWF24tpaxmDIzkTk/bZhPD5N8h69PlvJ5Y6kMFctpRj+Tud5zZjl5/yhO07+g+JCyDzg+AagiM/A== +matrix-js-sdk@2.4.4-rc.1: + version "2.4.4-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4-rc.1.tgz#5fd33fd11be9eea23cd0d0b8eb79da7a4b6253bf" + integrity sha512-Kn94zZMXh2EmihYL3lWNp2lpT7RtqcaUxjkP7H9Mr113swSOXtKr8RWMrvopAIguC1pcLzL+lCk+N8rrML2A4Q== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5979,10 +5984,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.2.tgz#4c16fa6c2d188311ecb5163773dfdf7ca92b7ecc" - integrity sha512-CWCr41sRBeUChlvec6eJxmY02g+Re6PN3lt9tR7TkqGKyUu++Y72WPfirM+0t11QVtVyZ5Wo1WIzpropLBFyYw== +matrix-react-sdk@1.7.3-rc.1: + version "1.7.3-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.3-rc.1.tgz#ef109b2e843c803bad0aff459004125b00c752ec" + integrity sha512-fLoeoi5jv8aDUpZvWLI6wQdmYdex027/J84lMX8+VoaCzUl4d3dTKaA1dEoIsVVKnfsvPDarnMZgBSr2Aje48g== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5998,6 +6003,7 @@ matrix-react-sdk@1.7.2: diff-match-patch "^1.0.4" emojibase-data "^4.0.2" emojibase-regex "^3.0.0" + escape-html "^1.0.3" file-saver "^1.3.3" filesize "3.5.6" flux "2.1.1" @@ -6007,13 +6013,14 @@ matrix-react-sdk@1.7.2: gemini-scrollbar "github:matrix-org/gemini-scrollbar#91e1e566" gfm.css "^1.1.1" glob "^5.0.14" + glob-to-regexp "^0.4.1" highlight.js "^9.15.8" is-ip "^2.0.0" isomorphic-fetch "^2.2.1" linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "2.4.3" + matrix-js-sdk "2.4.4-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 46a6dbe9b83b857d2a8ce9455c05d3e86d6c2c8f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 20 Nov 2019 18:31:59 +0000 Subject: [PATCH 02/12] v1.5.4-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 2b75dadb96..ee9b9f10b3 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.3", + "version": "1.5.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 2a564884e7966dc02a310e1d54af1dbe941f9eb2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 20 Nov 2019 18:32:56 +0000 Subject: [PATCH 03/12] Prepare changelog for v1.5.4-rc.1 --- CHANGELOG.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81073c98bc..ecdb6e0c4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,46 @@ +Changes in [1.5.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.4-rc.1) (2019-11-20) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.3...v1.5.4-rc.1) + + * Add doc for custom themes + [\#11444](https://github.com/vector-im/riot-web/pull/11444) + * Use new theme API in react-sdk + [\#11442](https://github.com/vector-im/riot-web/pull/11442) + * preload warning triangle + [\#11441](https://github.com/vector-im/riot-web/pull/11441) + * Update from Weblate + [\#11440](https://github.com/vector-im/riot-web/pull/11440) + * Add entitlements file for mic & camera permissions on macOS + [\#11435](https://github.com/vector-im/riot-web/pull/11435) + * Fix error/exception in electron signing script + [\#11429](https://github.com/vector-im/riot-web/pull/11429) + * Merge the `feature_user_info_panel` flag into `feature_dm_verification` + [\#11426](https://github.com/vector-im/riot-web/pull/11426) + * Let the user's homeserver config override the build config + [\#11409](https://github.com/vector-im/riot-web/pull/11409) + * Add cross-signing labs flag to develop and document + [\#11408](https://github.com/vector-im/riot-web/pull/11408) + * Update from Weblate + [\#11405](https://github.com/vector-im/riot-web/pull/11405) + * Trigger a theme change on startup, not just a tint change + [\#11381](https://github.com/vector-im/riot-web/pull/11381) + * Perform favicon updates twice in Chrome + [\#11375](https://github.com/vector-im/riot-web/pull/11375) + * Add labs documentation for Mjolnir + [\#11275](https://github.com/vector-im/riot-web/pull/11275) + * Add description of user info feature in labs doc + [\#11360](https://github.com/vector-im/riot-web/pull/11360) + * Update from Weblate + [\#11359](https://github.com/vector-im/riot-web/pull/11359) + * Add DM verification feature to labs.md + [\#11356](https://github.com/vector-im/riot-web/pull/11356) + * Add feature_dm_verification to labs + [\#11355](https://github.com/vector-im/riot-web/pull/11355) + * Document feature flag process + [\#11341](https://github.com/vector-im/riot-web/pull/11341) + * Remove unused feature flags + [\#11343](https://github.com/vector-im/riot-web/pull/11343) + Changes in [1.5.3](https://github.com/vector-im/riot-web/releases/tag/v1.5.3) (2019-11-06) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.2...v1.5.3) From fa5475f1c054b36071f8af0281d7f20f3461a8f9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 20 Nov 2019 18:32:56 +0000 Subject: [PATCH 04/12] v1.5.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e86825f1fa..d765ea1e57 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.3", + "version": "1.5.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 1cebd3dcd1806732b537c410a0f190d21b24bc4b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 22 Nov 2019 17:27:27 +0000 Subject: [PATCH 05/12] react-sdk rc.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d765ea1e57..afc304284b 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "2.4.4-rc.1", - "matrix-react-sdk": "1.7.3-rc.1", + "matrix-react-sdk": "1.7.3-rc.2", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index b781ed8cb8..89839299dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5984,10 +5984,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.3-rc.1: - version "1.7.3-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.3-rc.1.tgz#ef109b2e843c803bad0aff459004125b00c752ec" - integrity sha512-fLoeoi5jv8aDUpZvWLI6wQdmYdex027/J84lMX8+VoaCzUl4d3dTKaA1dEoIsVVKnfsvPDarnMZgBSr2Aje48g== +matrix-react-sdk@1.7.3-rc.2: + version "1.7.3-rc.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.3-rc.2.tgz#410df12d3fe61087c64f534174e06cfc7a840fc0" + integrity sha512-znnNPbYliV1lHwWBBR3hQkwzlxYzeXsAp0MWAm0bLGkcoj5pDbqIbfzVBRuqQf1vIc7b/Zr2V6I+TG31fNy3+g== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" From ff86c8acc7779505c8d6fd95ca1228cb5d2d2ccf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 22 Nov 2019 17:28:03 +0000 Subject: [PATCH 06/12] v1.5.4-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 ee9b9f10b3..9e861fe8bf 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.4-rc.1", + "version": "1.5.4-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 9f3cd93bd693ba43b31cb27337b72f2e3228d512 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 22 Nov 2019 17:30:04 +0000 Subject: [PATCH 07/12] Prepare changelog for v1.5.4-rc.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecdb6e0c4b..8bc811b762 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.5.4-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.4-rc.2) (2019-11-22) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4-rc.1...v1.5.4-rc.2) + + * react-sdk rc.2 to fix an error in Safari and some cosmetic + bugs + Changes in [1.5.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.4-rc.1) (2019-11-20) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.3...v1.5.4-rc.1) From 7b59379d293e708cb550ef0c90f93a264c212e62 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 22 Nov 2019 17:30:05 +0000 Subject: [PATCH 08/12] v1.5.4-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index afc304284b..60900ddb7f 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.4-rc.1", + "version": "1.5.4-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 83591b45673359c5a8727e701a92cbb199dfce42 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 25 Nov 2019 13:36:37 +0000 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 60900ddb7f..2e051abff3 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.4.4-rc.1", - "matrix-react-sdk": "1.7.3-rc.2", + "matrix-js-sdk": "2.4.4", + "matrix-react-sdk": "1.7.3", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 89839299dc..3dd0fdeaf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5960,10 +5960,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.4.4-rc.1: - version "2.4.4-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4-rc.1.tgz#5fd33fd11be9eea23cd0d0b8eb79da7a4b6253bf" - integrity sha512-Kn94zZMXh2EmihYL3lWNp2lpT7RtqcaUxjkP7H9Mr113swSOXtKr8RWMrvopAIguC1pcLzL+lCk+N8rrML2A4Q== +matrix-js-sdk@2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4.tgz#d5e2d6fbe938c4275a1423a5f09330d33517ce3f" + integrity sha512-wSaRFvhWvwEzVaEkyBGo5ReumvaM5OrC1MJ6SVlyoLwH/WRPEXcUlu+rUNw5TFVEAH4TAVHXf/SVRBiR0j5nSQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5984,10 +5984,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.3-rc.2: - version "1.7.3-rc.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.3-rc.2.tgz#410df12d3fe61087c64f534174e06cfc7a840fc0" - integrity sha512-znnNPbYliV1lHwWBBR3hQkwzlxYzeXsAp0MWAm0bLGkcoj5pDbqIbfzVBRuqQf1vIc7b/Zr2V6I+TG31fNy3+g== +matrix-react-sdk@1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.3.tgz#f3f64dc77eea64b77ba3d574847bc03146d421a3" + integrity sha512-XSZSj4GWhxhoEoCIHGyMwBKdmcHJrKB9hToHJQTI0OL/x8+ErTLVAgJYW8hvR16l5lXGzSsYWDOfQOTbKK1tLQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6020,7 +6020,7 @@ matrix-react-sdk@1.7.3-rc.2: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "2.4.4-rc.1" + matrix-js-sdk "2.4.4" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 607c37adfdfbc658279a9e583583739b2f8e9b1f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 25 Nov 2019 13:37:12 +0000 Subject: [PATCH 10/12] v1.5.4 --- 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 9e861fe8bf..69e810c454 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.4-rc.2", + "version": "1.5.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From b0d004d7166cd960d2849fc9048219dbbb3004e1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 25 Nov 2019 13:40:05 +0000 Subject: [PATCH 11/12] Prepare changelog for v1.5.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bc811b762..ae57e90de7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.5.4](https://github.com/vector-im/riot-web/releases/tag/v1.5.4) (2019-11-25) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4-rc.2...v1.5.4) + + * No changes since rc.2 + Changes in [1.5.4-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.5.4-rc.2) (2019-11-22) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4-rc.1...v1.5.4-rc.2) From bf26ec9d1acdc6444ae2b59931aef987419b7067 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 25 Nov 2019 13:40:05 +0000 Subject: [PATCH 12/12] v1.5.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2e051abff3..85607f7502 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.4-rc.2", + "version": "1.5.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {