Merge branch 'develop' into germain-gg/notifications-labs
# Conflicts: # src/i18n/strings/en_EN.json # test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
This commit is contained in:
Johannes Marbach
commit
44d4de14c9
143 changed files with 7371 additions and 6803 deletions
|
|
@ -324,7 +324,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"useOnlyCurrentProfiles": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show current profile picture and name for users in message history"),
|
||||
displayName: _td("settings|disable_historical_profile"),
|
||||
default: false,
|
||||
},
|
||||
"mjolnirRooms": {
|
||||
|
|
@ -369,7 +369,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"sendReadReceipts": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Send read receipts"),
|
||||
displayName: _td("settings|send_read_receipts"),
|
||||
default: true,
|
||||
controller: new ServerSupportUnstableFeatureController(
|
||||
"sendReadReceipts",
|
||||
|
|
@ -472,6 +472,14 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
default: "",
|
||||
controller: new FontSizeController(),
|
||||
},
|
||||
"feature_render_reaction_images": {
|
||||
isFeature: true,
|
||||
labsGroup: LabGroup.Messaging,
|
||||
displayName: _td("Render custom images in reactions"),
|
||||
description: _td('Sometimes referred to as "custom emojis".'),
|
||||
supportedLevels: LEVELS_FEATURE,
|
||||
default: false,
|
||||
},
|
||||
/**
|
||||
* With the transition to Compound we are moving to a base font size
|
||||
* of 16px. We're taking the opportunity to move away from the `baseFontSize`
|
||||
|
|
@ -491,13 +499,13 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"MessageComposerInput.suggestEmoji": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Enable Emoji suggestions while typing"),
|
||||
displayName: _td("settings|emoji_autocomplete"),
|
||||
default: true,
|
||||
invertedSettingName: "MessageComposerInput.dontSuggestEmoji",
|
||||
},
|
||||
"MessageComposerInput.showStickersButton": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show stickers button"),
|
||||
displayName: _td("settings|show_stickers_button"),
|
||||
default: true,
|
||||
controller: new UIFeatureController(UIFeature.Widgets, false),
|
||||
},
|
||||
|
|
@ -508,7 +516,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"MessageComposerInput.insertTrailingColon": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Insert a trailing colon after user mentions at the start of a message"),
|
||||
displayName: _td("settings|insert_trailing_colon_mentions"),
|
||||
default: true,
|
||||
},
|
||||
// TODO: Wire up appropriately to UI (FTUE notifications)
|
||||
|
|
@ -548,6 +556,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
isFeature: true,
|
||||
labsGroup: LabGroup.Rooms,
|
||||
displayName: _td("labs|new_room_decoration_ui"),
|
||||
description: _td("labs|under_active_development"),
|
||||
supportedLevels: LEVELS_FEATURE,
|
||||
default: false,
|
||||
controller: new ReloadOnChangeController(),
|
||||
|
|
@ -568,72 +577,72 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"showRedactions": {
|
||||
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
|
||||
displayName: _td("Show a placeholder for removed messages"),
|
||||
displayName: _td("settings|show_redaction_placeholder"),
|
||||
default: true,
|
||||
invertedSettingName: "hideRedactions",
|
||||
},
|
||||
"showJoinLeaves": {
|
||||
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
|
||||
displayName: _td("Show join/leave messages (invites/removes/bans unaffected)"),
|
||||
displayName: _td("settings|show_join_leave"),
|
||||
default: true,
|
||||
invertedSettingName: "hideJoinLeaves",
|
||||
},
|
||||
"showAvatarChanges": {
|
||||
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
|
||||
displayName: _td("Show profile picture changes"),
|
||||
displayName: _td("settings|show_avatar_changes"),
|
||||
default: true,
|
||||
invertedSettingName: "hideAvatarChanges",
|
||||
},
|
||||
"showDisplaynameChanges": {
|
||||
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
|
||||
displayName: _td("Show display name changes"),
|
||||
displayName: _td("settings|show_displayname_changes"),
|
||||
default: true,
|
||||
invertedSettingName: "hideDisplaynameChanges",
|
||||
},
|
||||
"showReadReceipts": {
|
||||
supportedLevels: LEVELS_ROOM_SETTINGS,
|
||||
displayName: _td("Show read receipts sent by other users"),
|
||||
displayName: _td("settings|show_read_receipts"),
|
||||
default: true,
|
||||
invertedSettingName: "hideReadReceipts",
|
||||
},
|
||||
"showTwelveHourTimestamps": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show timestamps in 12 hour format (e.g. 2:30pm)"),
|
||||
displayName: _td("settings|use_12_hour_format"),
|
||||
default: false,
|
||||
},
|
||||
"alwaysShowTimestamps": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Always show message timestamps"),
|
||||
displayName: _td("settings|always_show_message_timestamps"),
|
||||
default: false,
|
||||
},
|
||||
"autoplayGifs": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Autoplay GIFs"),
|
||||
displayName: _td("settings|autoplay_gifs"),
|
||||
default: false,
|
||||
},
|
||||
"autoplayVideo": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Autoplay videos"),
|
||||
displayName: _td("settings|autoplay_videos"),
|
||||
default: false,
|
||||
},
|
||||
"enableSyntaxHighlightLanguageDetection": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Enable automatic language detection for syntax highlighting"),
|
||||
displayName: _td("settings|automatic_language_detection_syntax_highlight"),
|
||||
default: false,
|
||||
},
|
||||
"expandCodeByDefault": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Expand code blocks by default"),
|
||||
displayName: _td("settings|code_block_expand_default"),
|
||||
default: false,
|
||||
},
|
||||
"showCodeLineNumbers": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show line numbers in code blocks"),
|
||||
displayName: _td("settings|code_block_line_numbers"),
|
||||
default: true,
|
||||
},
|
||||
"scrollToBottomOnMessageSent": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Jump to the bottom of the timeline when you send a message"),
|
||||
displayName: _td("settings|jump_to_bottom_on_send"),
|
||||
default: true,
|
||||
},
|
||||
"Pill.shouldShowPillAvatar": {
|
||||
|
|
@ -644,7 +653,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"TextualBody.enableBigEmoji": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Enable big emoji in chat"),
|
||||
displayName: _td("settings|big_emoji"),
|
||||
default: true,
|
||||
invertedSettingName: "TextualBody.disableBigEmoji",
|
||||
},
|
||||
|
|
@ -658,23 +667,25 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"sendTypingNotifications": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Send typing notifications"),
|
||||
displayName: _td("settings|send_typing_notifications"),
|
||||
default: true,
|
||||
invertedSettingName: "dontSendTypingNotifications",
|
||||
},
|
||||
"showTypingNotifications": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show typing notifications"),
|
||||
displayName: _td("settings|show_typing_notifications"),
|
||||
default: true,
|
||||
},
|
||||
"ctrlFForSearch": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: IS_MAC ? _td("Use Command + F to search timeline") : _td("Use Ctrl + F to search timeline"),
|
||||
displayName: IS_MAC ? _td("settings|use_command_f_search") : _td("settings|use_control_f_search"),
|
||||
default: false,
|
||||
},
|
||||
"MessageComposerInput.ctrlEnterToSend": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: IS_MAC ? _td("Use Command + Enter to send a message") : _td("Use Ctrl + Enter to send a message"),
|
||||
displayName: IS_MAC
|
||||
? _td("settings|use_command_enter_send_message")
|
||||
: _td("settings|use_control_enter_send_message"),
|
||||
default: false,
|
||||
},
|
||||
"MessageComposerInput.surroundWith": {
|
||||
|
|
@ -684,18 +695,13 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"MessageComposerInput.autoReplaceEmoji": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Automatically replace plain text Emoji"),
|
||||
displayName: _td("settings|replace_plain_emoji"),
|
||||
default: false,
|
||||
},
|
||||
"MessageComposerInput.useMarkdown": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Enable Markdown"),
|
||||
description: () =>
|
||||
_t(
|
||||
"Start messages with <code>/plain</code> to send without markdown.",
|
||||
{},
|
||||
{ code: (sub) => <code>{sub}</code> },
|
||||
),
|
||||
displayName: _td("settings|enable_markdown"),
|
||||
description: () => _t("settings|enable_markdown_description", {}, { code: (sub) => <code>{sub}</code> }),
|
||||
default: true,
|
||||
},
|
||||
"VideoView.flipVideoHorizontally": {
|
||||
|
|
@ -784,7 +790,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"SpotlightSearch.showNsfwPublicRooms": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show NSFW content"),
|
||||
displayName: _td("settings|show_nsfw_content"),
|
||||
default: false,
|
||||
},
|
||||
"room_directory_servers": {
|
||||
|
|
@ -848,7 +854,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
"urlPreviewsEnabled": {
|
||||
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
|
||||
displayName: {
|
||||
"default": _td("Enable inline URL previews by default"),
|
||||
"default": _td("settings|inline_url_previews_default"),
|
||||
"room-account": _td("Enable URL previews for this room (only affects you)"),
|
||||
"room": _td("Enable URL previews by default for participants in this room"),
|
||||
},
|
||||
|
|
@ -892,7 +898,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"promptBeforeInviteUnknownUsers": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Prompt before sending invites to potentially invalid matrix IDs"),
|
||||
displayName: _td("settings|prompt_invite"),
|
||||
default: true,
|
||||
},
|
||||
"widgetOpenIDPermissions": {
|
||||
|
|
@ -904,7 +910,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"breadcrumbs": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show shortcuts to recently viewed rooms above the room list"),
|
||||
displayName: _td("settings|show_breadcrumbs"),
|
||||
default: true,
|
||||
},
|
||||
"FTUE.userOnboardingButton": {
|
||||
|
|
@ -935,7 +941,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"showImages": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show previews/thumbnails for images"),
|
||||
displayName: _td("settings|image_thumbnails"),
|
||||
default: true,
|
||||
},
|
||||
"RightPanel.phasesGlobal": {
|
||||
|
|
@ -993,7 +999,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
},
|
||||
"showChatEffects": {
|
||||
supportedLevels: LEVELS_ROOM_SETTINGS_WITH_ROOM,
|
||||
displayName: _td("Show chat effects (animations when receiving e.g. confetti)"),
|
||||
displayName: _td("settings|show_chat_effects"),
|
||||
default: true,
|
||||
controller: new ReducedMotionController(),
|
||||
},
|
||||
|
|
@ -1011,8 +1017,8 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
default: {},
|
||||
},
|
||||
"Spaces.allRoomsInHome": {
|
||||
displayName: _td("Show all rooms in Home"),
|
||||
description: _td("All rooms you're in will appear in Home."),
|
||||
displayName: _td("settings|all_rooms_home"),
|
||||
description: _td("settings|all_rooms_home_description"),
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
default: false,
|
||||
},
|
||||
|
|
@ -1155,12 +1161,12 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
// We store them over there are they are necessary to know before the renderer process launches.
|
||||
"Electron.autoLaunch": {
|
||||
supportedLevels: [SettingLevel.PLATFORM],
|
||||
displayName: _td("Start automatically after system login"),
|
||||
displayName: _td("settings|start_automatically"),
|
||||
default: false,
|
||||
},
|
||||
"Electron.warnBeforeExit": {
|
||||
supportedLevels: [SettingLevel.PLATFORM],
|
||||
displayName: _td("Warn before quitting"),
|
||||
displayName: _td("settings|warn_quit"),
|
||||
default: true,
|
||||
},
|
||||
"Electron.alwaysShowMenuBar": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue