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

..

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

Deprecate unused PulsedAvatar

2021-07-02 15:24:30 +01:00

beta

Move RightPanel animation to compositor

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

context_menus

update message context texts and icons

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

dialogs

Make CreateRoomDialog capable of creating restricted rooms in spaces

2021-07-06 10:10:47 +01:00

directory

Use thinner chevron for network, adjust placement

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

elements

Bring dropdown styling into closer line with rest of our styling

2021-07-06 10:08:57 +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

delint

2021-07-08 13:35:26 +01:00

settings

Add way to manage Restricted join rule in Room Settings

2021-07-02 14:51:55 +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