matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-31 10:22:04 +03:00
Code Activity
313 Commits 233 Branches 497 Tags
65d64bf22324ff1d2ec5e70250da401d42fe7b0e
Commit Graph

100 Commits

Author SHA1 Message Date
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
David Baker
21150e7587 Doc fail 2015-06-26 16:50:55 +01:00
David Baker
3806c4d566 Missing semicolon 2015-06-26 16:49:07 +01:00
David Baker
b814872c37 unnecessary semicolon 2015-06-26 16:45:59 +01:00
David Baker
b2656024bd Merge branch 'develop' into push 
Conflicts:
	lib/client.js
 2015-06-26 16:39:32 +01:00
Kegan Dougal
b7975866fa Add getSyncToken and setSyncToken to data store interface. 
This allows local storage to hold onto the token across page refreshes.
 2015-06-26 15:36:53 +01:00
David Baker
9ea080b7bb Fetch the user's push rules before any events arrive, so we can annotate events with push data when they arrive. 2015-06-26 15:11:27 +01:00
Kegan Dougal
3c4bda8580 Add MatrixScheduler.removeEventFromQueue/getQueueForEvent and QUEUED state. 
This is to allow the UI to show "queued" on events as well as allow the
removal of events in the queue.
 2015-06-26 09:52:52 +01:00
Kegan Dougal
f49234a772 Add pagination tests 2015-06-25 17:29:25 +01:00
Kegan Dougal
46d5c2bd61 Add pagination test; fix null token bug. 2015-06-25 16:33:22 +01:00
Kegan Dougal
325c00c660 Set Room.oldState.paginationToken to null at the start of the timeline. Fix linting errors. 2015-06-25 15:28:25 +01:00
Kegan Dougal
07d3f43d8b Refactor terminal app; add /invite and /roominfo. 2015-06-23 15:22:57 +01:00
Kegan Dougal
57914969b8 Add MatrixClient.resendEvent to manually resend an event that was not sent. 
Bundle txnId as MatrixEvent._txnId instead of exposing it to every place that
happens to need it (since it's so tightly coupled with MatrixEvent)
 2015-06-23 14:08:02 +01:00
Kegan Dougal
378c7fd6cb Update docs 2015-06-23 12:15:41 +01:00
Kegan Dougal
7534f59af2 Hook up the callback fn for scrollback. Update CHANGELOG. 2015-06-23 12:04:43 +01:00