Michael Telatynski 55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 ...

 Conflicts:

	src/components/views/settings/ProfileSettings.js

2020-10-06 10:51:30 +01:00

..

auth

Validation improve pattern for derived data

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

avatars

Convert UserInfo to Typescript

2020-09-29 10:10:32 +01:00

context_menus

Don't show 'unpin' for persistent widgets

2020-09-10 14:30:35 +01:00

dialogs

Fix button label on the Set Password Dialog

2020-09-29 14:24:01 +01:00

directory

Fix missed copy

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

elements

Merge pull request #5262 from matrix-org/t3chguy/fix/15286

2020-10-02 18:18:36 +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

Decorate failed e2ee downgrade attempts better

2020-10-02 16:38:02 +01:00

right_panel

Merge pull request #5261 from matrix-org/t3chguy/fix/15279

2020-10-02 18:18:20 +01:00

room_settings

Clean up other unlinted lint issues

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

rooms

Merge pull request #5268 from matrix-org/t3chguy/fix/15349

2020-10-06 00:32:05 +01:00

settings

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

2020-10-06 10:51:30 +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

Convert CallHandler to typescript

2020-09-24 16:16:20 +01:00