Michael Telatynski 9cf162e267 Merge branches 'develop' and 't3chguy/room-list/6' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/6 ...

 Conflicts:

	src/components/views/rooms/RoomSublist2.tsx

	src/components/views/rooms/RoomTile2.tsx

2020-07-03 00:02:37 +01:00

..

auth

delint

2020-06-26 14:22:59 +01:00

avatars

Fix a couple badge alignment issues with community invites

2020-07-02 14:05:31 -06:00

context_menus

Small fixes

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

dialogs

Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2

2020-06-30 18:06:12 +01:00

directory

Network Dropdown fix things not scrolling properly

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

elements

Add tooltips

2020-07-01 01:50:31 +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 branches 'develop' and 't3chguy/room-list/6' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/6

2020-07-03 00:02:37 +01:00

settings

Move compact checkbox

2020-06-24 16:06:50 +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