t3chguy/matrix-js-sdk

Pull Requests Commits

Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin

dbkr committed 8 years ago

5fd64b47

Merge pull request #383 from matrix-org/dbkr/fix_teamserver

dbkr committed 8 years ago

b52a674c

Fix lint (add jsdoc)

dbkr committed 8 years ago

8f790d40

Support the bind_msisdn param to register

dbkr committed 8 years ago

8d13692a

Add getEmailSid

dbkr committed 8 years ago

7e2a2562

Merge pull request #380 from matrix-org/dbkr/register_ui_auth

dbkr committed 8 years ago

c7a0a560

Merge branch 'dbkr/register_ui_auth' into dbkr/msisdn_signin

dbkr committed 8 years ago

6289cdd2

dbkr committed 8 years ago

1d591034

Add submitMsisdnToken

dbkr committed 8 years ago

91da236a

Merge branch 'dbkr/register_ui_auth' into dbkr/msisdn_signin

dbkr committed 8 years ago

850f0c30

dbkr committed 8 years ago

3c246a97

Backwards compat

dbkr committed 8 years ago

ca395541

Doc error objects pass to stage update

dbkr committed 8 years ago

30d9dec4

Merge pull request #381 from matrix-org/rob/maybe-fix-glare

dbkr committed 8 years ago

ff360647

src/client.js: Fix incorrect roomId reference in VoIP glare code

superdump committed 8 years ago

72caf188

Merge branch 'dbkr/register_ui_auth' into dbkr/msisdn_signin

dbkr committed 8 years ago

42097fad

Copy session ID too

dbkr committed 8 years ago

bdae9521

Merge branch 'dbkr/register_ui_auth' into dbkr/msisdn_signin

dbkr committed 8 years ago

cad22d05

Keep data from response in any case

dbkr committed 8 years ago

cb7fb6c7

Comment the ignoring of failures

dbkr committed 8 years ago

a33e4477

Remove unnecesary check

dbkr committed 8 years ago

d435192e

Comment stageState

dbkr committed 8 years ago

94804476

Comment why we choose flows

dbkr committed 8 years ago

7dbe8526

PR feedback: Move requestEmailToken...

dbkr committed 8 years ago

d7216f44

Emit send_event_error when UnknownDeviceError occurs during VoIP operations (#378)

lukebarnard1 committed 8 years ago

fdf09d46

dbkr committed 8 years ago

efc0aa77

Oops, fix merge

dbkr committed 8 years ago

40462e3b

Merge branch 'dbkr/register_ui_auth' into dbkr/msisdn_signin

dbkr committed 8 years ago

f42a751d

dbkr committed 8 years ago

32360e74

dbkr committed 8 years ago

90482377

Older