Michael Telatynski a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ...

 Conflicts:

	src/components/structures/LoggedInView.tsx

	src/stores/SpaceStore.tsx

2021-09-06 11:41:09 +01:00

..

CustomStatusController.ts

Fix copyright in CustomStatusController

2020-07-28 15:23:25 -06:00

FontSizeController.ts

Fix various type definitions

2020-07-30 08:49:42 -06:00

IncompatibleController.ts

Show disabled spaces section in preferences regardless

2021-08-11 23:33:10 +01:00

NewLayoutSwitcherController.ts

Add new layout switcher UI

2021-06-17 14:11:44 +01:00

NotificationControllers.ts

Iterate PR, merge types with @types/PushRules

2021-08-10 11:03:03 +01:00

OrderedMultiController.ts

Appease the linter

2020-09-18 11:39:41 -06:00

PseudonymousAnalyticsController.ts

Revert "Revert "Add support for Posthog Analytics under a labs flag""

2021-08-03 11:55:02 +01:00

PushToMatrixClientController.ts

Convert PushToMatrixClientController to TS

2020-07-28 15:21:10 -06:00

ReducedMotionController.ts

Disable chat effects when reduce motion preferred

2021-02-17 17:43:31 +00:00

ReloadOnChangeController.ts

Convert ReloadOnChangeController to TS

2020-07-28 15:21:53 -06:00

SettingController.ts

UI Feature Flag: Communities

2020-09-16 12:56:40 +01:00

SystemFontController.ts

Fix various type definitions

2020-07-30 08:49:42 -06:00

ThemeController.ts

Auto-fix lint errors

2021-06-29 13:11:58 +01:00

UIFeatureController.ts

UI Feature Flag: Communities

2020-09-16 12:56:40 +01:00

UseSystemFontController.ts

Fix various type definitions

2020-07-30 08:49:42 -06:00