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

Merge branch 'develop' into travis/granular-settings

Browse source
This commit is contained in:
Travis Ralston 2017-11-07 14:55:12 -07:00 • committed by GitHub
commit 289b0c2b6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 419 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/LoggedInView.js
View file

@ -301,6 +301,7 @@ export default React.createClass({
case PageTypes.GroupView:
page_element = <GroupView
groupId={this.props.currentGroupId}
isNew={this.props.currentGroupIsNew}
collapsedRhs={this.props.collapseRhs}
/>;
if (!this.props.collapseRhs) right_panel = <RightPanel groupId={this.props.currentGroupId} disabled={this.props.rightDisabled} />;