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

..

auth

Fix term_policy aligned to the center

2021-02-03 00:05:55 +05:30

avatars

Add CSS containement rules for shorter reflow operations

2021-06-01 11:26:32 +01:00

beta

Iterate PR

2021-06-17 16:22:40 +01:00

context_menus

Add temporary mechanism for managing communities without dnd

2021-06-02 11:33:25 +01:00

dialogs

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365

2021-06-14 22:22:30 +01:00

directory

Use thinner chevron for network, adjust placement

2020-07-31 18:15:51 +01:00

elements

Deprecate FormButton to use AccessibleButton everywhere

2021-06-21 14:16:37 +01:00

emojipicker

Fix Emoji Picker footer being too small if text overflows

2020-05-24 20:00:02 +01:00

groups

…

messages

Use the same styling as for mx_TextualEvent

2021-06-10 15:31:27 +02:00

right_panel

Deprecate FormButton to use AccessibleButton everywhere

2021-06-21 14:16:37 +01:00

room_settings

Remove some unused components

2020-08-20 20:47:02 -06:00

rooms

Fix display name overlap

2021-06-15 06:30:22 +02:00

settings

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021

2021-05-06 08:05:14 +01:00

spaces

Deprecate FormButton to use AccessibleButton everywhere

2021-06-21 14:16:37 +01:00

terms

…

toasts

Add missing scss file

2020-11-09 14:36:12 +00:00

verification

Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js

2020-04-07 19:03:12 +01:00

voice_messages

Scale voice message clock with user's font size

2021-05-07 19:27:52 -06:00

voip

Add styling for silencing

2021-05-22 20:24:20 +02:00