Johannes Marbach 44d4de14c9 Merge branch 'develop' into germain-gg/notifications-labs ...

# Conflicts:
#	src/i18n/strings/en_EN.json
#	test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap

2023-09-04 14:08:50 +02:00

..

controllers

Switch to importing more things from the main js-sdk export (#11376)

2023-08-09 15:10:54 +00:00

enums

Conform src/components/views/messages/* code to strictNullChecks (#10461)

2023-03-29 08:22:35 +01:00

handlers

Switch to importing client from main js-sdk export (#11370)

2023-08-09 07:18:41 +00:00

watchers

Compound Typography pass (#11103)

2023-06-29 10:30:25 +00:00

SettingLevel.ts

Abstract electron settings properly to avoid boilerplate-hell (#8798)

2022-06-10 22:38:50 +01:00

Settings.tsx

Merge branch 'develop' into germain-gg/notifications-labs

2023-09-04 14:08:50 +02:00

SettingsStore.ts

Fix instances of double translation and guard translation calls using typescript (#11443)

2023-08-22 16:32:05 +01:00

UIFeature.ts

Show room options menu if "UIComponent.roomOptionsMenu" is enabled (#10365)

2023-06-09 12:33:54 +00:00

WatchManager.ts

Fix some features not being configurable via features (#10276)

2023-03-03 13:31:51 +00:00