matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-20 16:22:28 +03:00
Code Activity

Merge branch 'develop' into travis/settings-cleanup-1

Browse Source
This commit is contained in:
Travis Ralston
2019-02-25 10:56:43 -07:00
parent cdf09300ac e0a5eeca75
commit 24099de2a4
18 changed files with 532 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View File

@@ -44,6 +44,10 @@ export default class PreferencesUserSettingsTab extends React.Component {
'showDisplaynameChanges',
];
static ROOM_LIST_SETTINGS = [
'RoomList.orderByImportance',
];
static ADVANCED_SETTINGS = [
'alwaysShowEncryptionIcons',
'Pill.shouldShowPillAvatar',
@@ -126,6 +130,9 @@ export default class PreferencesUserSettingsTab extends React.Component {
<span className="mx_SettingsTab_subheading">{_t("Timeline")}</span>
{this._renderGroup(PreferencesUserSettingsTab.TIMELINE_SETTINGS)}
<span className="mx_SettingsTab_subheading">{_t("Room list")}</span>
{this._renderGroup(PreferencesSettingsTab.ROOM_LIST_SETTINGS)}
<span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
{this._renderGroup(PreferencesUserSettingsTab.ADVANCED_SETTINGS)}
{minimizeToTrayOption}