Michael Telatynski 95854a2f67 Merge branches 'develop' and 't3chguy/room-list/13981' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/13981 ...

 Conflicts:

	src/@types/global.d.ts

2020-07-21 17:56:30 +01:00

..

notifications

Remove useless TagSpecificNotificationState

2020-07-17 16:20:19 -06:00

room-list

Remove unused imports

2020-07-21 15:34:00 +01:00

ActiveWidgetStore.js

Add comments to highlight where we'll need m.widget support

2020-04-09 15:14:07 -06:00

AsyncStore.ts

Show message previews on the new room list tiles

2020-06-10 18:37:59 -06:00

AsyncStoreWithClient.ts

Enable new room list store forever

2020-07-17 15:14:58 -06:00

BreadcrumbsStore.ts

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config

2020-07-20 16:22:32 +01:00

CustomRoomTagStore.js

Support custom tags in the room list again

2020-07-20 16:51:16 -06:00

FlairStore.js

…

GroupStore.js

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00

LifecycleStore.js

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00

OwnProfileStore.ts

Update profile information in User Menu

2020-06-23 21:01:50 -06:00

RightPanelStore.js

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00

RightPanelStorePhases.js

…

RoomScrollStateStore.js

Revert "Fix Filepanel scroll position state lost when room is changed"

2020-04-19 19:14:08 -06:00

RoomViewStore.tsx

add comment

2020-07-21 10:22:03 +01:00

SessionStore.js

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00

SetupEncryptionStore.js

Fix up merge to develop

2020-06-23 15:24:02 +01:00

TagOrderStore.js

Move dispatcher into a subdirectory

2020-05-13 21:07:50 -06:00

ToastStore.ts

Fix lint issues in new code

2020-07-20 20:43:55 +01:00

TypingStore.js

…

WidgetEchoStore.js

Support m.jitsi-typed widgets as Jitsi widgets

2020-04-09 15:11:57 -06:00