Commit Graph

9527 Commits

Author SHA1 Message Date
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
Kegan Dougal 103869e628 Accept MatrixEvents like everywhere else in the SDK. 2015-07-16 17:15:40 +01:00
Kegan Dougal 6bd3b0db0d Emit state changes from MatrixCall. 2015-07-16 11:36:35 +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
David Baker ff1b137750 add js doc for httpStatus 2015-07-16 10:18:51 +01:00
Kegan Dougal c5718891c5 Fix tests. Add MatrixCall.setLocalVideoElement 2015-07-16 10:07:19 +01:00
Kegsay 4b4f13d662 Merge pull request #13 from matrix-org/set_password
Implement setPassword API
2015-07-16 09:59:32 +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
Matthew Hodgson ee4d0fb9ee hopefully fix NPE that bit Antony 2015-07-16 01:21:29 +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