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

..

audio_messages

lint

2021-06-30 14:51:18 -06: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

update message context texts and icons

2021-06-24 22:20:53 +02:00

dialogs

Fix tiny scrollbar dot on chrome/electron in Forward Dialog

2021-06-28 15:37:28 +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

Condense CSS rules and use box-sizing instead of math

2019-01-28 20:26:03 -07:00

messages

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash

2021-07-01 20:48:34 +01: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 #6193 from SimonBrandner/fix/irc-layout-mxid/17648

2021-06-28 16:10:02 +01: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

Fix space avatar management layout being broken

2021-06-25 11:10:37 +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

Merge pull request #5786 from DantrazTrev/DialPad

2021-06-23 11:41:41 +01:00