Michael Telatynski 974d62e347 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 ...

 Conflicts:

	src/components/views/messages/TextualBody.js

	src/components/views/right_panel/UserInfo.tsx

	src/dispatcher/actions.ts

2021-05-26 14:08:01 +01:00

..

auth

Add explicit member access

2021-05-21 13:15:54 +01:00

avatars

Prevent DecoratedRoomAvatar to update its state for the same value

2021-05-25 16:58:23 +01:00

beta

Sprinkle some more feedback prompts in the spaces beta

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

context_menus

Iterate PR

2021-05-24 22:02:50 +01:00

dialogs

Merge pull request #6076 from matrix-org/jryans/convert-flow-to-ts-2

2021-05-26 10:54:09 +01:00

directory

prevent reflow in app when accessing window dimensions

2021-05-25 10:28:43 +01:00

elements

Merge pull request #6092 from matrix-org/gsouquet/window-dimensions-reflow

2021-05-25 12:00:08 +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

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

2021-05-26 14:08:01 +01:00

right_panel

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

2021-05-26 14:08:01 +01:00

room_settings

Enable indent rule and fix indent

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

rooms

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

2021-05-26 14:08:01 +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