matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-09 10:22:46 +03:00
Code Activity
10,441 Commits 249 Branches 493 Tags
toger5/temp-js-sdk-to-device
Commit Graph

10441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Haines
ae8e01839e Add flag for indicating if an event was encrypted 2015-07-22 11:57:34 +01:00
Mark Haines
9e5f30fe1f Fix some lint errors 2015-07-22 11:37:22 +01:00
Mark Haines
319ca5123e Return device key list in a stable order, add a check for the list in the tests 2015-07-22 11:34:38 +01:00
Mark Haines
28a5719f5f Add method for listing the device keys we have for a user 2015-07-22 11:24:58 +01:00
David Baker
348d3f4ce1 Merge pull request #17 from matrix-org/markjh/end_to_end 
Add support for end-to-end using olm
 2015-07-21 13:12:01 -07:00
David Baker
a0fc8df3e1 Fix more minor things from PR comments 2015-07-21 13:10:01 -07:00
David Baker
8b2f11edc9 s/.then/.done/ 2015-07-21 13:08:13 -07:00
Mark Haines
09f7011bc5 Add method for telling if room is encrypted 2015-07-21 18:09:10 +01:00
Mark Haines
ffbc197650 Flush the httpBackend in the last crypto test 2015-07-21 17:53:04 +01:00
Mark Haines
b33dcec74b Dummy commit to poke jenkins 2015-07-21 17:47:01 +01:00
Mark Haines
f079e021a2 Line too long 2015-07-21 17:41:05 +01:00
Mark Haines
02c2e88a3e Fix some of the lint warnings 2015-07-21 17:39:11 +01:00
Kegan Dougal
358cdaf167 Fix linting errors 2015-07-21 17:20:35 +01:00
Kegan Dougal
90e778cb84 Handle redactions (both live and historic). 2015-07-21 17:14:11 +01:00
Mark Haines
816bb61689 Increase the timeout for the last crypto integ test 2015-07-21 17:07:10 +01:00
Kegan Dougal
6653d294d9 Re-apply metadata after setStateEvents to correctly apply sender/target props for m.room.member events. 2015-07-21 16:58:14 +01:00
Mark Haines
9fe6d9b782 Add method for disabling end-to-end for a room 2015-07-21 16:44:47 +01:00
Kegsay
185cbac85c Merge pull request #16 from matrix-org/getMembersWithMembership 
Add getMembersWithMembership to get all members with given membership
 2015-07-21 15:42:00 +01:00
Erik Johnston
f716431f65 Make getJoinedUsers call getMembersWithMembership 2015-07-21 15:41:33 +01:00
Erik Johnston
86e73bdd35 Add getMembersWithMembership to get all members with given membership state 2015-07-21 15:31:58 +01:00
Mark Haines
67318247c8 Use an npmified version of olm.js 2015-07-21 15:09:54 +01:00
Mark Haines
3be472330e Update olm.js 2015-07-21 14:30:54 +01:00
Mark Haines
6dae0ef327 Fix the local echo for encrypted events by sending a single event with different content and event type for the wire vs local display 2015-07-21 14:19:24 +01:00
Mark Haines
101de29f3e Store sessions under the right key after encrypting, set the room_id key in the encrypted payload 2015-07-21 11:59:46 +01:00
Mark Haines
b5d8bc5c5f Add the timestamp to decrypted events, update the copy of olm.js 2015-07-21 11:48:30 +01:00
Mark Haines
a97b11136a Update olm.js 2015-07-20 16:36:45 +01:00
Kegan Dougal
93a104fe4c Fire presence first time if presence event unset. 2015-07-20 11:28:13 +01:00
Mark Haines
00ae144997 Don't try to decrypt end-to-end messages if the client doesn't have end-to-end support enabled 2015-07-20 10:58:20 +01:00
Mark Haines
65d64bf223 Merge remote-tracking branch 'origin/develop' into markjh/end_to_end 
Conflicts:
	lib/client.js
	lib/matrix.js
 2015-07-20 10:43:23 +01:00
Mark Haines
d20bd41ff9 Update olm.js 2015-07-20 10:41:54 +01:00
Mark Haines
a375aa30ea Add script for running tests without converage 2015-07-20 10:36:30 +01:00
Kegan Dougal
32c4d3ffc4 Parse m.presence events from /events 2015-07-20 10:07:34 +01:00
Matthew Hodgson
8bc89d433b fix non-impacting typo 2015-07-19 00:36:56 +01:00
Matthew Hodgson
bc216d7bca fix stale video from appearing unexpectedly when you place a new call 2015-07-18 23:29:08 +01:00
Matthew Hodgson
beb8bff084 placeholder code for defaulting displaynames to userids, except it needs disambiguation logic 2015-07-18 15:40:19 +01:00
Mark Haines
110546bfca Add a copy of olm.js so that branch will work as temporary work around until I work out how to package it using npm 2015-07-17 19:22:21 +01:00
Mark Haines
62ac369500 Fix test name 2015-07-17 18:51:23 +01:00
Mark Haines
8e6e1e64c7 Add integration test for the end-to-end crypto 2015-07-17 18:47:34 +01:00
Matthew Hodgson
9d5fc7c0fd at long last fix bug where /op would cache previous failed attempts. fixes SYWEB-342 2015-07-17 18:02:06 +01:00
David Baker
c563380a0b Fall back to the identicon generator if a user doesn't have an avatar_url 2015-07-17 17:48:57 +01:00
Kegan Dougal
7869d7a7df Emit state changes after updating hangup party and reason 2015-07-17 17:03:18 +01:00
Kegan Dougal
7ec42f8843 Firefox falls over in a heap if you don't provide an error callback. 2015-07-17 16:15:08 +01:00
Kegan Dougal
3d6b9f4593 Add more logging when sync requests fail. 2015-07-17 14:46:52 +01:00
Kegan Dougal
4489c85020 Play video to local video elements when updated. 2015-07-17 14:23:40 +01:00
Kegan Dougal
a694da344c Remove unecessary logging. 2015-07-17 13:57:39 +01:00
Kegan Dougal
384fb94262 Linting 2015-07-17 13:39:04 +01:00
Kegan Dougal
8727dd1e34 Use TURN servers when placing/receiving calls. 2015-07-17 13:36:58 +01:00
Kegan Dougal
1232f6ce3c Periodically check turn servers. 2015-07-17 12:23:39 +01:00
Kegsay
1888c83f4f Merge pull request #15 from EricssonResearch/msba/saml2 
Add SAML2 login method helper
 2015-07-17 08:37:45 +01:00
Mark Haines
2ee5977ad2 Start integrating end-to-end into the matrix-client. Add a storage class to store end-to-end sessions. Implement the one-time key upload API, and start sketching out the encryption and decryption functions 2015-07-16 18:21:25 +01:00