Commit Graph

3138 Commits (effcb58ebfdf681f036b51534d98581b126c92e8)

Author SHA1 Message Date
Timo 556cfc7ed8
Add maximise widget functionality (#7098)
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-11-16 15:43:18 +01:00
Šimon Brandner 4eadb3bca1
Color cleanup number 10 (#7132) 2021-11-16 10:10:44 +00:00
Šimon Brandner bafeb38472
Improve VoIP UI/UX (#7048)
* Remove speaking indicator

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove mic icon for primary feed

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove caching as it doesn't seem to be neccessary

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Add call view buttons colors

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Refactor button code

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Update call view button icons

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* i18n

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Add dialpad icon

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix button sizing in PiP

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix secondary voice video feed color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-15 17:24:11 +00:00
Michael Telatynski 27c3153947
Unified room context menus (#7072) 2021-11-15 11:39:25 +00:00
Šimon Brandner 75c02a641b
Fix look of emoji verification (#7133) 2021-11-15 09:09:19 +00:00
Šimon Brandner 2a1a180ece
Fix hover tile border (#7117)
* Revert "Update highlighted event line to prevent content jumping (#7090)"

This reverts commit 0f8272c6a1.

* Fix message jumps

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-11 14:48:11 +00:00
Andy Balaam f87e9d86a4
Catch up MPollBody CSS with everything else that now uses just 'accent' (#7118) 2021-11-11 14:34:55 +00:00
Germain e2b59335cf
Implement empty design list (#7115) 2021-11-11 13:56:44 +00:00
Šimon Brandner 9abb2f5ff4
Color cleanup 8 (#7108)
* $accent-color -> $accent

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $notice-primary-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $notice-primary-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-50pct

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $warning-color -> $alert

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $accent-darker

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $orange-warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $warning-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $info-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-11 13:37:29 +00:00
Michael Telatynski 5ad3261cb2
Implement more meta-spaces (#7077) 2021-11-11 13:07:41 +00:00
Germain 1de9630e44
Fixes following threads design implementation review (#7100) 2021-11-11 11:00:18 +00:00
Andy Balaam 431b69ee49
Display started polls in timeline (without votes) (behind labs setting) (#7088)
* Display started polls in timeline (without votes)

* Update i18n info

* Keep original background colour of poll options, even on hover

* Show full avatar above a poll message
2021-11-10 15:44:57 +00:00
Šimon Brandner 71d8946641
Color cleanup number 7 (#7094)
* $reaction-row-button-selected-border-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $reaction-row-button-bg-color -> $header-panel-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $room-warning-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $button-link-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $tab-label-icon-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $tab-label-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $event-redacted-border-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $event-redacted-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $panel-divider-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $search-placeholder-color -> #61708b

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $search-bg-color -> #181b21

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $header-panel-border-color -> #000000

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $scrollbar-track-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $eventbubble-avatar-outline -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-10 09:46:33 +00:00
Andy Balaam 50ff00084f
Change radio button border colour to match design (#7087) 2021-11-10 09:34:21 +00:00
Šimon Brandner 07d9e93d67
Color cleanup number six (#7050)
* Remove $voip-decline-color and $voip-accept-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove $dialog-background-bg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $mention-user-pill-bg-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $plinth-bg-color -> $secondary-accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-lighter-fg-color -> $input-darker-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-valid-border-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $input-invalid-border-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $avatar-bg-color -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $preview-widget-fg-color -> $greyed-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $settings-profile-button-fg-color -> $settings-profile-overlay-placeholder-fg-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $presence-online -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $pinned-unread-color -> $notice-primary-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $event-highlight-fg-color -> $warning-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $tab-label-active-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-primary-bg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-danger-bg-color -> $notice-primary-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $button-link-fg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $togglesw-on-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $slider-selection-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $progressbar-fg-color -> $accent-color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* $authpage-body-bg-color -> $background

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix merge issue

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix second merge issue

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-08 11:50:53 +00:00
Germain 0f8272c6a1
Update highlighted event line to prevent content jumping (#7090) 2021-11-05 14:46:29 +00:00
Germain aacea8d87b
Fix MemberAvatar rendering and thread info color (#7085) 2021-11-04 17:10:22 +00:00
Andy Balaam 9c8e1d32e2
Rename mx_RadioButton to mx_StyledRadioButton to match class name (#7083) 2021-11-04 12:57:38 +00:00
Germain 38750202ee
Design thread list tiles according to mockups (#7078) 2021-11-03 18:05:01 +00:00
Germain 4b66d4a891
Unbreak IRC layout when thread summary is displayed (#7066) 2021-11-03 08:26:41 +00:00
Germain 0bae79d3c3
Improve Thread View UI (#7063) 2021-11-02 13:18:51 +00:00
Šimon Brandner 57fae01991
Improve the look of tooltips (#7049) 2021-11-02 09:41:33 +00:00
Šimon Brandner f643839a00
Improve the look of the spinner (#6083) 2021-11-02 09:35:06 +00:00
Travis Ralston 73731cc478
Polls: Creation form & start event (#7001)
* PSFD-423: Permission check for polls dialog

* PSFD-423: Implement compound scrollable dialog and skeleton create poll

* PSFD-325: Ask the question

* PSFD-328: Ask for options

* PSFD-423: Ensure form submission semantics work for dialogs

* PSFD-328: Option semantics

* Can delete all option to end up with zero
* Minimum 2 to submit the form

* PSFD-316: Send poll start event

* Appease the linter

* PSFD-328: Reduce padding between options to account for field size

* Iterate per design

* Fix submission
2021-11-01 23:44:42 -06:00
Šimon Brandner 5202c0a237
Show a gray shield when encrypted by deleted session (#6119) 2021-11-01 17:28:23 +00:00
Faye Duxovni 71244f3b3c
Add more checkbox styles (#7058)
Add a "kind" param for StyledCheckbox, allowing designers to choose different styles of checkbox as needed.  In addition to the preexisting default kind (now called Solid), there's an Outline kind with a green checkmark and a transparent fill.  This is used in the device trust view, since the default checkbox style looks too much like the green "verified" shield and it's awkward to have those next to each other.
2021-10-29 21:57:32 -04:00
Faye Duxovni d88b8efd19
Improve device list in Security & Privacy settings (#7004)
Overhaul the device list in the "Security and Privacy" settings tab to include device trust status, provide buttons for verifying unverified devices, and improve overall usability and style. This should now be the primary interface for checking and changing the trust status of your own devices, rather than looking at your own user profile in the right panel.
2021-10-29 18:11:39 -04:00
Travis Ralston 3f3e4ff674
Don't apply message bubble visual style to media messages (#7040)
* PSFD-457: Don't apply message bubble visual style to media messages

* Match corner rounding for images
2021-10-28 08:32:30 -06:00
Travis Ralston 43cbb947b6
PSFD-454: Add padding between controls on edit form in message bubbles (#7039)
8px arbitrarily to make it not squishy
2021-10-27 08:17:52 -06:00
Andy Balaam 166fba6428
Improve the appearance of the font size slider (#7038) 2021-10-26 13:29:02 +01:00
Šimon Brandner 5c66bd6c7b
Add `max-empty-lines` and `no-eol-whitespace` to stylelint (#7034) 2021-10-26 08:23:23 +01:00
Šimon Brandner ceb4c7e368
Add insert link button to the format bar (#5879) 2021-10-25 10:56:55 +01:00
Šimon Brandner 1256b1ef2a
Allow scrolling right in reply-quoted code block (#7024) 2021-10-25 10:42:32 +01:00
Andy Balaam 70606ffff6
Replace all uses of notice-primary-color with the correct alert colour (#7010) 2021-10-25 10:32:38 +01:00
Šimon Brandner 0ba24ec14f
I shall be murdered by design people for this (#6384)
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-22 21:32:45 -06:00
Rafael Gonçalves 12ad01db51
Show passphrase input label (#6992) 2021-10-22 15:50:11 +01:00
Germain 35b5109c2a
Fix threads broken layout (#6997) 2021-10-20 18:14:24 +01:00
Travis Ralston abc5db5715
Fix colour variable references in composer format bar (#7000) 2021-10-20 16:07:31 +00:00
Šimon Brandner c30029a8b1
Soften border-radius on selected/hovered messages (#6525) 2021-10-20 16:33:23 +01:00
Robin Townsend 2ee732b84d
Update style of composer format bar to match message action bar (#6351)
Signed-off-by: Robin Townsend <robin@robin.town>
2021-10-20 09:19:54 -06:00
Andy Balaam 4b903b9fbd
Break ThemeChoicePanel into a separate component (#6998)
* Break ThemeChoicePanel into a separate component

* Tests for ThemeChoicePanel

* i18n fixes

* Fix copyright for ThemeChoicePanel
2021-10-20 14:58:27 +00:00
Andy Balaam 96bd052ecf
Improve visibility of font size chooser (#6988)
* Improve visibility of font size chooser

* Move slider dot sizes into variables

* Use a standard font size instead of percentage in Slider

* Use shorthand for padding in FontScalingPanel

* Change Slider text pos to px to be consistent when font changes

* Cleaner dot size for Slider selection
2021-10-20 13:41:27 +01:00
CicadaCinema 23295718e3
Position toggle switch more clearly (#6914)
* Position toggle switch more clearly

* attempt to revert changes, align switch to title instead

* remove unused import, add missing property

Co-authored-by: ColonisationCaptain <52425971+ColonisationCaptain@users.noreply.github.com>
2021-10-19 15:28:11 -06:00
David Baker 01c4d3eede
Fix conflicting CSS on syntax highlighted blocks (#6991)
Fixes https://github.com/vector-im/element-web/issues/19445
2021-10-19 18:43:29 +01:00
Andy Balaam 4ad32b16ea Break out font size settings to a separate component 2021-10-19 14:50:09 +01:00
Germain Souquet df407ef3a8 Fix EventTileSummary layout for message bubbles 2021-10-19 09:31:28 +01:00
Germain Souquet 9319f07291 Revert "Fix threads with bubbles rendering (#6971)"
This reverts commit a2bc090607.
2021-10-19 09:16:40 +01:00
David Baker 98ba3fd6e6
Merge pull request #6973 from matrix-org/dbkr/upgrade_highlightjs
Upgrade highlight.js
2021-10-18 19:52:34 +01:00
David Baker 2b7ea16c2d Upgrade highlight.js
Major version bump for highlight.js. Update usage of deprecated function & some cleanups.
2021-10-18 19:32:20 +01:00
Germain 77e6e1c0ab
Merge pull request #6960 from matrix-org/gsouquet/rename-replythread 2021-10-18 17:11:31 +01:00
David Baker e0027895e7
Merge pull request #6963 from SimonBrandner/task/colors-5
Color clean-up numero cinco
2021-10-18 17:09:39 +01:00
Dariusz Niemczyk a2bc090607
Fix threads with bubbles rendering (#6971)
Fixes https://github.com/vector-im/element-web/issues/18958
2021-10-18 15:41:05 +01:00
Andy Balaam 4f3d761984
Merge pull request #6968 from andybalaam/cryptographypanel-table
Convert CryptographyPanel to a table
2021-10-18 13:26:16 +01:00
Dariusz Niemczyk 1d6c9fa8da
Add threads ViewInRoom context button (#18955) (#6947) 2021-10-18 12:09:01 +00:00
Andy Balaam 61a5b495b7 Remove duplicate CSS selector 2021-10-18 12:23:09 +01:00
Andy Balaam 13d6456200 Convert CryptographyPanel to a table 2021-10-18 09:36:16 +01:00
Andy Balaam f05e35bd94
Merge pull request #6958 from andybalaam/separate-cryptography-setting-component
Break 'Cryptography' settings into a separate component
2021-10-18 09:34:55 +01:00
Šimon Brandner a3cde0e5e6
$voice-record-waveform-incomplete-fg-color -> $quaternary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:34:24 +02:00
Šimon Brandner aad4e6f312
$voice-playback-button-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:29:03 +02:00
Šimon Brandner 707f0c6bc9
$voice-playback-button-fg-color -> $secondary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:28:01 +02:00
Šimon Brandner 0794be1e98
$notice-secondary-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:27 +02:00
Šimon Brandner ca6ed64811
$roomlist-header-color -> $tertiary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner 79efd61b66
$roomsublist-divider-color -> $primary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner 36531be8ca
$roomtile-preview-color -> $secondary-content
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:26 +02:00
Šimon Brandner 1691127ad2
$field-focused-label-bg-color -> $background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-16 20:21:20 +02:00
CicadaCinema 7b893366f2 Add spacing to Room settings - Notifications subsection 2021-10-16 14:52:29 +01:00
Germain Souquet 5a7c0d87b6 Rename ReplyThread to ReplyChain to avoid confusion with m.thread 2021-10-15 17:42:44 +01:00
Andy Balaam 0941b38b5d Name CryptographyPanel CSS classes consistent with style 2021-10-15 16:09:36 +01:00
David Baker 4fb0d021ae
Merge pull request #6897 from SimonBrandner/task/colors-4
Color de-duplication #4
2021-10-15 16:07:07 +01:00
Andy Balaam a547ee4654 Break 'Cryptography' settings into a separate component 2021-10-15 16:02:44 +01:00
Faye Duxovni 1b7277b8f0
Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons
Update the button styling on the emoji comparison dialog during cross-signing
2021-10-15 10:34:25 -04:00
Šimon Brandner 0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4 2021-10-15 16:23:40 +02:00
Dariusz Niemczyk f8c516d927
Add new thread message preview (#18958) (#6953)
Closes https://github.com/vector-im/element-web/issues/18958
2021-10-15 14:29:17 +01:00
Šimon Brandner 71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-15 15:23:32 +02:00
Andy Balaam 690893ea6b Merge duplicate CSS selectors 2021-10-15 13:32:39 +01:00
Andy Balaam 7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +01:00
Dariusz Niemczyk 562a880c7d
Create room threads list view (#6904)
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads

In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
Michael Telatynski 4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969 2021-10-14 09:59:34 +01:00
Michael Telatynski 2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146 2021-10-14 09:58:19 +01:00
Faye Duxovni 8f10a1d3fb Update the button styling on the emoji comparison dialog during cross-signing
Signed-off-by: Faye Duxovni <fayed@element.io>
2021-10-14 00:46:15 -04:00
Travis Ralston ea7257698c
Merge pull request #6934 from matrix-org/travis/labs/polls
Add feature flag for polls and placeholder dialog
2021-10-13 11:28:53 -06:00
Andy Balaam 4e9a20db21 Move the required CSS for DevicesPanel into its own scss file
Signed-off-by: Andy Balaam <andyb@element.io>
2021-10-13 13:55:01 +01:00
Travis Ralston 71c5b02390 Add feature flag for polls and placeholder dialog
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
2021-10-12 15:13:56 -06:00
Michael Telatynski d050c00703 Fix room list skeleton ui for narrow room list 2021-10-12 10:30:36 +01:00
Michael Telatynski e54d803343 Tweak skeleton UI height to be more reasonable 2021-10-11 10:50:33 +01:00
Michael Telatynski 111ae75874 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
 Conflicts:
	src/components/views/right_panel/UserInfo.tsx
2021-10-08 13:00:20 +01:00
James Salter e1c1d2dc0f
Merge pull request #6840 from wlach/make-placeholder-for-field-grey-no-input
Make placeholder more grey when no input
2021-10-08 12:54:57 +01:00
Michael Telatynski 2483f1dc90 Add progress bar to restricted room upgrade dialog 2021-10-08 12:20:43 +01:00
Germain Souquet 822f73edf7 Remove stale comments in _RoomSublist.scss 2021-10-07 17:28:37 +01:00
Germain 57b919b10a
Delete fixed headerContainer height
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-10-07 16:51:39 +01:00
Germain Souquet c009d15176 Allow the header container to collapse on itself when room list not minimised 2021-10-07 10:57:23 +01:00
Michael Telatynski 1d5a1c7a82
Merge pull request #6887 from matrix-org/t3chguy/fix/19216 2021-10-06 09:29:25 +01:00
ColonisationCaptain a076bee764 Decrease profile button touch target 2021-10-03 19:51:46 +01:00
Šimon Brandner 14466b1e3b
$settings-profile-placeholder-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:43:46 +02:00
Šimon Brandner 8a9c493f3a
Use correct color for a selected room in the
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-10-01 20:40:18 +02:00
Dariusz Niemczyk 17f59131d8
Merge pull request #6868 from SimonBrandner/task/colors-3-mk2
Color clean-up #3 mk2
2021-10-01 11:04:15 +02:00
Jaiwanth 1e90043eb3 Change colour variable for export dialog subheading 2021-09-30 20:58:03 +05:30
Michael Telatynski 8ac77c498f Add progress bar to Community to Space migration tool
and invite-one-by-one to workaround Synapse ratelimits
2021-09-30 13:43:59 +01:00
Jaiwanth 208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Michael Telatynski 399ceaf002
Merge pull request #6879 from matrix-org/t3chguy/fix/19164 2021-09-29 10:05:43 +01:00