t3chguy/matrix-js-sdk

Pull Requests Commits

SAS: Emit a 'cancel' event on cancel

dbkr committed 6 years ago

6a2da510

Merge branch 'verification' of git://github.com/uhoreg/matrix-js-sdk into uhoreg-verification

dbkr committed 6 years ago

9a530373

use Map instead of objects, and for instead of reduce

uhoreg committed 6 years ago

840c09fd

remove unnecessary things

uhoreg committed 6 years ago

1a9362d9

Merge pull request #821 from matrix-org/dbkr/update_eslint

dbkr committed 6 years ago

Verified c979ff66

Change initial key backup to background

jryans committed 6 years ago

25681e88

Schedule key upload on enabling backup

jryans committed 6 years ago

5cfd082b

Emit when count of sessions to backup changes

jryans committed 6 years ago

0cbced43

Remove babel-eslint as we no longer need it

dbkr committed 6 years ago

b3e8d7e0

dbkr committed 6 years ago

f4a7395e

agree with the latest version of the proposal

uhoreg committed 6 years ago

32509fa1

Re-check key backup status on version mismatch

jryans committed 6 years ago

14b42abf

change unit test to use test client

uhoreg committed 6 years ago

b3cafc13

handle verifications and verification requests through client

uhoreg committed 6 years ago

e4542271

some minor fixes

uhoreg committed 6 years ago

8c1b3ad0

various verification improvements

uhoreg committed 6 years ago

cdb71c95

Merge pull request #815 from matrix-org/develop

jryans committed 6 years ago

Verified e8022e98

Merge pull request #812 from matrix-org/dbkr/getallsessions

dbkr committed 6 years ago

Verified f6c8687d

Merge pull request #668 from matrix-org/t3chguy/fix_displayname_logic

jryans committed 6 years ago

Verified 472d8faa

re-add empty check after removing hidden chars

t3chguy committed 6 years ago

fc5f3c2f

Merge pull request #814 from trashhalo/rebase-tip

turt2live committed 6 years ago

fb756208

add error handling

uhoreg committed 6 years ago

a605d574

Merge pull request #814 from trashhalo/rebase-tip

turt2live committed 6 years ago

Verified 6a98e938

Note that rebase lets you mass signoff commits

Stephen Solka committed 6 years ago

79e155ac

reorganize and simplify code

uhoreg committed 6 years ago

ec4366ef

some protocol tweaks

uhoreg committed 6 years ago

5fef434c

use olm methods for SAS verification

uhoreg committed 6 years ago

0dcbdcdb

improve event handling to make functions more logical

uhoreg committed 6 years ago

975f3871

initial dummy implementation of SAS and QR code methods

uhoreg committed 6 years ago

74c6fd81

Missing bracket

dbkr committed 6 years ago

59ae6e3d

Older