Michael Telatynski 880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks ...

 Conflicts:

	src/components/views/avatars/BaseAvatar.js

	test/components/views/messages/TextualBody-test.js

2020-05-23 11:12:58 +01:00

..

auth

Merge pull request #4599 from matrix-org/t3chguy/progress_colour

2020-05-18 11:08:08 +01:00

avatars

Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks

2020-05-23 11:12:58 +01:00

context_menus

Demonstrate dis.fire() with view_user_settings

2020-05-13 21:08:08 -06:00

create_room

…

dialogs

Merge pull request #4253 from matrix-org/travis/room-list-2

2020-05-21 13:30:32 -06:00

directory

…

elements

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

2020-05-20 13:46:17 +01:00

emojipicker

Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets

2020-03-28 00:51:01 +00:00

globals

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00

groups

Convert view_user dispatch to prove the conversion works

2020-05-13 21:07:50 -06:00

messages

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui

2020-05-19 18:03:44 +01:00

right_panel

Convert view_user dispatch to prove the conversion works

2020-05-13 21:07:50 -06:00

room_settings

Demonstrate dis.fire() with view_user_settings

2020-05-13 21:08:08 -06:00

rooms

Fix: Tag_DM is not defined

2020-05-22 13:49:56 +01:00

settings

CONSTANT_CASING

2020-05-20 15:17:47 +01:00

terms

…

toasts

Merge branch 'develop' into travis/dispatcher-types

2020-05-15 09:56:02 -06:00

verification

Provide separate translatable for case where we have no device

2020-05-12 12:42:16 +01:00

voip

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00