t3chguy/matrix-js-sdk

Pull Requests Commits

Merge branch 'develop' into markjh/megolm

NegativeMjark committed 8 years ago

71f23ffc

Merge pull request #206 from matrix-org/markjh/ed25519

NegativeMjark committed 8 years ago

1863af14

Remove spurious senderKey argument

NegativeMjark committed 8 years ago

0d5d7467

Document return type

NegativeMjark committed 8 years ago

45ed0884

NegativeMjark committed 8 years ago

45e9f59f

Add getKeysProved and getKeysClaimed methods to MatrixEvent.

NegativeMjark committed 8 years ago

bde6a171

Merge pull request #204 from matrix-org/markjh/oh_hai_reliability

NegativeMjark committed 8 years ago

49a74755

NegativeMjark committed 8 years ago

2fbef863

NegativeMjark committed 8 years ago

eb4166af

Remove unnecessary dep

NegativeMjark committed 8 years ago

b3beaace

Remove unnecessary semicolon;

NegativeMjark committed 8 years ago

355b728a

Add a test to check the olm version

NegativeMjark committed 8 years ago

577b0e8f

Rate limit the oh hai pings

NegativeMjark committed 8 years ago

35d99564

Include our device key in megolm messages

NegativeMjark committed 8 years ago

6f9bb382

Rename the "content" variable to avoid shadowing

NegativeMjark committed 8 years ago

d02c2059

Add olm version to client. Add semicolons.

NegativeMjark committed 8 years ago

38681202

Add a test to check that we have the right version of Olm

NegativeMjark committed 8 years ago

0d20a0ac

Add the accidentally deleted sessionId documentation back

NegativeMjark committed 8 years ago

9277a864

NegativeMjark committed 8 years ago

5ec8688c

Fix syntax error

NegativeMjark committed 8 years ago

6ae82a9c

Send a 'm.new_device' when we get a message for an unknown group session

NegativeMjark committed 8 years ago

72a4b920

Update the olm library version to 1.3.0

NegativeMjark committed 8 years ago

0cc68bc1

Merge pull request #196 from matrix-org/matthew/filtered-timelines

ara4n committed 8 years ago

6ca917f4

unbreak mocks in tests

ara4n committed 8 years ago

8a848ded

Merge pull request #203 from matrix-org/markjh/try_catch

dbkr committed 8 years ago

2ebd4b15

Wrap the crypto event handlers in try/catch blocks

NegativeMjark committed 8 years ago

f0274f3f

fix refactoring bug; emit timelineReset after updating _liveTimeline

ara4n committed 8 years ago

85b2e5d7

don't forget to emit timelineResets for normal room resets

ara4n committed 8 years ago

eef03882

Merge branch 'develop' into matthew/filtered-timelines

ara4n committed 8 years ago

f7e5d962

reemit timelineReset correctly from Sync

ara4n committed 8 years ago

87c6a40b

Older