Commit graph

5 commits

Author SHA1 Message Date
Michael Telatynski
80dff8706c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/13981
 Conflicts:
	src/@types/global.d.ts
	src/stores/RoomViewStore.tsx
2020-08-04 21:33:27 +01:00
Michael Telatynski
a69560d0de add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 10:22:03 +01:00
Michael Telatynski
0db66313e2 Add more causes to blank out active room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 10:20:30 +01:00
Michael Telatynski
9aff56afcc add more types
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 10:15:05 +01:00
Michael Telatynski
8cacf1ff97 Convert RoomViewStore and ActiveRoomObserver to typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 10:14:12 +01:00
Renamed from src/stores/RoomViewStore.js (Browse further)