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

Merge pull request #922 from matrix-org/luke/new-guest-access-default-welcome

Browse Source 
Implement default welcome page and allow custom URL /w config
This commit is contained in:
Luke Barnard
2017-05-25 10:08:34 +01:00
committed by GitHub
parent 454134661e 5f36f797da
commit f3fc459875
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/LoggedInView.js
View File

@ -237,7 +237,8 @@ export default React.createClass({
collapsedRhs={this.props.collapse_rhs}
teamServerUrl={this.props.config.teamServerConfig.teamServerURL}
teamToken={this.props.teamToken}
/>
homePageUrl={this.props.config.welcomePageUrl}
/>;
if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
break;
@ -273,7 +274,6 @@ export default React.createClass({
selectedRoom={this.props.currentRoomId}
collapsed={this.props.collapse_lhs || false}
opacity={this.props.sideOpacity}
teamToken={this.props.teamToken}
/>
<main className='mx_MatrixChat_middlePanel'>
{page_element}