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

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

Browse Source
This commit is contained in:
Travis Ralston
2019-01-29 21:49:00 -07:00
parent b3bb3aff84 a9ede61dc7
commit cd54442add
5 changed files with 375 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/dialogs/RoomSettingsDialog.js
View File

@@ -21,6 +21,7 @@ import {_t, _td} from "../../../languageHandler";
import AdvancedRoomSettingsTab from "../settings/tabs/AdvancedRoomSettingsTab";
import AccessibleButton from "../elements/AccessibleButton";
import dis from '../../../dispatcher';
import RolesRoomSettingsTab from "../settings/tabs/RolesRoomSettingsTab";
import GeneralRoomSettingsTab from "../settings/tabs/GeneralRoomSettingsTab";
// TODO: Ditch this whole component
@@ -74,7 +75,7 @@ export default class RoomSettingsDialog extends React.Component {
tabs.push(new Tab(
_td("Roles & Permissions"),
"mx_RoomSettingsDialog_rolesIcon",
<div>Roles Test</div>,
<RolesRoomSettingsTab roomId={this.props.roomId} />,
));
tabs.push(new Tab(
_td("Advanced"),