Michael Telatynski 342fcb09c4 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

	src/components/views/toasts/VerificationRequestToast.js

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

..

auth

Remove riot logo from the security setup screens

2020-01-23 18:14:08 +00:00

avatars

Fix scaling of the avatar in UserInfo

2019-12-19 12:27:25 +00:00

context_menus

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

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

dialogs

Merge pull request #3905 from matrix-org/travis/user-lists-final

2020-01-23 09:04:40 -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

Apply a huge part of the decorations and copy

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

room_settings

Auto-fix stylelint issues

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

rooms

Re-enable stylelint on CI

2020-01-24 14:03:31 +00:00

settings

post-merge fix

2019-12-16 16:23:35 +00: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