Tulir Asokan 4521e9feb1 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering

2020-06-07 15:12:30 +03: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

When trying to restore a keyback that has its key in 4S, check if 4S will be readable

2020-06-04 12:52:20 +02:00

directory

…

elements

Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering

2020-06-07 15:12:30 +03: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 remote-tracking branch 'upstream/develop' into compact-reply-rendering

2020-06-07 15:12:30 +03: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 remote-tracking branch 'upstream/develop' into compact-reply-rendering

2020-06-07 15:12:30 +03:00

settings

Profile settings should never show a disambiguated display name

2020-06-04 09:50:19 +01:00

terms

…

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