t3chguy/matrix-js-sdk

Pull Requests Commits

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

dbkr committed 5 years ago

d32033f1

Fix local trust for key backups

dbkr committed 5 years ago

440274d6

Merge pull request #1072 from matrix-org/bwindels/userinfomakeover

bwindels committed 5 years ago

Verified 3d9bddfb

Merge pull request #1071 from matrix-org/travis/new-deactivate

turt2live committed 5 years ago

Verified 439abbcc

Merge pull request #832 from matrix-org/dbkr/cross_signing

dbkr committed 5 years ago

Verified ac913678

dbkr committed 5 years ago

2a63cc47

Rename backup_password & functions

dbkr committed 5 years ago

56261263

Remove ghost of some old code

dbkr committed 5 years ago

04b57bbe

dbkr committed 5 years ago

c550f83a

This is now implemented

dbkr committed 5 years ago

Verified 5224ef4b

is now implemented

dbkr committed 5 years ago

2ab033e7

More jsdoc updates

dbkr committed 5 years ago

Verified fa2e669e

dbkr committed 5 years ago

Verified f0ba1f2a

This now returns DeviceTrustLevel too

dbkr committed 5 years ago

6d0237ec

Capitalise jsdoc

dbkr committed 5 years ago

Verified 97dff464

dbkr committed 5 years ago

Verified 00b571a4

dbkr committed 5 years ago

Verified 86e0f492

dbkr committed 5 years ago

Verified f2f205f9

backticks in jsdoc

dbkr committed 5 years ago

Verified f84ec090

dbkr committed 5 years ago

d37ed9ff

Update yarn.lock

dbkr committed 5 years ago

f5a5f5e5

Why is 'cross-signing' so hard to type?

dbkr committed 5 years ago

Verified fe010242

Move Crypto.prototype.init back to its rightful place

dbkr committed 5 years ago

545ebf81

copy jsdoc to internal methods

dbkr committed 5 years ago

40893493

dbkr committed 5 years ago

Verified 6f42824c

Switch the CroosSigningLevel constants

dbkr committed 5 years ago

c3215d51

Change check{User|Device}Trust interfaces

dbkr committed 5 years ago

e541b96a

Maybe use the right user ID too

turt2live committed 5 years ago

904a2f46

Check the right Synapse endpoint for determining admin capabilities

turt2live committed 5 years ago

bad48da1

Don't emit event here, as per comment

dbkr committed 5 years ago

ce2d1d6e

Older