Michael Telatynski 02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 ...

 Conflicts:

	src/components/views/spaces/SpaceTreeLevel.tsx

	src/dispatcher/actions.ts

	src/i18n/strings/en_EN.json

2021-07-29 16:11:16 +01:00

..

audio_messages

Force padding overrides to take precedence over MediaBody styles

2021-07-21 14:47:27 -06:00

auth

Fix term_policy aligned to the center

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

avatars

Fix clipped avatar in room list

2021-07-23 14:17:26 +02:00

beta

Move RightPanel animation to compositor

2021-07-02 15:23:03 +01:00

context_menus

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

2021-07-29 16:11:16 +01:00

dialogs

Merge pull request #6424 from matrix-org/t3chguy/fix/18071

2021-07-29 15:57:26 +01:00

directory

Use thinner chevron for network, adjust placement

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

elements

Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163

2021-07-27 11:04:23 -06:00

emojipicker

Fix Emoji Picker footer being too small if text overflows

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

groups

…

messages

Merge branch 'develop' into gsouquet/fix-18132

2021-07-29 10:27:00 +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

Merge pull request #6499 from matrix-org/gsouquet/fix-18195

2021-07-29 14:33:34 +01:00

settings

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

2021-07-28 19:24:26 +01:00

spaces

Re-add top border stroke in space create menu

2021-07-29 15:13:02 +01:00

terms

Use variables for the rem values.

2020-03-31 15:26:23 +01:00

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

voip

Fix issues with the controls disappearing

2021-07-25 18:11:29 +02:00