Michael Telatynski d36fafd0c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets ...

 Conflicts:

	res/css/views/rooms/_AppsDrawer.scss

	src/components/views/elements/AppTile.js

	src/components/views/rooms/AppsDrawer.js

2020-10-14 10:23:44 +01:00

..

auth

Validation improve pattern for derived data

2020-09-21 14:35:35 +01:00

avatars

Iterate on Widget icons and resizing handles

2020-10-13 15:56:53 +01:00

context_menus

Improve the context menu

2020-10-12 09:51:49 +01:00

dialogs

Remove various remaining bits of ILAG flows

2020-10-07 12:53:59 +01:00

directory

Fix missed copy

2020-03-16 12:28:20 +00:00

elements

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

2020-10-14 10:23:44 +01:00

emojipicker

Choose first result on enter in the emoji picker

2020-09-28 15:56:22 +01:00

groups

Delint

2020-08-29 12:57:11 +01:00

messages

Fix edited replies being wrongly treated as big emoji

2020-10-07 11:08:43 +01:00

right_panel

Switch to WidgetAvatar

2020-10-12 13:16:55 +01:00

room_settings

Clean up other unlinted lint issues

2020-09-24 08:26:59 -06:00

rooms

Merge pull request #5313 from matrix-org/t3chguy/other/1

2020-10-14 10:06:37 +01:00

settings

Merge pull request #5296 from matrix-org/jryans/sso-4s-integration

2020-10-07 15:42:42 +01:00

terms

Fix indentation

2020-07-16 18:12:11 +05:30

toasts

Fix eslint ts override tsx matching and delint

2020-08-29 01:11:08 +01:00

verification

Revert "Merge pull request #5125 from matrix-org/travis/spec-i18n"

2020-08-18 13:09:33 -06:00

voip

Rewrite call state machine

2020-10-09 18:56:07 +01:00