From 858d71218ca633066775c791084fa5750a7f9594 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 21 Jul 2021 18:11:06 -0600 Subject: [PATCH 01/10] Remove voice messages labs flag docs For https://github.com/matrix-org/matrix-react-sdk/pull/6437 --- docs/labs.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index 1051f2959..f880e3cd5 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -125,14 +125,6 @@ or feedback for this functionality at this time. Allows users to receive encrypted messages by creating a device that is stored encrypted on the server, as described in [MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697). -## Voice messages (`feature_voice_messages`) - -Offers a way to send more time-sensitive information through the power of voice. When enabled, use the microphone -icon on the lower right to start recording your message. You will have a chance to review after you're done recording, -and if it sounds fine then send it off for the rest of the room to hear. - -Voice messages are automatically downloaded to ensure they are ready for playback as soon as possible. - ## Do not disturb (`feature_dnd`) Enables UI for turning on "do not disturb" mode for the current device. When DND mode is engaged, popups From c04daeaa209b1b2ef6ae7d0b9feb83b9a8c19b4d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 27 Jul 2021 16:06:42 +0100 Subject: [PATCH 02/10] Upgrade matrix-js-sdk to 12.2.0-rc.1 --- package.json | 2 +- yarn.lock | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0043362eb..e86b202e7 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "12.2.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index a98da911a..0e36f2951 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7293,7 +7293,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@12.1.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": +matrix-js-sdk@12.1.0: version "12.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e85038e88898a3a1be432fc3d53d540c8250c021" dependencies: @@ -7308,6 +7308,22 @@ matrix-js-sdk@12.1.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": request "^2.88.2" unhomoglyph "^1.0.6" +matrix-js-sdk@12.2.0-rc.1: + version "12.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.2.0-rc.1.tgz#fbbb462dd98c64edb6f4bcd5403d802c98625f01" + integrity sha512-aHxL6wsLRrnJMLJ17V1IVOm2dCGOA8jHWZi43xNzkdsmQeU9UiUmUcT9RxsYcc7YhNv8ZaZ1plIwvBmoz3H4mA== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + 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" From e6e701f5e94aa193e3375eb363b1760256558f48 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 27 Jul 2021 16:07:21 +0100 Subject: [PATCH 03/10] Upgrade matrix-react-sdk to 3.27.0-rc.1 --- package.json | 2 +- yarn.lock | 24 +++++------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index e86b202e7..d2bb2598c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "12.2.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.27.0-rc.1", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 0e36f2951..382257fd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7293,21 +7293,6 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@12.1.0: - version "12.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e85038e88898a3a1be432fc3d53d540c8250c021" - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-js-sdk@12.2.0-rc.1: version "12.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.2.0-rc.1.tgz#fbbb462dd98c64edb6f4bcd5403d802c98625f01" @@ -7332,9 +7317,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 "3.26.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/80e64601a970d972d02df286abb8de3d3f231eba" +matrix-react-sdk@3.27.0-rc.1: + version "3.27.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.27.0-rc.1.tgz#acd4ee14759b3ff49393257743a5189abf2bbfc5" + integrity sha512-vQnXsRYM9tAVndiDEkVf2gT7lAnZZGrp8leBxcH91WIGKGVrWO1RvBBW/utYF+fGD2Kn27xrq9C05ZLeu9wLFA== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7362,7 +7348,7 @@ matrix-mock-request@^1.2.3: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "12.1.0" + matrix-js-sdk "12.2.0-rc.1" matrix-widget-api "^0.1.0-beta.15" minimist "^1.2.5" opus-recorder "^8.0.3" From 49dfa4ee6cb4857a14a2e0e4c26607ec169c151c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 27 Jul 2021 16:10:25 +0100 Subject: [PATCH 04/10] Prepare changelog for v1.7.34-rc.1 --- CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5a708b6e..92b87c977 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,47 @@ +Changes in [1.7.34-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.34-rc.1) (2021-07-27) +========================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33...v1.7.34-rc.1) + + * Translations update from Weblate + [\#18260](https://github.com/vector-im/element-web/pull/18260) + * Update ESLint config + [\#18236](https://github.com/vector-im/element-web/pull/18236) + * Update matrix-org-eslint-plugin and tighten max warning limit + [\#18207](https://github.com/vector-im/element-web/pull/18207) + * Update webpack path for new voice message worker location + [\#18187](https://github.com/vector-im/element-web/pull/18187) + * yarn upgrade + [\#18150](https://github.com/vector-im/element-web/pull/18150) + * Conform to new typescript eslint rules + [\#18065](https://github.com/vector-im/element-web/pull/18065) + * Add the Matrix Space to the translations guide + [\#18102](https://github.com/vector-im/element-web/pull/18102) + * Update eslint-plugin-matrix-org + [\#18058](https://github.com/vector-im/element-web/pull/18058) + * Fix browser history getting stuck looping back to the same room + [\#18053](https://github.com/vector-im/element-web/pull/18053) + * Use URLSearchParams instead of transitive dependency `querystring` + [\#13138](https://github.com/vector-im/element-web/pull/13138) + * Update PR template for new changelog generation + [\#18003](https://github.com/vector-im/element-web/pull/18003) + * Fix space shortcuts on layouts with non-English keys in the places of + numbers + [\#17780](https://github.com/vector-im/element-web/pull/17780) + * Add comment around feature_spaces flag usage + [\#18006](https://github.com/vector-im/element-web/pull/18006) + * Standardise casing of identity server + [\#17980](https://github.com/vector-im/element-web/pull/17980) + * Convert CONTRIBUTING to markdown + [\#18002](https://github.com/vector-im/element-web/pull/18002) + * Ignore workers for jest tests because it disagrees with worker-loader + [\#17999](https://github.com/vector-im/element-web/pull/17999) + * Use webpack worker-loader instead of homegrown hack + [\#17963](https://github.com/vector-im/element-web/pull/17963) + * Fix types to match Typescripted IndexedDB store + [\#17962](https://github.com/vector-im/element-web/pull/17962) + * Improve and consolidate typing + [\#17931](https://github.com/vector-im/element-web/pull/17931) + Changes in [1.7.33](https://github.com/vector-im/element-web/releases/tag/v1.7.33) (2021-07-19) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33-rc.1...v1.7.33) From 37faa1caa9204f5fdb9ed6610ce8d7bb85655790 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 27 Jul 2021 16:10:26 +0100 Subject: [PATCH 05/10] v1.7.34-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2bb2598c..b206f3813 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.33", + "version": "1.7.34-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 54b78a64b8560bcb6b6b9bd54c07392489d6f145 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 2 Aug 2021 12:58:00 +0100 Subject: [PATCH 06/10] Changelog for v1.7.34 --- CHANGELOG.md | 160 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 121 insertions(+), 39 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92b87c977..0b94a3a5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,46 +1,128 @@ -Changes in [1.7.34-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.34-rc.1) (2021-07-27) -========================================================================================================= -[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.33...v1.7.34-rc.1) +Changes in [1.7.34](https://github.com/vector-im/element-desktop/releases/tag/v1.7.34) (2021-07-02) +=================================================================================================== - * Translations update from Weblate - [\#18260](https://github.com/vector-im/element-web/pull/18260) - * Update ESLint config - [\#18236](https://github.com/vector-im/element-web/pull/18236) - * Update matrix-org-eslint-plugin and tighten max warning limit - [\#18207](https://github.com/vector-im/element-web/pull/18207) - * Update webpack path for new voice message worker location - [\#18187](https://github.com/vector-im/element-web/pull/18187) - * yarn upgrade - [\#18150](https://github.com/vector-im/element-web/pull/18150) - * Conform to new typescript eslint rules - [\#18065](https://github.com/vector-im/element-web/pull/18065) - * Add the Matrix Space to the translations guide - [\#18102](https://github.com/vector-im/element-web/pull/18102) - * Update eslint-plugin-matrix-org - [\#18058](https://github.com/vector-im/element-web/pull/18058) +## 🔒 SECURITY FIXES + * Sanitize untrusted variables from message previews before translation + Fixes vector-im/element-web#18314 + +## ✨ Features + * Fix editing of `` & ` & `` + [\#6469](https://github.com/matrix-org/matrix-react-sdk/pull/6469) + Fixes #18211 + * Zoom images in lightbox to where the cursor points + [\#6418](https://github.com/matrix-org/matrix-react-sdk/pull/6418) + Fixes #17870 + * Avoid hitting the settings store from TextForEvent + [\#6205](https://github.com/matrix-org/matrix-react-sdk/pull/6205) + Fixes #17650 + * Initial MSC3083 + MSC3244 support + [\#6212](https://github.com/matrix-org/matrix-react-sdk/pull/6212) + Fixes #17686 and #17661 + * Navigate to the first room with notifications when clicked on space notification dot + [\#5974](https://github.com/matrix-org/matrix-react-sdk/pull/5974) + * Add matrix: to the list of permitted URL schemes + [\#6388](https://github.com/matrix-org/matrix-react-sdk/pull/6388) + * Add "Copy Link" to room context menu + [\#6374](https://github.com/matrix-org/matrix-react-sdk/pull/6374) + * 💭 Message bubble layout + [\#6291](https://github.com/matrix-org/matrix-react-sdk/pull/6291) + Fixes #4635, #17773 #16220 and #7687 + * Play only one audio file at a time + [\#6417](https://github.com/matrix-org/matrix-react-sdk/pull/6417) + Fixes #17439 + * Move download button for media to the action bar + [\#6386](https://github.com/matrix-org/matrix-react-sdk/pull/6386) + Fixes #17943 + * Improved display of one-to-one call history with summary boxes for each call + [\#6121](https://github.com/matrix-org/matrix-react-sdk/pull/6121) + Fixes #16409 + * Notification settings UI refresh + [\#6352](https://github.com/matrix-org/matrix-react-sdk/pull/6352) + Fixes #17782 + * Fix EventIndex double handling events and erroring + [\#6385](https://github.com/matrix-org/matrix-react-sdk/pull/6385) + Fixes #18008 + * Improve reply rendering + [\#3553](https://github.com/matrix-org/matrix-react-sdk/pull/3553) + Fixes vector-im/riot-web#9217, vector-im/riot-web#7633, vector-im/riot-web#7530, vector-im/riot-web#7169, vector-im/riot-web#7151, vector-im/riot-web#6692 vector-im/riot-web#6579 and #17440 + * Improve performance of room name calculation + [\#1801](https://github.com/matrix-org/matrix-js-sdk/pull/1801) + +## 🐛 Bug Fixes * Fix browser history getting stuck looping back to the same room [\#18053](https://github.com/vector-im/element-web/pull/18053) - * Use URLSearchParams instead of transitive dependency `querystring` - [\#13138](https://github.com/vector-im/element-web/pull/13138) - * Update PR template for new changelog generation - [\#18003](https://github.com/vector-im/element-web/pull/18003) - * Fix space shortcuts on layouts with non-English keys in the places of - numbers + * Fix space shortcuts on layouts with non-English keys in the places of numbers [\#17780](https://github.com/vector-im/element-web/pull/17780) - * Add comment around feature_spaces flag usage - [\#18006](https://github.com/vector-im/element-web/pull/18006) - * Standardise casing of identity server - [\#17980](https://github.com/vector-im/element-web/pull/17980) - * Convert CONTRIBUTING to markdown - [\#18002](https://github.com/vector-im/element-web/pull/18002) - * Ignore workers for jest tests because it disagrees with worker-loader - [\#17999](https://github.com/vector-im/element-web/pull/17999) - * Use webpack worker-loader instead of homegrown hack - [\#17963](https://github.com/vector-im/element-web/pull/17963) - * Fix types to match Typescripted IndexedDB store - [\#17962](https://github.com/vector-im/element-web/pull/17962) - * Improve and consolidate typing - [\#17931](https://github.com/vector-im/element-web/pull/17931) + Fixes #17776 + * Fix CreateRoomDialog exploding when making public room outside of a space + [\#6493](https://github.com/matrix-org/matrix-react-sdk/pull/6493) + * Fix regression where registration would soft-crash on captcha + [\#6505](https://github.com/matrix-org/matrix-react-sdk/pull/6505) + Fixes #18284 + * only send join rule event if we have a join rule to put in it + [\#6517](https://github.com/matrix-org/matrix-react-sdk/pull/6517) + * Improve the new download button's discoverability and interactions. + [\#6510](https://github.com/matrix-org/matrix-react-sdk/pull/6510) + * Fix voice recording UI looking broken while microphone permissions are being requested. + [\#6479](https://github.com/matrix-org/matrix-react-sdk/pull/6479) + Fixes #18223 + * Match colors of room and user avatars in DMs + [\#6393](https://github.com/matrix-org/matrix-react-sdk/pull/6393) + Fixes #2449 + * Fix onPaste handler to work with copying files from Finder + [\#5389](https://github.com/matrix-org/matrix-react-sdk/pull/5389) + Fixes #15536 and #16255 + * Fix infinite pagination loop when offline + [\#6478](https://github.com/matrix-org/matrix-react-sdk/pull/6478) + Fixes #18242 + * Fix blurhash rounded corners missing regression + [\#6467](https://github.com/matrix-org/matrix-react-sdk/pull/6467) + Fixes #18110 + * Fix position of the space hierarchy spinner + [\#6462](https://github.com/matrix-org/matrix-react-sdk/pull/6462) + Fixes #18182 + * Fix display of image messages that lack thumbnails + [\#6456](https://github.com/matrix-org/matrix-react-sdk/pull/6456) + Fixes #18175 + * Fix crash with large audio files. + [\#6436](https://github.com/matrix-org/matrix-react-sdk/pull/6436) + Fixes #18149 + * Make diff colors in codeblocks more pleasant + [\#6355](https://github.com/matrix-org/matrix-react-sdk/pull/6355) + Fixes #17939 + * Show the correct audio file duration while loading the file. + [\#6435](https://github.com/matrix-org/matrix-react-sdk/pull/6435) + Fixes #18160 + * Fix various timeline settings not applying immediately. + [\#6261](https://github.com/matrix-org/matrix-react-sdk/pull/6261) + Fixes #17748 + * Fix issues with room list duplication + [\#6391](https://github.com/matrix-org/matrix-react-sdk/pull/6391) + Fixes #14508 + * Fix grecaptcha throwing useless error sometimes + [\#6401](https://github.com/matrix-org/matrix-react-sdk/pull/6401) + Fixes #15142 + * Update Emojibase and Twemoji and switch to IamCal (Slack-style) shortcodes + [\#6347](https://github.com/matrix-org/matrix-react-sdk/pull/6347) + Fixes #13857 and #13334 + * Respect compound emojis in default avatar initial generation + [\#6397](https://github.com/matrix-org/matrix-react-sdk/pull/6397) + Fixes #18040 + * Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked. + [\#6394](https://github.com/matrix-org/matrix-react-sdk/pull/6394) + Fixes #18031 + * Standardise spelling and casing of homeserver, identity server, and integration manager + [\#6365](https://github.com/matrix-org/matrix-react-sdk/pull/6365) + * Fix widgets not receiving decrypted events when they have permission. + [\#6371](https://github.com/matrix-org/matrix-react-sdk/pull/6371) + Fixes #17615 + * Prevent client hangs when calculating blurhashes + [\#6366](https://github.com/matrix-org/matrix-react-sdk/pull/6366) + Fixes #17945 + * Exclude state events from widgets reading room events + [\#6378](https://github.com/matrix-org/matrix-react-sdk/pull/6378) + * Cache feature_spaces\* flags to improve performance + [\#6381](https://github.com/matrix-org/matrix-react-sdk/pull/6381) Changes in [1.7.33](https://github.com/vector-im/element-web/releases/tag/v1.7.33) (2021-07-19) =============================================================================================== From e7cb419902e28d8ebbb62e61a8798d0fabf56081 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Aug 2021 13:10:00 +0100 Subject: [PATCH 07/10] 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 b206f3813..7fcc3d142 100644 --- a/package.json +++ b/package.json @@ -61,8 +61,8 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "12.2.0-rc.1", - "matrix-react-sdk": "3.27.0-rc.1", + "matrix-js-sdk": "12.2.0", + "matrix-react-sdk": "3.27.0", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 382257fd4..cd913d6a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7293,10 +7293,10 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@12.2.0-rc.1: - version "12.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.2.0-rc.1.tgz#fbbb462dd98c64edb6f4bcd5403d802c98625f01" - integrity sha512-aHxL6wsLRrnJMLJ17V1IVOm2dCGOA8jHWZi43xNzkdsmQeU9UiUmUcT9RxsYcc7YhNv8ZaZ1plIwvBmoz3H4mA== +matrix-js-sdk@12.2.0: + version "12.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.2.0.tgz#e1dc7ddac054289cb24ee3d11dba8a5ba5ddecf5" + integrity sha512-foSs3uKRc6uvFNhgY35eErBvLWVDd5RNIxxsdFKlmU3B+70YUf3BP3petyBNW34ORyOqNdX36IiApfLo3npNEw== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" @@ -7317,10 +7317,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.27.0-rc.1: - version "3.27.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.27.0-rc.1.tgz#acd4ee14759b3ff49393257743a5189abf2bbfc5" - integrity sha512-vQnXsRYM9tAVndiDEkVf2gT7lAnZZGrp8leBxcH91WIGKGVrWO1RvBBW/utYF+fGD2Kn27xrq9C05ZLeu9wLFA== +matrix-react-sdk@3.27.0: + version "3.27.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.27.0.tgz#76605ab2b6b3431bcaf6b28428694627495d872a" + integrity sha512-DCtJq8tCF0mAHnRfjIMnhdoDG01iAXQ9i49mj049PfaERARVrZVc4imeXjwWbMrZM+rFIMiVTRzYktohmDLrcg== dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0" @@ -7348,7 +7348,7 @@ matrix-react-sdk@3.27.0-rc.1: katex "^0.12.0" linkifyjs "^2.1.9" lodash "^4.17.20" - matrix-js-sdk "12.2.0-rc.1" + matrix-js-sdk "12.2.0" matrix-widget-api "^0.1.0-beta.15" minimist "^1.2.5" opus-recorder "^8.0.3" From 245d13875faaecb7c3fec2df112bf3a7a6e8fec9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Aug 2021 13:16:47 +0100 Subject: [PATCH 08/10] v1.7.34 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7fcc3d142..6a93a119e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.7.34-rc.1", + "version": "1.7.34", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 9d356aa931d5e5d455bccb32709bf2a9fa9a2e55 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Aug 2021 13:20:30 +0100 Subject: [PATCH 09/10] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a93a119e..1706160df 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^10.5.0", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "12.2.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.27.0", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index cd913d6a3..394483c8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7309,6 +7309,21 @@ matrix-js-sdk@12.2.0: request "^2.88.2" unhomoglyph "^1.0.6" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "12.2.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/8a1bc98d4eb5cecd9373ed067c9fbfb6718d2e4f" + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + 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" From 2504c062f1d1920fda121f7c72522e3f2d844036 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 2 Aug 2021 13:20:41 +0100 Subject: [PATCH 10/10] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 23 +++-------------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 1706160df..eb6c4136c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.27.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^0.1.0-beta.15", "prop-types": "^15.7.2", "react": "^17.0.2", diff --git a/yarn.lock b/yarn.lock index 394483c8c..39fd6d5ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7293,23 +7293,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@12.2.0: - version "12.2.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.2.0.tgz#e1dc7ddac054289cb24ee3d11dba8a5ba5ddecf5" - integrity sha512-foSs3uKRc6uvFNhgY35eErBvLWVDd5RNIxxsdFKlmU3B+70YUf3BP3petyBNW34ORyOqNdX36IiApfLo3npNEw== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": +matrix-js-sdk@12.2.0, "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "12.2.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/8a1bc98d4eb5cecd9373ed067c9fbfb6718d2e4f" dependencies: @@ -7332,10 +7316,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.27.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.27.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.27.0.tgz#76605ab2b6b3431bcaf6b28428694627495d872a" - integrity sha512-DCtJq8tCF0mAHnRfjIMnhdoDG01iAXQ9i49mj049PfaERARVrZVc4imeXjwWbMrZM+rFIMiVTRzYktohmDLrcg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/e2ef5d1737acda03c186560182fa7daddff8479b" dependencies: "@babel/runtime" "^7.12.5" await-lock "^2.1.0"