Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240

2021-06-28 21:00:36 -06:00

..

audio_messages

Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240

2021-06-28 21:00:36 -06:00

auth

Add explicit member access

2021-05-21 13:15:54 +01:00

avatars

Fix imports

2021-06-18 16:13:55 +01:00

beta

Iterate PR

2021-06-17 16:22:40 +01:00

context_menus

Fix pinning event in a room which hasn't had events pinned in before

2021-06-23 21:12:25 +01:00

dialogs

Merge pull request #6220 from matrix-org/t3chguy/ts/5.1

2021-06-24 15:23:59 +01:00

directory

use Intl.Collator over String.prototype.localeCompare for better performance

2021-06-02 10:42:17 +01:00

elements

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051

2021-06-24 09:33:39 +01:00

emojipicker

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:39 -07:00

groups

Add temporary mechanism for managing communities without dnd

2021-06-02 11:33:25 +01:00

host_signup

Address some of the PR feedback

2021-02-09 20:13:58 +02:00

messages

Merge remote-tracking branch 'origin/develop' into travis/new-audio

2021-06-28 20:52:44 -06:00

right_panel

Fix UserInfo not working when rendered without a room

2021-06-24 16:30:40 +01:00

room_settings

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244

2021-06-22 22:02:09 +01:00

rooms

Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240

2021-06-28 21:00:36 -06:00

settings

Fix space settings using join rule private instead of invite

2021-06-25 10:41:45 +01:00

spaces

Fix space settings using join rule private instead of invite

2021-06-25 10:41:45 +01:00

terms

Batch of views getting replaceableComponent decorators

2021-03-08 20:23:54 -07:00

toasts

Make toast dismiss button less prominent

2021-06-28 08:52:15 +01:00

verification

Merge branch 'develop' into Bubble-bericht

2021-05-07 18:32:38 +05:30

voip

Handle mid-call output changes

2021-06-23 10:09:53 +02:00