Mark Haines 71f23ffce1 Merge branch 'develop' into markjh/megolm ...

Conflicts:
	lib/crypto/algorithms/megolm.js

2016-09-15 17:10:02 +01:00

..

crypto

Merge branch 'develop' into markjh/megolm

2016-09-15 17:10:02 +01:00

models

Document return type

2016-09-15 16:42:40 +01:00

store

Send an "oh hai" message to other e2e users

2016-09-08 14:34:08 +01:00

webrtc

always play audio out of the remoteAudioElement if it exists.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621

2016-08-31 21:52:24 +01:00

base-apis.js

Use to-device events for key sharing

2016-09-07 13:56:54 +01:00

client.js

Merge branch 'develop' into markjh/megolm

2016-09-15 17:10:02 +01:00

content-repo.js

copyrights please...

2016-01-07 04:15:38 +00:00

filter-component.js

fix lint

2016-09-08 00:18:17 +01:00

filter.js

fix lint

2016-09-08 00:18:17 +01:00

http-api.js

Bugfix for HTTP upload content when running on node

2016-04-21 14:16:20 +01:00

matrix.js

export EventTimelineSet

2016-09-06 01:04:23 +01:00

pushprocessor.js

Move definition

2016-08-16 17:02:18 +01:00

realtime-callbacks.js

Implement HTTP callbacks in realtime

2016-03-31 13:51:18 +01:00

scheduler.js

copyrights please...

2016-01-07 04:15:38 +00:00

sync.js

Merge branch 'develop' into matthew/filtered-timelines

2016-09-11 02:38:50 +01:00

timeline-window.js

refactr paginateNotifTimeline out of existence

2016-09-09 16:49:39 +01:00

utils.js

Factor out MatrixClient methods to MatrixBaseApis

2016-07-28 15:36:45 +01:00