Merge pull request #393 from matrix-org/dbkr/enable_labs

Add config to hide the labs section
This commit is contained in:
David Baker 2016-08-05 17:25:25 +01:00 committed by GitHub
commit 4b8ad3c102
2 changed files with 14 additions and 2 deletions

View file

@ -1062,7 +1062,12 @@ module.exports = React.createClass({
right_panel = <RightPanel roomId={this.state.currentRoomId} collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity} />
break;
case this.PageTypes.UserSettings:
page_element = <UserSettings onClose={this.onUserSettingsClose} version={this.state.version} brand={this.props.config.brand} />
page_element = <UserSettings
onClose={this.onUserSettingsClose}
version={this.state.version}
brand={this.props.config.brand}
enableLabs={this.props.config.enableLabs}
/>
right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/>
break;
case this.PageTypes.CreateRoom: