t3chguy/matrix-js-sdk

Pull Requests Commits

Fix getting secrets encoded with passthrough keys

dbkr committed 5 years ago

6d134571

Merge pull request #1175 from matrix-org/travis/update-qr-code

turt2live committed 5 years ago

Verified 620118af

Appease the linter

turt2live committed 5 years ago

3645764f

Verify all the things

turt2live committed 5 years ago

769bfeb1

Fix verification of the master key

turt2live committed 5 years ago

5fbaa9cf

Merge branch 'develop' into travis/update-qr-code

turt2live committed 5 years ago

007508ba

Merge pull request #1188 from matrix-org/dbkr/dont_add_epemeral_events_to_timeline_when_peeking

dbkr committed 5 years ago

Verified 0f1f18b2

Merge pull request #1189 from matrix-org/dbkr/be_prepaed

dbkr committed 5 years ago

Verified d6b754b1

Merge branch 'develop' into travis/update-qr-code

turt2live committed 5 years ago

1b80c836

Remove tests for old QR code stuff

turt2live committed 5 years ago

ec4dc582

dbkr committed 5 years ago

65646ff9

Appease the linter

turt2live committed 5 years ago

92f6ec91

Don't add ephemeral events to timeline when peeking

dbkr committed 5 years ago

62bd41d2

Merge pull request #1187 from matrix-org/bwindels/fixstartrace-rebased

bwindels committed 5 years ago

Verified 9d864ffd

Actually do the verification

turt2live committed 5 years ago

c45b38ce

turt2live committed 5 years ago

0d7aee2c

Fix verification flow

turt2live committed 5 years ago

be345a52

bwindels committed 5 years ago

470bdf87

use logger instead of console

bwindels committed 5 years ago

59319fb5

fix unrelated issue: errorFactory returns function, so call it

bwindels committed 5 years ago

fb7695fd

startEvent can always be passed to verifier

bwindels committed 5 years ago

25b75526

apply same algo to pick .start event initially when changing phase

bwindels committed 5 years ago

21d52037

attempt to switch start event if we already have a verifier

bwindels committed 5 years ago

9cd66075

support switching startEvent while waiting for .accept on initiator side

bwindels committed 5 years ago

efd3550f

Lie to the verification handling

turt2live committed 5 years ago

76402ec8

Define NAME as a property higher up

turt2live committed 5 years ago

f6891428

Remove irrelevant verification flows for QR codes

turt2live committed 5 years ago

fd563bda

Merge branch 'develop' into travis/update-qr-code

turt2live committed 5 years ago

09a8f712

Merge pull request #1184 from matrix-org/dbkr/new_keybackup_in_bootstrap

dbkr committed 5 years ago

Verified 608fb008

Add option to bootstrap to start new key backup

dbkr committed 5 years ago

5c45e9c3

Older