imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature-surround-with

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-02-12 07:56:44 +01:00
commit 8eb0707bba
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
227 changed files with 17274 additions and 6142 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View file

@ -35,6 +35,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
'sendTypingNotifications',
'MessageComposerInput.ctrlEnterToSend',
'MessageComposerInput.surroundWith',
'MessageComposerInput.showStickersButton',
];
static TIMELINE_SETTINGS = [
@ -47,12 +48,15 @@ export default class PreferencesUserSettingsTab extends React.Component {
'alwaysShowTimestamps',
'showRedactions',
'enableSyntaxHighlightLanguageDetection',
'expandCodeByDefault',
'showCodeLineNumbers',
'showJoinLeaves',
'showAvatarChanges',
'showDisplaynameChanges',
'showImages',
'showChatEffects',
'Pill.shouldShowPillAvatar',
'ctrlFForSearch',
];
static GENERAL_SETTINGS = [