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

 Conflicts:

	package.json

	src/components/views/messages/MImageBody.js

	yarn.lock

2021-05-18 13:48:40 +01:00

..

auth

Enable indent rule and fix indent

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

avatars

Remove redundant tag prop

2021-05-13 14:23:10 +01:00

beta

Sprinkle some more feedback prompts in the spaces beta

2021-05-11 17:01:31 +01:00

context_menus

Forbid redaction of encryption events

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

dialogs

Merge branch 'develop' into travis/msc2873

2021-05-17 16:27:20 -06: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 travis/blurhash

2021-05-18 13:48:40 +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

…

messages

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

2021-05-18 13:48:40 +01:00

right_panel

Convert verification and UntrustedDeviceDialog to TS

2021-05-12 17:08:44 +01:00

room_settings

Enable indent rule and fix indent

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

rooms

Merge pull request #6030 from matrix-org/t3chguy/fix/17276

2021-05-14 11:23:46 +01:00

settings

Merge pull request #5915 from aaronraimist/initialisation

2021-05-13 20:15:08 -06:00

spaces

Fix share space edge case where space is public but not invitable

2021-05-14 10:46:09 +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

Improve progress bar progression for smaller voice messages

2021-05-13 22:35:43 -06:00

voip

Use CallChangeRoom in CallViewForRoom

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