t3chguy/matrix-js-sdk

Pull Requests Commits

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

dbkr committed 9 years ago

17ed38ad

Add changelog entry

dbkr committed 9 years ago

8259f088

Update /publicRooms to use the new pagination API

dbkr committed 9 years ago

55d6cf7a

Merge pull request #205 from matrix-org/markjh/megolm

ara4n committed 9 years ago

425f862c

Merge pull request #209 from matrix-org/markjh/comment_upload_key

NegativeMjark committed 9 years ago

5d6256be

Spelling: s/cliamed/claimed/

NegativeMjark committed 9 years ago

ff5b923e

Merge pull request #210 from matrix-org/markjh/echo_keys_proved

NegativeMjark committed 9 years ago

af7a9a68

More comments explaining the keysClaimed/keysProved properties

NegativeMjark committed 9 years ago

905059d6

More comments on the local echo

NegativeMjark committed 9 years ago

3bc56cf3

NegativeMjark committed 9 years ago

1feb7fc0

Include keysProved and keysClaimed in the local echo for events we send.

NegativeMjark committed 9 years ago

c2a40572

Explain what happens to the old keys in olm

NegativeMjark committed 9 years ago

ee7d4d05

Comment what the logic in uploadKeys does

NegativeMjark committed 9 years ago

6ab410ef

Merge pull request #208 from matrix-org/markjh/upload_keys

NegativeMjark committed 9 years ago

8235d966

More semicolons

NegativeMjark committed 9 years ago

c7b83f6e

Merge pull request #207 from matrix-org/markjh/variable_scoping

NegativeMjark committed 9 years ago

460f20a4

Check if we need to upload new one-time keys every 10 minutes

NegativeMjark committed 9 years ago

da408f97

Reset onTimeKey to null on each loop iteration.

NegativeMjark committed 9 years ago

9a98c399

ara4n committed 9 years ago

6e0b2de9

track raw displayname on user objects

ara4n committed 9 years ago

0633d7d3

unbreak NPE where megolm's decryptEvent doesn't return a result

ara4n committed 9 years ago

2765720b

Merge branch 'develop' into markjh/megolm

NegativeMjark committed 9 years ago

71f23ffc

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

NegativeMjark committed 9 years ago

1863af14

Remove spurious senderKey argument

NegativeMjark committed 9 years ago

0d5d7467

Document return type

NegativeMjark committed 9 years ago

45ed0884

NegativeMjark committed 9 years ago

45e9f59f

Add getKeysProved and getKeysClaimed methods to MatrixEvent.

NegativeMjark committed 9 years ago

bde6a171

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

NegativeMjark committed 9 years ago

49a74755

NegativeMjark committed 9 years ago

2fbef863

NegativeMjark committed 9 years ago

eb4166af

Newer Older