Michael Telatynski ddb0f06005 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration ...

 Conflicts:

	src/components/views/right_panel/VerificationPanel.js

2020-01-27 15:46:38 +00:00

..

auth

Merge pull request #3937 from matrix-org/dbkr/e2esetup

2020-01-25 12:40:17 +00:00

avatars

Merge pull request #3855 from matrix-org/jryans/custom-status-leak

2020-01-16 22:05:50 +00:00

context_menus

Resolve default export warnings from Webpack

2020-01-24 22:26:34 +00:00

create_room

Convert CommonJS exports to ES6-compatible exports

2019-12-22 21:01:02 -07:00

dialogs

Setup flow for cross-signing on login / registration

2020-01-24 19:11:57 +00:00

directory

Fix MatrixClientPeg imports

2019-12-22 21:15:54 -07:00

elements

Actually add the secret to the QR code url

2020-01-23 20:19:17 -07:00

emojipicker

Resolve default export warnings from Webpack

2020-01-24 22:26:34 +00:00

globals

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

groups

Fix roving room list for resizer and ff tabstop a11y

2020-01-22 10:36:20 +00:00

messages

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

2020-01-24 16:19:41 +00:00

right_panel

less duplication

2020-01-24 09:41:47 -07:00

room_settings

Appease the linter

2020-01-13 13:28:33 -07:00

rooms

detail pass on DMs

2020-01-27 12:17:12 +00:00

settings

Unintentional commit

2020-01-24 09:37:43 +00:00

terms

Convert many imports to handle ES6 exports

2019-12-22 21:04:42 -07:00

toasts

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

2020-01-27 15:46:38 +00:00

verification

Apply a huge part of the decorations and copy

2020-01-24 16:16:46 +00:00

voip

Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6

2019-12-22 21:20:13 -07:00