Robin Townsend
2021650d77
Merge branch 'develop' into watch-show-timestamps
2021-06-29 22:43:46 -04:00
Michael Telatynski
a59e94b907
delint
2021-06-29 22:21:05 +01:00
Michael Telatynski
8f4879ea96
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/ScrollPanel.tsx
src/components/structures/TimelinePanel.tsx
src/components/views/elements/ErrorBoundary.tsx
src/components/views/elements/EventListSummary.tsx
src/components/views/messages/TileErrorBoundary.tsx
2021-06-29 22:14:40 +01:00
Michael Telatynski
623317cd47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/TimelinePanel.tsx
2021-06-29 15:22:54 +01:00
Robin Townsend
d466d1a7ee
Add alwaysShowTimestamps and others to RoomView setting watchers
...
to allow them to update on the fly. This also modifies the setting
watchers to avoid an unnecessary settings lookup.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 11:28:16 -04:00
Michael Telatynski
cecf0ce299
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
2021-06-22 20:41:26 +01:00
