Commit Graph

107 Commits (2d2755d14542dd68b8318a88dda568a794ac5c81)

Author SHA1 Message Date
Robin Townsend adb5df52a4 Merge branch 'develop' into text-for-event-perf 2021-06-29 22:13:18 -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 a921d32f44 Fix lint
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 18:51:46 -04:00
Robin Townsend f9fe28a6ad Merge branch 't3chguy/ts/8' into text-for-event-perf 2021-06-24 18:45:08 -04:00
Michael Telatynski cecf0ce299 Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript 2021-06-22 20:41:26 +01:00