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

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab

2020-06-01 14:32:31 +01:00

avatars

Merge pull request #4643 from matrix-org/t3chguy/fix-memberavatar

2020-05-26 13:41:15 +01: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

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

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

directory

Fix missed copy

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

elements

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

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

emojipicker

Merge pull request #4636 from matrix-org/t3chguy/emojipickera11y

2020-05-26 12:02:07 +01:00

groups

Remove feature_cross_signing

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

messages

Unused imports

2020-05-26 13:46:47 +01:00

right_panel

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

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

room_settings

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

2020-05-26 09:36:58 +01:00

rooms

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

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

settings

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

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

terms

Use noreferrer in addition to noopener for edge case browsers

2020-02-23 22:14:29 +00:00

toasts

Correct the GenericToast props to show the two modes of operation

2020-05-29 19:13:59 +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