1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-18 05:42:00 +03:00
Commit Graph

114 Commits

Author SHA1 Message Date
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
02c2e88a3e Fix some of the lint warnings 2015-07-21 17:39:11 +01:00
Mark Haines
9fe6d9b782 Add method for disabling end-to-end for a room 2015-07-21 16:44:47 +01:00
Mark Haines
67318247c8 Use an npmified version of olm.js 2015-07-21 15:09: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
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
Kegan Dougal
32c4d3ffc4 Parse m.presence events from /events 2015-07-20 10:07:34 +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
3d6b9f4593 Add more logging when sync requests fail. 2015-07-17 14:46:52 +01:00
Kegan Dougal
a694da344c Remove unecessary logging. 2015-07-17 13:57:39 +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
Kegan Dougal
103869e628 Accept MatrixEvents like everywhere else in the SDK. 2015-07-16 17:15:40 +01:00
Kegsay
c3696d07b7 Merge pull request #14 from matrix-org/registration
Registration
2015-07-16 10:22:11 +01:00
David Baker
7b26a64617 camels 2015-07-16 10:20:31 +01:00
Erik Johnston
ebb21f56d3 No trailing commas :( 2015-07-16 09:58:18 +01:00
Erik Johnston
ec5352183a Camel case 2015-07-16 09:56:36 +01:00
Erik Johnston
83563a23fe Implement setPassword API 2015-07-16 09:50:12 +01:00
Matthew Hodgson
260d9abced fix more NPEs 2015-07-16 01:37:39 +01:00
David Baker
13f72e1df2 lint 2015-07-15 19:26:52 +01:00
David Baker
a89de9754f Support registration & next_links 2015-07-15 19:25:08 +01:00
David Baker
b2f5d0b40a Merge pull request #12 from matrix-org/voip
WebRTC support
2015-07-15 10:20:56 +01:00
Kegan Dougal
309b61586f Linting. 2015-07-15 09:48:37 +01:00
Matthew Hodgson
3a344a0138 turn off alias disambiguation, and add a method to grab room avatar urls 2015-07-15 03:53:51 +01:00
David Baker
ae7f9ab871 lint 2015-07-14 19:38:56 +01:00
David Baker
77d3add846 Talk to the ID server 2015-07-14 19:36:44 +01:00
Kegan Dougal
053a5b1bea Make inbound calls work. 2015-07-14 16:23:31 +01:00
Kegan Dougal
8a41504cbb Glue in call handling into MatrixClient. Outbound calls work. 2015-07-14 16:06:22 +01:00
David Baker
58df45814b lint errors 2015-07-14 10:09:08 +01:00
David Baker
864fdcb925 Support V2 registration 2015-07-13 19:15:10 +01:00
David Baker
639522f80d Add uploadContent method 2015-07-08 14:33:46 +01:00
David Baker
e2768ceba2 add mxc -> http uri conversion func to client 2015-07-07 13:39:37 +01:00
Muthu Subramanian
b3726411f4 Add SAML2 login method helper 2015-07-07 17:50:11 +05:30
David Baker
04272a66f0 Add jsdoc and pass through other params 2015-07-02 18:29:35 +01:00
David Baker
f29f2a8115 Move getAvatarUrl into the client because it requires an instantiated client to work. Fix bits of client to use opts rather than credentials which doesn't exist. 2015-07-02 18:22:46 +01:00
Kegan Dougal
ea738e31ba Add storeEvents impl. 2015-07-02 11:03:50 +01:00
David Baker
753a11ab7f Move push actions method to the client 2015-07-01 14:09:34 +01:00