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

Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas

2020-06-25 22:00:22 +01:00

avatars

Fix imports for NotificationStates

2020-07-02 13:28:06 -06:00

context_menus

Remove EncryptedEventDialog

2020-05-26 13:37:57 +01:00

create_room

s/alias/address/ in copy

2020-04-14 10:06:57 +01:00

dialogs

remove rogue blank line

2020-06-30 17:56:50 +01:00

directory

Fix missed copy

2020-03-16 12:28:20 +00:00

elements

Lint

2020-07-01 12:28:00 +01:00

emojipicker

Stop removing variation selector from quick reactions

2020-06-04 18:58:13 +03:00

groups

Remove feature_cross_signing

2020-05-27 10:28:25 +01:00

messages

Merge pull request #4622 from aaronraimist/redaction-timestamp

2020-06-29 11:10:25 +01:00

right_panel

User Info default power levels for ban/kick/redact to 50 as per spec

2020-06-14 01:35:24 +01:00

room_settings

Merge pull request #4402 from matrix-org/t3chguy/alias

2020-05-26 09:36:58 +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

Appease the linter

2020-06-30 19:37:00 -06:00

terms

Factor out cloning to a util and use it everywhere

2020-06-22 14:14:43 -06:00

toasts

Add Generic Expiring Toast

2020-06-29 11:38:50 +01: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