Merge commit from fork

and migrate existing account-level settings once-only for
existing sessions.
This commit is contained in:
David Baker 2024-08-06 10:54:11 +01:00 committed by GitHub
parent 5dda51f95c
commit c7bbc1c045
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 139 additions and 13 deletions

View file

@ -900,7 +900,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
controller: new UIFeatureController(UIFeature.URLPreviews),
},
"urlPreviewsEnabled_e2ee": {
supportedLevels: [SettingLevel.ROOM_DEVICE, SettingLevel.ROOM_ACCOUNT],
supportedLevels: [SettingLevel.ROOM_DEVICE],
displayName: {
"room-account": _td("settings|inline_url_previews_room_account"),
},