From 8b41167490aa047bf296832bfa0db541f792fd5c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Nov 2022 14:42:50 +0000 Subject: [PATCH 01/10] Upgrade matrix-js-sdk to 21.1.0-rc.1 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 33c74f702b..7795de4cbe 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "maplibre-gl": "^1.15.2", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "^0.0.1-beta.7", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "21.1.0-rc.1", "matrix-widget-api": "^1.1.1", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index b1f0f9323b..170c012544 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7027,9 +7027,10 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "21.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/52830a2a50732f4269048d0ad7a007c6b9528ffa" +matrix-js-sdk@21.1.0-rc.1: + version "21.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.1.0-rc.1.tgz#30c74d30a9ce53fa1f83cb1e630ccc8df77853e6" + integrity sha512-vb4f/1rqFihIorabPg1HxG6FgS8EoB0svcPC371r1zVORoQOa7OPJyYKsKDm2sgSwZacLxl3JdOTmnFwcB60dA== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From f573381f85caeddd6690e34a1581aace3034c908 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Nov 2022 14:44:49 +0000 Subject: [PATCH 02/10] Prepare changelog for v3.60.0-rc.1 --- CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5334d09b0..6b3006d678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,38 @@ +Changes in [3.60.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.60.0-rc.1) (2022-11-01) +=============================================================================================================== + +## ✨ Features + * Loading threads with server-side assistance ([\#9356](https://github.com/matrix-org/matrix-react-sdk/pull/9356)). Fixes vector-im/element-web#21807, vector-im/element-web#21799, vector-im/element-web#21911, vector-im/element-web#22141, vector-im/element-web#22157, vector-im/element-web#22641, vector-im/element-web#22501 vector-im/element-web#22438 and vector-im/element-web#21678. Contributed by @justjanne. + * Make thread replies trigger a room list re-ordering ([\#9510](https://github.com/matrix-org/matrix-react-sdk/pull/9510)). Fixes vector-im/element-web#21700. + * Device manager - add extra details to device security and renaming ([\#9501](https://github.com/matrix-org/matrix-react-sdk/pull/9501)). Contributed by @kerryarchibald. + * Add plain text mode to the wysiwyg composer ([\#9503](https://github.com/matrix-org/matrix-react-sdk/pull/9503)). Contributed by @florianduros. + * Sliding Sync: improve sort order, show subspace rooms, better tombstoned room handling ([\#9484](https://github.com/matrix-org/matrix-react-sdk/pull/9484)). + * Device manager - add learn more popups to filtered sessions section ([\#9497](https://github.com/matrix-org/matrix-react-sdk/pull/9497)). Contributed by @kerryarchibald. + * Show thread notification if thread timeline is closed ([\#9495](https://github.com/matrix-org/matrix-react-sdk/pull/9495)). Fixes vector-im/element-web#23589. + * Add message editing to wysiwyg composer ([\#9488](https://github.com/matrix-org/matrix-react-sdk/pull/9488)). Contributed by @florianduros. + * Device manager - confirm sign out of other sessions ([\#9487](https://github.com/matrix-org/matrix-react-sdk/pull/9487)). Contributed by @kerryarchibald. + * Automatically request logs from other users in a call when submitting logs ([\#9492](https://github.com/matrix-org/matrix-react-sdk/pull/9492)). + * Add thread notification with server assistance (MSC3773) ([\#9400](https://github.com/matrix-org/matrix-react-sdk/pull/9400)). Fixes vector-im/element-web#21114, vector-im/element-web#21413, vector-im/element-web#21416, vector-im/element-web#21433, vector-im/element-web#21481, vector-im/element-web#21798, vector-im/element-web#21823 vector-im/element-web#23192 and vector-im/element-web#21765. + * Support for login + E2EE set up with QR ([\#9403](https://github.com/matrix-org/matrix-react-sdk/pull/9403)). Contributed by @hughns. + * Allow pressing Enter to send messages in new composer ([\#9451](https://github.com/matrix-org/matrix-react-sdk/pull/9451)). Contributed by @andybalaam. + +## 🐛 Bug Fixes + * Fix NotificationBadge unsent color ([\#9522](https://github.com/matrix-org/matrix-react-sdk/pull/9522)). Fixes vector-im/element-web#23646. + * Fix room list sorted by recent on app startup ([\#9515](https://github.com/matrix-org/matrix-react-sdk/pull/9515)). Fixes vector-im/element-web#23635. + * Reset custom power selector when blurred on empty ([\#9508](https://github.com/matrix-org/matrix-react-sdk/pull/9508)). Fixes vector-im/element-web#23481. + * Reinstate timeline/redaction callbacks when updating notification state ([\#9494](https://github.com/matrix-org/matrix-react-sdk/pull/9494)). Fixes vector-im/element-web#23554. + * Only render NotificationBadge when needed ([\#9493](https://github.com/matrix-org/matrix-react-sdk/pull/9493)). Fixes vector-im/element-web#23584. + * Fix embedded Element Call screen sharing ([\#9485](https://github.com/matrix-org/matrix-react-sdk/pull/9485)). Fixes vector-im/element-web#23571. + * Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes vector-im/element-web#23580. + * Fix joining calls without audio or video inputs ([\#9486](https://github.com/matrix-org/matrix-react-sdk/pull/9486)). Fixes vector-im/element-web#23511. + * Ensure spaces in the spotlight dialog have rounded square avatars ([\#9480](https://github.com/matrix-org/matrix-react-sdk/pull/9480)). Fixes vector-im/element-web#23515. + * Only show mini avatar uploader in room intro when no avatar yet exists ([\#9479](https://github.com/matrix-org/matrix-react-sdk/pull/9479)). Fixes vector-im/element-web#23552. + * Fix threads fallback incorrectly targets root event ([\#9229](https://github.com/matrix-org/matrix-react-sdk/pull/9229)). Fixes vector-im/element-web#23147. + * Align video call icon with banner text ([\#9460](https://github.com/matrix-org/matrix-react-sdk/pull/9460)). + * Set relations helper when creating event tile context menu ([\#9253](https://github.com/matrix-org/matrix-react-sdk/pull/9253)). Fixes vector-im/element-web#22018. + * Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)). Contributed by @kerryarchibald. + * Update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)). + Changes in [3.59.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.59.1) (2022-11-01) ===================================================================================================== From ad87b32e1b1ca43f707400fcf80cf6849b1971dc Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Nov 2022 14:44:50 +0000 Subject: [PATCH 03/10] v3.60.0-rc.1 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 7795de4cbe..cbdfcbbf84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.59.1", + "version": "3.60.0-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -23,7 +23,7 @@ "package.json", ".stylelintrc.js" ], - "main": "./src/index.ts", + "main": "./lib/index.ts", "matrix_src_main": "./src/index.ts", "matrix_lib_main": "./lib/index.ts", "matrix_lib_typings": "./lib/index.d.ts", @@ -253,5 +253,6 @@ "jestSonar": { "reportPath": "coverage", "sonar56x": true - } + }, + "typings": "./lib/index.d.ts" } From e58681ee73761b0aae232f18c87dd1c9b29b18ba Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Thu, 3 Nov 2022 12:03:00 +0000 Subject: [PATCH 04/10] [Backport staging] Fix /myroomavatar slash command (#9537) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- src/SlashCommands.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx index 624c515b15..cce5c4ade4 100644 --- a/src/SlashCommands.tsx +++ b/src/SlashCommands.tsx @@ -76,7 +76,7 @@ interface HTMLInputEvent extends Event { target: HTMLInputElement & EventTarget; } -const singleMxcUpload = async (): Promise => { +const singleMxcUpload = async (): Promise => { return new Promise((resolve) => { const fileSelector = document.createElement('input'); fileSelector.setAttribute('type', 'file'); @@ -85,8 +85,13 @@ const singleMxcUpload = async (): Promise => { Modal.createDialog(UploadConfirmDialog, { file, - onFinished: (shouldContinue) => { - resolve(shouldContinue ? MatrixClientPeg.get().uploadContent(file) : null); + onFinished: async (shouldContinue) => { + if (shouldContinue) { + const { content_uri: uri } = await MatrixClientPeg.get().uploadContent(file); + resolve(uri); + } else { + resolve(null); + } }, }); }; From fe0759803a09e271423c034e0584be46d6c8c685 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Mon, 7 Nov 2022 12:23:47 +0000 Subject: [PATCH 05/10] [Backport staging] Fix regressions around media uploads failing and causing soft crashes (#9550) (cherry picked from commit 77764d80bc20f95566e79071c9131bd5d9269d7d) Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- src/Notifier.ts | 4 +- .../views/settings/ChangeAvatar.tsx | 209 ------------------ .../tabs/room/NotificationSettingsTab.tsx | 2 +- .../views/spaces/SpaceSettingsGeneralTab.tsx | 9 +- src/i18n/strings/en_EN.json | 2 - test/Notifier-test.ts | 9 + 6 files changed, 17 insertions(+), 218 deletions(-) delete mode 100644 src/components/views/settings/ChangeAvatar.tsx diff --git a/src/Notifier.ts b/src/Notifier.ts index b75b821ae8..2f92569928 100644 --- a/src/Notifier.ts +++ b/src/Notifier.ts @@ -161,8 +161,8 @@ export const Notifier = { return null; } - if (!content.url) { - logger.warn(`${roomId} has custom notification sound event, but no url key`); + if (typeof content.url !== "string") { + logger.warn(`${roomId} has custom notification sound event, but no url string`); return null; } diff --git a/src/components/views/settings/ChangeAvatar.tsx b/src/components/views/settings/ChangeAvatar.tsx deleted file mode 100644 index 680291db4c..0000000000 --- a/src/components/views/settings/ChangeAvatar.tsx +++ /dev/null @@ -1,209 +0,0 @@ -/* -Copyright 2015-2021 The Matrix.org Foundation C.I.C. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -import React from 'react'; -import { MatrixEvent } from 'matrix-js-sdk/src/models/event'; -import { Room } from 'matrix-js-sdk/src/models/room'; -import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state"; -import { EventType } from "matrix-js-sdk/src/@types/event"; - -import { MatrixClientPeg } from "../../../MatrixClientPeg"; -import { _t } from '../../../languageHandler'; -import Spinner from '../elements/Spinner'; -import { mediaFromMxc } from "../../../customisations/Media"; -import RoomAvatar from '../avatars/RoomAvatar'; -import BaseAvatar from '../avatars/BaseAvatar'; -import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds"; - -interface IProps { - initialAvatarUrl?: string; - room?: Room; - // if false, you need to call changeAvatar.onFileSelected yourself. - showUploadSection?: boolean; - width?: number; - height?: number; - className?: string; -} - -interface IState { - avatarUrl?: string; - errorText?: string; - phase?: Phases; -} - -enum Phases { - Display = "display", - Uploading = "uploading", - Error = "error", -} - -export default class ChangeAvatar extends React.Component { - public static defaultProps = { - showUploadSection: true, - className: "", - width: 80, - height: 80, - }; - - private avatarSet = false; - - constructor(props: IProps) { - super(props); - - this.state = { - avatarUrl: this.props.initialAvatarUrl, - phase: Phases.Display, - }; - } - - public componentDidMount(): void { - MatrixClientPeg.get().on(RoomStateEvent.Events, this.onRoomStateEvents); - } - - // TODO: [REACT-WARNING] Replace with appropriate lifecycle event - // eslint-disable-next-line - public UNSAFE_componentWillReceiveProps(newProps: IProps): void { - if (this.avatarSet) { - // don't clobber what the user has just set - return; - } - this.setState({ - avatarUrl: newProps.initialAvatarUrl, - }); - } - - public componentWillUnmount(): void { - if (MatrixClientPeg.get()) { - MatrixClientPeg.get().removeListener(RoomStateEvent.Events, this.onRoomStateEvents); - } - } - - private onRoomStateEvents = (ev: MatrixEvent) => { - if (!this.props.room) { - return; - } - - if (ev.getRoomId() !== this.props.room.roomId || - ev.getType() !== EventType.RoomAvatar || - ev.getSender() !== MatrixClientPeg.get().getUserId() - ) { - return; - } - - if (!ev.getContent().url) { - this.avatarSet = false; - this.setState({}); // force update - } - }; - - private setAvatarFromFile(file: File): Promise<{}> { - let newUrl = null; - - this.setState({ - phase: Phases.Uploading, - }); - const httpPromise = MatrixClientPeg.get().uploadContent(file).then(({ content_uri: url }) => { - newUrl = url; - if (this.props.room) { - return MatrixClientPeg.get().sendStateEvent( - this.props.room.roomId, - 'm.room.avatar', - { url }, - '', - ); - } else { - return MatrixClientPeg.get().setAvatarUrl(url); - } - }); - - httpPromise.then(() => { - this.setState({ - phase: Phases.Display, - avatarUrl: mediaFromMxc(newUrl).srcHttp, - }); - }, () => { - this.setState({ - phase: Phases.Error, - }); - this.onError(); - }); - - return httpPromise; - } - - private onFileSelected = (ev: React.ChangeEvent) => { - this.avatarSet = true; - return this.setAvatarFromFile(ev.target.files[0]); - }; - - private onError = (): void => { - this.setState({ - errorText: _t("Failed to upload profile picture!"), - }); - }; - - public render(): JSX.Element { - let avatarImg; - // Having just set an avatar we just display that since it will take a little - // time to propagate through to the RoomAvatar. - if (this.props.room && !this.avatarSet) { - avatarImg = ; - } else { - // XXX: FIXME: once we track in the JS what our own displayname is(!) then use it here rather than ? - avatarImg = ; - } - - let uploadSection; - if (this.props.showUploadSection) { - uploadSection = ( -
- { _t("Upload new:") } - - { this.state.errorText } -
- ); - } - - switch (this.state.phase) { - case Phases.Display: - case Phases.Error: - return ( -
-
- { avatarImg } -
- { uploadSection } -
- ); - case Phases.Uploading: - return ( - - ); - } - } -} diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx index 125b60e0bd..2ac282654a 100644 --- a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx @@ -119,7 +119,7 @@ export default class NotificationsSettingsTab extends React.Component { setBusy(true); - const promises = []; + const promises: Promise[] = []; if (avatarChanged) { if (newAvatar) { - promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, { - url: await cli.uploadContent(newAvatar), - }, "")); + promises.push((async () => { + const { content_uri: url } = await cli.uploadContent(newAvatar); + await cli.sendStateEvent(space.roomId, EventType.RoomAvatar, { url }, ""); + })()); } else { promises.push(cli.sendStateEvent(space.roomId, EventType.RoomAvatar, {}, "")); } diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 966f3c04e3..4f7c8205dd 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1283,8 +1283,6 @@ "This bridge is managed by .": "This bridge is managed by .", "Workspace: ": "Workspace: ", "Channel: ": "Channel: ", - "Failed to upload profile picture!": "Failed to upload profile picture!", - "Upload new:": "Upload new:", "No display name": "No display name", "Warning!": "Warning!", "Changing your password on this homeserver will cause all of your other devices to be signed out. This will delete the message encryption keys stored on them, and may make encrypted chat history unreadable.": "Changing your password on this homeserver will cause all of your other devices to be signed out. This will delete the message encryption keys stored on them, and may make encrypted chat history unreadable.", diff --git a/test/Notifier-test.ts b/test/Notifier-test.ts index 30a1691c2e..4c6100760e 100644 --- a/test/Notifier-test.ts +++ b/test/Notifier-test.ts @@ -232,6 +232,15 @@ describe("Notifier", () => { }); }); + describe("getSoundForRoom", () => { + it("should not explode if given invalid url", () => { + jest.spyOn(SettingsStore, "getValue").mockImplementation((name: string) => { + return { url: { content_uri: "foobar" } }; + }); + expect(Notifier.getSoundForRoom("!roomId:server")).toBeNull(); + }); + }); + describe("_playAudioNotification", () => { it.each([ { event: { is_silenced: true }, count: 0 }, From 02aae5edcef9a5a89f67f144a970d8f03c03e39d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 8 Nov 2022 13:10:06 +0000 Subject: [PATCH 06/10] Prepare changelog for v3.60.0-rc.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b3006d678..7d9fb1530d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [3.60.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.60.0-rc.2) (2022-11-08) +=============================================================================================================== + +## 🐛 Bug Fixes + * Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641. + * Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321. + Changes in [3.60.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.60.0-rc.1) (2022-11-01) =============================================================================================================== From 494e2f767cc06c4eb6ecf00244d9dd5f81d45a70 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 8 Nov 2022 13:10:07 +0000 Subject: [PATCH 07/10] v3.60.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cbdfcbbf84..b6a56bf03f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.60.0-rc.1", + "version": "3.60.0-rc.2", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 5c1687ea9df3444109223311b6c63715d2fb023d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 8 Nov 2022 14:37:30 +0000 Subject: [PATCH 08/10] Upgrade matrix-js-sdk to 21.1.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b6a56bf03f..9f9fb31683 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "maplibre-gl": "^1.15.2", "matrix-encrypt-attachment": "^1.0.3", "matrix-events-sdk": "^0.0.1-beta.7", - "matrix-js-sdk": "21.1.0-rc.1", + "matrix-js-sdk": "21.1.0", "matrix-widget-api": "^1.1.1", "minimist": "^1.2.5", "opus-recorder": "^8.0.3", diff --git a/yarn.lock b/yarn.lock index 170c012544..aa69411d73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7027,10 +7027,10 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== -matrix-js-sdk@21.1.0-rc.1: - version "21.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.1.0-rc.1.tgz#30c74d30a9ce53fa1f83cb1e630ccc8df77853e6" - integrity sha512-vb4f/1rqFihIorabPg1HxG6FgS8EoB0svcPC371r1zVORoQOa7OPJyYKsKDm2sgSwZacLxl3JdOTmnFwcB60dA== +matrix-js-sdk@21.1.0: + version "21.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.1.0.tgz#f365df6490e7085f98f1294bcf2a6db39e95a4fe" + integrity sha512-4HTEZKt/LlX4045H5JVACBMirPboRWM7E/OabaRCcBoEssgWrPw/z7am6FXH2ZRDw0xp50WhPjCNOGZqdf81Mg== dependencies: "@babel/runtime" "^7.12.5" another-json "^0.2.0" From 9f8ee8e966ecef064f3bb9e248d995a908de32b9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 8 Nov 2022 14:41:13 +0000 Subject: [PATCH 09/10] Prepare changelog for v3.60.0 --- CHANGELOG.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d9fb1530d..5616117436 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,5 @@ -Changes in [3.60.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.60.0-rc.2) (2022-11-08) -=============================================================================================================== - -## 🐛 Bug Fixes - * Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641. - * Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321. - -Changes in [3.60.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.60.0-rc.1) (2022-11-01) -=============================================================================================================== +Changes in [3.60.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.60.0) (2022-11-08) +===================================================================================================== ## ✨ Features * Loading threads with server-side assistance ([\#9356](https://github.com/matrix-org/matrix-react-sdk/pull/9356)). Fixes vector-im/element-web#21807, vector-im/element-web#21799, vector-im/element-web#21911, vector-im/element-web#22141, vector-im/element-web#22157, vector-im/element-web#22641, vector-im/element-web#22501 vector-im/element-web#22438 and vector-im/element-web#21678. Contributed by @justjanne. @@ -24,6 +17,8 @@ Changes in [3.60.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases * Allow pressing Enter to send messages in new composer ([\#9451](https://github.com/matrix-org/matrix-react-sdk/pull/9451)). Contributed by @andybalaam. ## 🐛 Bug Fixes + * Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641. + * Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321. * Fix NotificationBadge unsent color ([\#9522](https://github.com/matrix-org/matrix-react-sdk/pull/9522)). Fixes vector-im/element-web#23646. * Fix room list sorted by recent on app startup ([\#9515](https://github.com/matrix-org/matrix-react-sdk/pull/9515)). Fixes vector-im/element-web#23635. * Reset custom power selector when blurred on empty ([\#9508](https://github.com/matrix-org/matrix-react-sdk/pull/9508)). Fixes vector-im/element-web#23481. From e1e5950cf6ad79d56d0e4d4c45652cdffcb3effb Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 8 Nov 2022 14:41:13 +0000 Subject: [PATCH 10/10] v3.60.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f9fb31683..9d75f462e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.60.0-rc.2", + "version": "3.60.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {