OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
35,434 Commits
218 Branches
563 Tags
475 MiB
Commit Graph

3492 Commits (f532c302b6792e7ab1a6fda45db1b6690163d8c4)

Author SHA1 Message Date
Šimon Brandner d149cead5f
Remove unused CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 12:27:03 +02:00
Šimon Brandner b4ae54dcce
Remove unused CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 12:15:22 +02:00
Šimon Brandner 866a11d7e3
Fix image alignment issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 11:49:49 +02:00
Šimon Brandner fca5125c5b
Improve redacted body look 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 10:36:44 +02:00
Germain Souquet 290174b031 fix group layout and IRC layout regressions 2021-07-13 10:36:35 +02:00
Germain Souquet ba3e7e24ba Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-13 10:15:27 +02:00
Germain Souquet 1061cb0ffb Fix layout regressions in message bubbles 2021-07-13 10:15:12 +02:00
Šimon Brandner 562d43e81c
Font 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:36:31 +02:00
Šimon Brandner 43cf7bc611
Remove 0px 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 09:33:45 +02:00
Šimon Brandner 5f81cfe9d9
Nicer formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 08:24:18 +02:00
Travis Ralston ff7a18da56 Rewrite Notifications component for modern UI & processing 2021-07-12 23:57:54 -06:00
Travis Ralston 3ae76c84f6 Add a simple TagComposer for the keywords entry 2021-07-12 23:55:08 -06:00
Šimon Brandner 4ddcb9a484
Make diffs look a bit better 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 16:59:16 +02:00
Šimon Brandner 3921e42e8a
Make diff colors in codeblocks more pleseant 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 12:32:30 +02:00
Germain 8a816bb096
Merge pull request #6331 from matrix-org/gsouquet/ghost-button-background 
Make ghost button background transparent
 2021-07-12 09:07:52 +01:00
Michael Telatynski 829169ec87
Merge pull request #6342 from matrix-org/t3chguy/fix/vrlp 
Fix small visual regression with the site name on url previews
 2021-07-09 18:05:48 +01:00
Michael Telatynski 8072007782 Fix small visual regression with the site name on url previews 2021-07-09 14:50:55 +01:00
Michael Telatynski f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-09 08:13:39 +01:00
Šimon Brandner 91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 08:26:19 +02:00
Šimon Brandner b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:17:34 +02:00
Šimon Brandner 722c360de0
Use the correct color for silence button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 14:42:05 +02:00
Michael Telatynski 1c2bdf3cf4 delint 2021-07-08 13:35:26 +01:00
Šimon Brandner 2615ea7f3f
Add icons to buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 14:35:06 +02:00
Michael Telatynski 00a3f5d469 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494 2021-07-08 13:29:10 +01:00
Šimon Brandner 9ec3d93402
Better handling of call types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 14:19:02 +02:00
Michael Telatynski 1cdae54880 Fix text wrapping for Link Preview Widget 2021-07-08 13:16:58 +01:00
Šimon Brandner 6f1fc3fc7e
Fix call button spacing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 13:43:59 +02:00
Šimon Brandner 9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
Germain Souquet 16dc3c47e1 Make ghost button background transparent 2021-07-08 10:37:40 +02:00
Michael Telatynski b9a539eaa2 Improve URL Previews 
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
 2021-07-07 18:04:30 +01:00
Germain Souquet 55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Germain Souquet 6a03ab825f Fix style linting 2021-07-07 13:15:25 +02:00
Germain Souquet 10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Germain Souquet 870857f321 Right hand side border radius 2021-07-07 13:00:31 +02:00
Germain Souquet 7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Germain Souquet b0a1fc7b97 Updated color scheme and spacing 2021-07-07 11:23:38 +02:00
Šimon Brandner b5bad0cc23
Add comments 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:28:29 +02:00
Šimon Brandner 2cd2015e36
Use atom-one-light for light theme 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:24:59 +02:00
Šimon Brandner f8307a92d8
Use atom-one-dark for dark theme 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:24:48 +02:00
Šimon Brandner 9d12439ee7
Give codeblocks a background color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 09:22:56 +02:00
Šimon Brandner 8c1721fc35
Remove the old codeblock code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 09:22:50 +02:00
Michael Telatynski eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski 82100df9ea Bring dropdown styling into closer line with rest of our styling 2021-07-06 10:08:57 +01:00
Germain Souquet de875bbe1d fix avatar position and outline 2021-07-05 16:22:18 +02:00
Michael Telatynski 1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
Germain 1b95762910
Merge pull request #6310 from matrix-org/gsouquet/faster-animations 2021-07-05 12:21:49 +01:00
David Baker 0cee0db9df Fix icon size in passphrase prompt 2021-07-02 20:38:07 +01:00
Germain Souquet df64a076d9 Deprecate unused PulsedAvatar 2021-07-02 15:24:30 +01:00
Germain Souquet a22baa1b2b move file drop image animation to compositor 2021-07-02 15:23:27 +01:00
Germain Souquet a093ea6357 Move RightPanel animation to compositor 2021-07-02 15:23:03 +01:00
Germain Souquet aac0989005 Make beta dot animation run on the compositor 2021-07-02 14:58:59 +01:00
Michael Telatynski e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Šimon Brandner 0d8f84c769
Delete lozenge effect 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 15:35:52 +02:00
Šimon Brandner e582b1559b
Fix redacted messages (again) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 15:09:02 +02:00
Šimon Brandner 0fe10e4502
Fix replies to deleted messages 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 14:22:46 +02:00
Šimon Brandner b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:14:14 +02:00
Tulir Asokan 5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
 2021-07-01 20:48:34 +01:00
David Baker 5e3c8fae5c put this just on the buttons 2021-07-01 15:22:44 +01:00
Germain Souquet d90d1ca8db event list summary alignment in bubble layout 2021-07-01 14:56:34 +01:00
David Baker 66d95ed7b2 Fix button styling in verification bubbles 2021-07-01 14:51:20 +01:00
Germain Souquet 223b40c9d6 Add dark theme support 2021-07-01 14:23:00 +01:00
Travis Ralston da8a783ca0 lint 2021-06-30 14:51:18 -06:00
Travis Ralston 12d7be2b6a Merge branch 'develop' into travis/new-audio 2021-06-30 13:25:41 -06:00
Germain Souquet 209344d443 improvements to bubble layout 2021-06-30 17:06:51 +01:00
Germain Souquet d1c6cfe6b9 Improved message bubble layout (no reply) 2021-06-30 12:06:16 +01:00
Germain Souquet d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
Germain Souquet fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Germain Souquet 4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind 2021-06-29 11:59:13 +01:00
Michael Telatynski 26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 2021-06-28 21:00:36 -06:00
Travis Ralston 964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf 
Improve audio recording performance
 2021-06-28 20:49:21 -06:00
J. Ryan Stinnett 52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 
Fix IRC layout regressions
 2021-06-28 16:10:02 +01:00
Michael Telatynski 494f4d3ab4
Merge pull request #6248 from matrix-org/t3chguy/fix/17731 2021-06-28 16:08:12 +01:00
Michael Telatynski 56514d51a6 Fix tiny scrollbar dot on chrome/electron in Forward Dialog 2021-06-28 15:37:28 +01:00
Germain Souquet 6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Michael Telatynski 1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski 2e940b7763
Update res/css/structures/_RoomStatusBar.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-06-25 14:47:17 +01:00
Michael Telatynski 1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click 2021-06-25 14:42:18 +01:00
Michael Telatynski b371abe556
Merge pull request #6266 from matrix-org/t3chguy/fix/17768 
Fix space avatar management layout being broken
 2021-06-25 11:58:41 +01:00
Andrew Morgan a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Michael Telatynski 620e14eb4b Fix space avatar management layout being broken 2021-06-25 11:10:37 +01:00
Travis Ralston 7a6ee7d918 I know how CSS works. 2021-06-25 00:22:05 -06:00
Travis Ralston e0a73a583e Increase clickable area of seek bar 2021-06-25 00:19:57 -06:00
Travis Ralston dd53c25706 Fix right panel sizing 2021-06-24 20:37:34 -06:00
Travis Ralston ebb6f1b602 Add seeking and notes about clock desync 2021-06-24 20:18:50 -06:00
Michael Weimann 086042f078
update message context texts and icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:53 +02:00
Michael Weimann 6ea79b297f
tweak message context icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:51 +02:00
Michael Weimann 8f6904ec1b
tweak the message menu cancel icon size 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann 74f61795eb
add _MessageContextMenu.scss license header 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann 62efea7e19
add message context menu icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann e4eeafd485
migrate the message context menu to IconizedContextMenu 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:49 +02:00
Travis Ralston 9c752680ba Tile styling and early behaviour 2021-06-24 13:56:11 -06:00
Travis Ralston ffef2e58cb Unify audio message types to new media body 2021-06-24 11:38:35 -06:00
Travis Ralston 8ce77e618f Reduce pointless CSS vars by 2 2021-06-24 11:38:35 -06:00
Travis Ralston 470778cbb8 Move voice message components to audio-generic directory 2021-06-24 11:38:35 -06:00
Travis Ralston 9f2eba4351 Fix class identifiers 2021-06-24 11:38:35 -06:00
Šimon Brandner 430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Michael Telatynski 6d3e7730ef Fix two PRs duplicating the css attribute 2021-06-24 11:40:49 +01:00
Michael Telatynski 71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051 2021-06-24 11:20:12 +01:00
Michael Telatynski 26d8c4d2e6 Improve design of the multi inviter error dialog 2021-06-24 10:03:32 +01:00
Germain Souquet 09c22c37ff Add comment to specify variable origin 2021-06-24 10:01:44 +01:00
Šimon Brandner 0fe6a28853
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 10:57:09 +02:00
Germain Souquet 56467485f5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-24 09:42:47 +01:00
Šimon Brandner 8d47ea63c2
Make pinned message text clickable 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 10:41:55 +02:00
Michael Telatynski 0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
Michael Telatynski 47be728eb2 Fix invite dialog being cut off when it has limited results 2021-06-24 09:21:52 +01:00
Michael Telatynski 5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Michael Telatynski cdb97d5494 Fix trashcan.svg by exporting it with its viewbox 
then fix sizing and alignment of consumers
 2021-06-23 12:30:23 +01:00
David Baker f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad 
Dial Pad UI bug fixes
 2021-06-23 11:41:41 +01:00
Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
 2021-06-22 22:02:09 +01:00
Michael Telatynski 6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
 2021-06-22 21:15:53 +01:00
Michael Telatynski e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-06-22 17:38:05 +01:00
Germain Souquet 27d255f30e Reduce audio waveform layout trashing 2021-06-22 12:27:54 +01:00
Šimon Brandner 202cb0f5d8
Fix styling of buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-21 17:05:36 +02:00
Germain Souquet adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Šimon Brandner 401fe1d05b
Add call silencing to CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-19 20:03:09 +02:00
Šimon Brandner 21a960acc7
Fix timestamp issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-19 17:53:00 +02:00
Šimon Brandner c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648 2021-06-19 17:24:30 +02:00
Tulir Asokan c1bc4b0027 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-19 16:11:53 +03:00
Germain Souquet 6271c5c3d8 first iteration for message bubble layout 2021-06-18 18:59:22 +01:00
Šimon Brandner 6fb3bdbcd0
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-18 19:02:56 +02:00
Šimon Brandner f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:07:43 +02:00
Šimon Brandner 707ecd8786
Don't highlight bubble events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:03:48 +02:00
Šimon Brandner 62de75ab00
Increase height 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 16:19:57 +02:00
Šimon Brandner 9b6195317e
Improve padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 16:14:54 +02:00
Šimon Brandner 88ba24f362
Fix bugs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 18:34:58 +02:00
Šimon Brandner a781d6f128
Adjust padding and line-height a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 18:13:52 +02:00
Šimon Brandner 512c054656
Add call type icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 17:55:18 +02:00
Germain 71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591 2021-06-17 16:41:00 +01:00
Michael Telatynski 7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Šimon Brandner 02e6559330
Set text color to secondary-fg-color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 17:04:56 +02:00
Šimon Brandner 7b6c3aec63
Change some styling to better match the designs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 16:33:00 +02:00
Šimon Brandner 949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Šimon Brandner d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-17 15:41:19 +02:00
Šimon Brandner dbdb61c820
Improve the mxid overlap situation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-16 17:21:29 +02:00
Michael Telatynski 384bb3af2e Fix layout regression in the invite dialog for few results 2021-06-16 10:37:34 +01:00
Michael Telatynski b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Šimon Brandner 5dc87869eb
Also override mx_SenderProfile_mxid 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 17:22:47 +02:00
Tulir Asokan cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03:00
Michael Telatynski 660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
 2021-06-15 12:58:29 +01:00
Michael Telatynski 83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-06-15 12:24:26 +01:00
Šimon Brandner d08495bde6
Fix display name overlap 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 06:30:22 +02:00
Michael Telatynski 6b4f63df2a
Merge pull request #6184 from matrix-org/t3chguy/rs/5566 2021-06-14 23:27:51 +01:00
Michael Telatynski 539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Michael Telatynski f8eea2ae23 Fix word wrap in space descriptions 2021-06-14 22:18:02 +01:00
Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	yarn.lock
 2021-06-14 21:39:06 +01:00
Michael Telatynski 91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00