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

..

matrix-client-crypto.spec.js

Fix test name

2015-07-17 18:51:23 +01:00

matrix-client-event-emitter.spec.js

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

matrix-client-opts.spec.js

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

matrix-client-retrying.spec.js

Add MatrixScheduler.removeEventFromQueue/getQueueForEvent and QUEUED state.

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

matrix-client-room-timeline.spec.js

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

matrix-client-syncing.spec.js

Parse m.presence events from /events

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