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

..

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

Add feedback mechanism for beta features

2021-05-11 15:58:19 +01:00

context_menus

Fix styling of disabled options in an Iconized menu

2021-03-01 15:40:46 +00: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

Make it easier to pan images in the lightbox

2021-06-05 21:08:44 -04: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-06-15 12:58:29 +01:00

right_panel

Actually finish the empty state for the pinned messages card

2021-06-04 11:35:17 +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

Fix colours used for the back button in space create menu

2021-05-12 10:48:06 +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

voice_messages

Scale voice message clock with user's font size

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

voip

Merge branch 'develop' into feed

2021-04-28 10:52:23 +02:00