Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Login / registration with phone number, mark 2#750

Merged
dbkr merged 4 commits into
developfrom
dbkr/msisdn_signin_2
Mar 21, 2017
Merged

Login / registration with phone number, mark 2#750
dbkr merged 4 commits into
developfrom
dbkr/msisdn_signin_2

Conversation

@dbkr
Copy link
Copy Markdown
Member

@dbkr dbkr commented Mar 14, 2017

Once again, presented in 2 acts. First commit contains original changes from #742, second updates to support login on old HSes.

element-hq/element-web#1903

dbkr added 2 commits March 14, 2017 11:50
To support login on old HSes
Copy link
Copy Markdown
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, modulo test failures

@richvdh richvdh assigned dbkr and unassigned richvdh Mar 15, 2017

const msg = error.message || error.toString();
this.setState({
errorText: msg
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks wrong. where is msg coming from now?

@richvdh
Copy link
Copy Markdown
Member

richvdh commented Mar 15, 2017

and the tests are still failing

@dbkr
Copy link
Copy Markdown
Member Author

dbkr commented Mar 16, 2017

Test fails are just because its running the tests of the wrong vector branch.

@dbkr dbkr assigned richvdh and unassigned dbkr Mar 16, 2017
Copy link
Copy Markdown
Member

@richvdh richvdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm then

@richvdh richvdh assigned dbkr and unassigned richvdh Mar 16, 2017
@dbkr dbkr merged commit 4a29d67 into develop Mar 21, 2017
martindale pushed a commit to FabricLabs/matrix-react-sdk that referenced this pull request Dec 8, 2018
…merge

allow non-ff merge from release branch into master
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants