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

Merge branch 'experimental' into travis/rsettings/tab/general

Browse Source
This commit is contained in:
Travis Ralston
2019-01-29 09:11:21 -07:00
parent d20bdbbc1a 012e358147
commit ad276c1fda
37 changed files with 919 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/dialogs/UserSettingsDialog.js
View File

@@ -28,6 +28,7 @@ import NotificationSettingsTab from "../settings/tabs/NotificationSettingsTab";
import PreferencesSettingsTab from "../settings/tabs/PreferencesSettingsTab";
import VoiceSettingsTab from "../settings/tabs/VoiceSettingsTab";
import HelpSettingsTab from "../settings/tabs/HelpSettingsTab";
import FlairSettingsTab from "../settings/tabs/FlairSettingsTab";
// TODO: Ditch this whole component
export class TempTab extends React.Component {
@@ -58,6 +59,11 @@ export default class UserSettingsDialog extends React.Component {
"mx_UserSettingsDialog_settingsIcon",
<GeneralUserSettingsTab />,
));
tabs.push(new Tab(
_td("Flair"),
"mx_UserSettingsDialog_flairIcon",
<FlairSettingsTab />,
));
tabs.push(new Tab(
_td("Notifications"),
"mx_UserSettingsDialog_bellIcon",