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

Merge branch 'experimental' into bwindels/rightpanelbelowheader

Browse source
This commit is contained in:
Bruno Windels 2018-10-31 14:57:16 +01:00
commit b4dd739771
79 changed files with 756 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,6 +65,9 @@ const LoggedInView = React.createClass({
teamToken: PropTypes.string,
// Used by the RoomView to handle joining rooms
viaServers: PropTypes.arrayOf(PropTypes.string),
// and lots and lots of other stuff.
},
@ -433,6 +436,7 @@ const LoggedInView = React.createClass({
onRegistered={this.props.onRegistered}
thirdPartyInvite={this.props.thirdPartyInvite}
oobData={this.props.roomOobData}
viaServers={this.props.viaServers}
eventPixelOffset={this.props.initialEventPixelOffset}
key={this.props.currentRoomId || 'roomview'}
disabled={this.props.middleDisabled}