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

..

integ

Merge remote-tracking branch 'origin/develop' into markjh/end_to_end

2015-07-20 10:43:23 +01:00

unit

Fix tests. Add MatrixCall.setLocalVideoElement

2015-07-16 10:07:19 +01:00

mock-request.js

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

test-utils.js

Parse m.presence events from /events

2015-07-20 10:07:34 +01:00