Michael Telatynski 6d69ec17d9 Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus ...

 Conflicts:

	src/components/views/context_menus/RoomTileContextMenu.js

2019-11-28 16:25:59 +00:00

..

auth

Allow connecting to an IS from address picker

2019-08-29 15:28:34 +01:00

avatars

Mark a few CSS classes as not selectable

2019-04-23 19:52:48 +02:00

context_menus

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

2019-11-28 16:25:59 +00:00

dialogs

It's called an "Integration Manager" (singular)

2019-11-20 20:14:25 -07:00

directory

Auto-fix stylelint issues

2019-07-10 16:56:40 +01:00

elements

use FormButton in verification request tile too and dedupe styles

2019-11-22 16:32:50 +01:00

emojipicker

Fix quick reactions to be aligned with other emoji

2019-10-28 13:17:59 +00:00

globals

Auto-fix stylelint issues

2019-07-10 16:56:40 +01:00

groups

Condense CSS rules and use box-sizing instead of math

2019-01-28 20:26:03 -07:00

messages

use FormButton in verification request tile too and dedupe styles

2019-11-22 16:32:50 +01:00

right_panel

improve device list layout

2019-11-19 12:51:37 +01:00

room_settings

Auto-fix stylelint issues

2019-07-10 16:56:40 +01:00

rooms

Merge pull request #3653 from matrix-org/bwindels/fixe2eicons

2019-11-21 19:01:17 +00:00

settings

It's called an "Integration Manager" (singular)

2019-11-20 20:14:25 -07:00

terms

Add an inline terms agreement component

2019-08-19 22:59:33 -06:00

verification

Change SAS to decimal / emoji

2019-02-08 14:57:36 +00:00

voip

Auto-fix stylelint issues

2019-07-10 16:56:40 +01:00