imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement default welcome page and allow custom URL /w config

Browse source 
counterpart to https://github.com/matrix-org/matrix-react-sdk/pull/922
This commit is contained in:
Luke Barnard 2017-05-24 17:58:03 +01:00
parent 299dc7fe84
commit efb6316ba0
6 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/structures/LeftPanel.js
View file

@ -30,7 +30,6 @@ var LeftPanel = React.createClass({
propTypes: {
collapsed: React.PropTypes.bool.isRequired,
teamToken: React.PropTypes.string,
},
getInitialState: function() {
@ -129,7 +128,7 @@ var LeftPanel = React.createClass({
collapsed={this.props.collapsed}
searchFilter={this.state.searchFilter}
ConferenceHandler={VectorConferenceHandler} />
<BottomLeftMenu collapsed={this.props.collapsed} teamToken={this.props.teamToken}/>
<BottomLeftMenu collapsed={this.props.collapsed}/>
</aside>
);
}