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

..

models

placeholder code for defaulting displaynames to userids, except it needs disambiguation logic

2015-07-18 15:40:19 +01:00

store

Add integration test for the end-to-end crypto

2015-07-17 18:47:34 +01:00

webrtc

fix non-impacting typo

2015-07-19 00:36:56 +01:00

client.js

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

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

http-api.js

Merge pull request #14 from matrix-org/registration

2015-07-16 10:22:11 +01:00

matrix.js

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

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

olm.js

Update olm.js

2015-07-20 10:41:54 +01:00

pushprocessor.js

hopefully fix NPE that bit Antony

2015-07-16 01:21:29 +01:00

scheduler.js

Add MatrixScheduler.removeEventFromQueue/getQueueForEvent and QUEUED state.

2015-06-26 09:52:52 +01:00

utils.js

Add utils UTs. Remove unused functions.

2015-06-24 17:42:02 +01:00