Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee

default to not showing url previews in e2ee rooms.
This commit is contained in:
David Baker 2018-06-25 11:50:14 +01:00 committed by GitHub
commit 553111b6e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 110 additions and 70 deletions

View file

@ -245,6 +245,13 @@ export const SETTINGS = {
},
default: true,
},
"urlPreviewsEnabled_e2ee": {
supportedLevels: ['room-device', 'room-account'],
displayName: {
"room-account": _td("Enable URL previews for this room (only affects you)"),
},
default: false,
},
"roomColor": {
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
displayName: _td("Room Colour"),