t3chguy/matrix-js-sdk

Pull Requests Commits

Merge pull request #1210 from matrix-org/bwindels/localecho2

bwindels committed 5 years ago

Verified 3292fde4

Merge branch 'master' into develop

RiotRobot committed 5 years ago

38cf25ac

RiotRobot committed 5 years ago

13d5d2f9

Prepare changelog for v5.0.0

RiotRobot committed 5 years ago

7f6b66c8

Merge pull request #1214 from matrix-org/bwindels/workswithrageshakes

bwindels committed 5 years ago

Verified 62c344b6

bwindels committed 5 years ago

75ce2729

make logging compatible with rageshakes

bwindels committed 5 years ago

66695548

Merge pull request #1209 from matrix-org/bwindels/oneverifrequest

bwindels committed 5 years ago

Verified d3294da3

Update src/crypto/verification/request/InRoomChannel.js

bwindels committed 5 years ago

Verified 9b56bf25

Update src/crypto/verification/request/ToDeviceChannel.js

bwindels committed 5 years ago

Verified e1a33d8a

Merge pull request #1211 from matrix-org/bwindels/logsasmac

bwindels committed 5 years ago

Verified 47a1224c

method for checking if other party supports verification method

bwindels committed 5 years ago

5c57d81e

log MAC calculation

bwindels committed 5 years ago

edefd3ec

add local echo state for accepting or declining a verif req

bwindels committed 5 years ago

f15098ef

RiotRobot committed 5 years ago

8ee99a06

Prepare changelog for v5.0.0-rc.1

RiotRobot committed 5 years ago

3ace1d04

also find existing request for to-device verification

bwindels committed 5 years ago

365bb772

use pending instead of individual checks

bwindels committed 5 years ago

5ee6ada9

bwindels committed 5 years ago

ee0fa0e6

remove commented out logging

bwindels committed 5 years ago

0d41f6aa

more consistent naming

bwindels committed 5 years ago

91b64998

allow finding existing verif req without starting a new one

bwindels committed 5 years ago

7cd1166a

store sasEvent on verifier so we can get it if we missed show_sas event

bwindels committed 5 years ago

f76cb677

look for existing verification request when trying to start a new one

bwindels committed 5 years ago

05e7f4e6

Merge pull request #1206 from matrix-org/bwindels/dontpassmethodstoverify

bwindels committed 5 years ago

Verified 6684574b

Merge pull request #1207 from matrix-org/uhoreg/fix_opts_request

uhoreg committed 5 years ago

Verified 36a945f8

don't do a dynamic import of request

uhoreg committed 5 years ago

6a3d3220

remove methods arg to requestVerification(DM)

bwindels committed 5 years ago

00c003ec

use default methods if none are provided to the client

bwindels committed 5 years ago

f4d335c1

Merge pull request #1201 from matrix-org/travis/wip/qr

bwindels committed 5 years ago

Verified 659f4213

Newer Older