matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-17 21:42:17 +03:00
Code Activity
2,775 Commits 243 Branches 517 Tags
dffe0b39b67fd8c91bbcc67060c110d49bba581c
Commit Graph

2775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard van der Hoff
766e837775 Factor out ensureOlmSessionsForDevices 
... and move to olmlib
 2016-11-16 21:21:57 +00:00
Richard van der Hoff
749f53a22b Merge pull request #294 from matrix-org/rav/distinguish_users_with_no_devices 
distinguish unknown users from deviceless users
 2016-11-16 20:43:04 +00:00
Richard van der Hoff
851b33aac2 distinguish unknown users from deviceless users 
Fixes https://github.com/vector-im/vector-web/issues/2275
 2016-11-16 18:05:41 +00:00
David Baker
fc958a3922 lint 2016-11-16 16:33:08 +00:00
David Baker
2c31b72c52 Merge pull request #293 from arxcode/develop 
Allows to start client with initialSyncLimit = 0
 2016-11-16 14:43:20 +00:00
Richard van der Hoff
8decb02027 Merge pull request #289 from matrix-org/luke/api-change-tlw-public-unpagination 
Make timeline-window _unpaginate public and rename to unpaginate
 2016-11-16 14:29:15 +00:00
Alexander
a0fd87c032 Allows to start client with initialSyncLimit = 0 (see http://bit.ly/2f49Kbs) 2016-11-16 09:26:16 -05:00
Luke Barnard
c0d862c9f0 Correct jsdoc for unpaginate 2016-11-16 11:06:56 +00:00
David Baker
8143abc9e7 Merge pull request #286 from fred-wang/fix-sync-stop 
Send a STOPPED sync updated after call to stopClient
 2016-11-16 10:02:28 +00:00
Richard van der Hoff
af95dcaef6 Merge pull request #292 from matrix-org/rav/fix_megolm_keys 
Fix bug in verifying megolm event senders
 2016-11-16 09:47:44 +00:00
Richard van der Hoff
5b4aedd4be Fix bug in verifying megolm event senders 
1a03e534bd introduced a bug which mixed up the keys_proved and the
keys_claimed. Switch them around again so that megolm messages are correctly
tied back to the sending device.
 2016-11-16 09:22:31 +00:00
Luke Barnard
d8c0b16d7e Make timeline-window _unpaginate public and remove _ 2016-11-15 13:27:42 +00:00
Richard van der Hoff
909b56d48e Merge pull request #288 from matrix-org/rav/decrypt_after_keys_arrive 
Handle decryption of events after they arrive
 2016-11-15 11:11:10 +00:00
Richard van der Hoff
a5d857945a Retry decryption after receiving keys 
m.room_keys may arrive after the messages themselves, so allow events to be
decrypted after the event (haha).
 2016-11-14 15:13:02 +00:00
Richard van der Hoff
1a03e534bd Refactor decryption 
Create the MatrixEvent wrapper before decryption, and then pass that into the
decryptors, which should update it.

Also remove the workaround that sends m.new_device messages when we get an
unknown session; it's just a bandaid which is obscuring more meaningful
problems.
 2016-11-14 15:13:02 +00:00
Richard van der Hoff
e623b539c4 persist DecryptionAlgorithm instances 
It's useful to be able to keep state between events in the DecryptionAlgorithm,
so store them in a map.
 2016-11-14 15:13:02 +00:00
Kegsay
2ff6f5f958 Merge pull request #287 from fred-wang/fix-example 
Fix examples.
 2016-11-14 12:49:06 +00:00
Matthew Hodgson
1532188d95 fix typo 2016-11-13 13:24:51 +00:00
Frédéric Wang
04093692c9 Use native Array.isArray when available. 2016-11-13 13:24:35 +00:00
Matthew Hodgson
a96389a3e4 Merge pull request #283 from matrix-org/revert-282-is-array 
Revert "Use native Array.isArray when available."
 2016-11-13 13:23:54 +00:00
Matthew Hodgson
00e7c84a93 Revert "Use native Array.isArray when available." 2016-11-13 13:23:41 +00:00
Matthew Hodgson
e0c924870d Merge pull request #282 from fred-wang/is-array 
Use native Array.isArray when available.
 2016-11-13 13:20:54 +00:00
Frédéric Wang
1a27ad22a7 Use native Array.isArray when available. 2016-11-13 13:47:31 +01:00
Frédéric Wang
7029083266 Send a STOPPED sync updated after call to stopClient 2016-11-12 21:58:58 +01:00
Frédéric Wang
a5f0ec7c7d Fix examples. 2016-11-12 17:39:48 +01:00
Mark Haines
e7dcc06855 Merge pull request #278 from matrix-org/markjh/travis 
Add a travis.yml
 2016-11-11 13:58:52 +00:00
Richard van der Hoff
867ac49b50 Merge pull request #277 from matrix-org/markjh/encrypted_voip 
Encrypt all events, including 'm.call.*'
 2016-11-11 11:06:54 +00:00
Mark Haines
bfffbea4a0 Merge remote-tracking branch 'origin/develop' into markjh/encrypted_voip 2016-11-11 10:20:40 +00:00
Mark Haines
f8b1c124df Add a travis.yml 2016-11-11 10:04:48 +00:00
Richard van der Hoff
bc9e290c11 Merge pull request #276 from matrix-org/rav/ignore_key_reshares 
Ignore reshares of known megolm sessions
 2016-11-10 19:56:01 +00:00
Mark Haines
777ef83378 Merge remote-tracking branch 'origin/develop' into markjh/encrypted_voip 2016-11-10 19:44:42 +00:00
Mark Haines
24283dcbd5 Encrypt all events, including 'm.call.*' 2016-11-10 19:42:16 +00:00
Richard van der Hoff
2113c83679 Ignore reshares of known megolm sessions 
If we get a second key for a known megolm session, ignore it.

Fixes https://github.com/vector-im/vector-web/issues/2326, one hopes.
 2016-11-10 19:28:08 +00:00
Richard van der Hoff
77508f38bb event jsdoc 
Add a comment on the event event
 2016-11-08 16:53:07 +00:00
Richard van der Hoff
6c3eb19b74 Merge pull request #274 from matrix-org/rav/log_on_unknown_session 
Log to the console on unknown session
 2016-11-07 22:46:37 +00:00
Richard van der Hoff
e173d822e8 Log to the console on unknown session 
This might help diagnose Erik/Matthew's comms breakdown.
 2016-11-07 18:57:09 +00:00
David Baker
e2d3ace476 Merge branch 'master' into develop 2016-11-04 10:01:03 +00:00
David Baker
6f79a3107b v0.6.4 v0.6.4 2016-11-04 10:00:09 +00:00
David Baker
e6a3b2aa28 Change version back so npm can change it back again 2016-11-04 09:59:49 +00:00
David Baker
e5dcfdf115 There is now one change 2016-11-04 09:57:37 +00:00
David Baker
47e12fcc3e Use env var for dist version 
Don't pass it as an arg because that really confuses npm scripts
that aren;t expecting an arg (npm it just blindly appends it).
 2016-11-04 09:42:08 +00:00
David Baker
d51b2884da v0.6.4 2016-11-04 09:20:17 +00:00
David Baker
28e9c10ded Prepare changelog for v0.6.4 2016-11-04 09:20:17 +00:00
David Baker
e27bf04ced Merge pull request #273 from matrix-org/paul/wrap-request 
Make it easier for SDK users to wrap prevailing the 'request' function
 2016-11-03 13:57:14 +00:00
Paul "LeoNerd" Evans
65f1b3c976 Document the return type of getRequest() 2016-11-02 18:04:00 +00:00
Paul "LeoNerd" Evans
4529578cd6 Make a handy shortcut for SDK users to provide request wrapping functions in a neat stack 2016-11-02 18:02:02 +00:00
Paul "LeoNerd" Evans
6769c96942 Add a method for querying the js-sdk's current 'request' function in case people want to wrap it 2016-11-02 17:55:23 +00:00
David Baker
dcb987732c Add version arg to the dist script 
as per comment
 2016-11-02 11:36:53 +00:00
David Baker
4f4eba16d6 v0.6.4-rc.2 v0.6.4-rc.2 2016-11-02 11:01:09 +00:00
David Baker
9da913f5a6 Prepare changelog for v0.6.4-rc.2 2016-11-02 11:01:09 +00:00