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

 Conflicts:

	src/components/views/spaces/SpaceCreateMenu.tsx

2021-05-11 13:40:28 +01:00

..

auth

Enable indent rule and fix indent

2021-04-27 17:23:27 +02:00

avatars

Scale all mxc thumbs using device pixel ratio for hidpi

2021-04-26 18:25:49 +01:00

beta

Add mechanism for disabling Betas

2021-04-30 12:30:05 +01:00

context_menus

Forbid redaction of encryption events

2021-05-07 12:49:37 -04:00

dialogs

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

2021-05-11 13:40:28 +01:00

directory

Improve permissions error when adding new server to room directory

2021-05-11 12:20:18 +01:00

elements

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

2021-05-11 13:40:28 +01:00

emojipicker

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:39 -07:00

groups

Enable indent rule and fix indent

2021-04-27 17:23:27 +02:00

host_signup

Address some of the PR feedback

2021-02-09 20:13:58 +02:00

messages

Simple rendering of voice messages in the timeline

2021-05-03 11:41:14 -06:00

right_panel

Merge pull request #5985 from aaronraimist/blank-device-name

2021-05-10 16:19:56 +01:00

room_settings

Enable indent rule and fix indent

2021-04-27 17:23:27 +02:00

rooms

Merge branch 'develop' into edit-slashcommands

2021-05-10 20:09:33 -06: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

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

2021-05-11 13:40:28 +01:00

terms

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:54 -07:00

toasts

Move toast detail to a new line

2021-03-26 11:43:41 +00:00

verification

Enable indent rule and fix indent

2021-04-27 17:23:27 +02:00

voice_messages

Update colours and sizing for voice messages

2021-05-04 20:45:15 -06:00

voip

Use CallChangeRoom in CallViewForRoom

2021-04-28 11:56:26 +02:00