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

 Conflicts:

	src/components/views/dialogs/CreateRoomDialog.js

	src/components/views/dialogs/InviteDialog.js

	src/components/views/right_panel/UserInfo.js

	src/createRoom.js

2020-06-03 10:51:17 +01:00

..

auth

delint

2020-05-14 21:01:49 +01:00

avatars

Small fixes

2020-04-27 18:36:05 +01:00

context_menus

Small fixes

2020-04-27 18:36:05 +01:00

dialogs

Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD

2020-06-03 10:45:47 +01:00

directory

Network Dropdown fix things not scrolling properly

2020-04-18 15:08:15 +01:00

elements

Create and use stylised checkboxes

2020-05-28 22:33:00 +01:00

emojipicker

Fix Emoji Picker footer being too small if text overflows

2020-05-24 20:00:02 +01:00

groups

Condense CSS rules and use box-sizing instead of math

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

messages

Rename trash (custom).svg as electron doesn't like serving files with spaces

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

right_panel

Small fixes

2020-04-27 18:36:05 +01:00

room_settings

more margin between published and local addresses

2020-03-16 18:30:40 +01:00

rooms

Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD

2020-06-03 10:45:47 +01:00

settings

Fix sizing of the security warning icon

2020-06-02 21:54:38 +01:00

terms

Use variables for the rem values.

2020-03-31 15:26:23 +01:00

verification

Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js

2020-04-07 19:03:12 +01:00

voip

Use variables for the rem values.

2020-03-31 15:26:23 +01:00