Merge pull request #219 from matrix-org/matthew/fix-guest-upgrade

let registering guests either upgrade or create a new account by spec…
This commit is contained in:
Matthew Hodgson 2016-03-16 11:58:44 +00:00
commit b58a1707cb
3 changed files with 22 additions and 12 deletions

View file

@ -1040,7 +1040,6 @@ module.exports = React.createClass({
idSid={this.state.register_id_sid}
email={this.props.startingQueryParams.email}
username={this.state.upgradeUsername}
disableUsernameChanges={Boolean(this.state.upgradeUsername)}
guestAccessToken={this.state.guestAccessToken}
defaultHsUrl={this.props.config.default_hs_url}
defaultIsUrl={this.props.config.default_is_url}