David Baker 171d8b032f Merge branch 'voip' into develop ...

Conflicts:
	webclient/room/room-controller.js

2014-08-29 11:33:36 +01:00

..

event-handler-service.js

Merge branch 'voip' into develop

2014-08-29 11:33:36 +01:00

event-stream-service.js

Added a timeout(40s) to $http stream requests (/events) in order to be notified by an error when there is a network issue. Thus, we can retry with a new request.

2014-08-29 11:32:06 +02:00

matrix-call.js

More basic functionality for voip calls (like hanging up)

2014-08-29 11:29:36 +01:00

matrix-phone-service.js

More basic functionality for voip calls (like hanging up)

2014-08-29 11:29:36 +01:00

matrix-service.js

Added a timeout(40s) to $http stream requests (/events) in order to be notified by an error when there is a network issue. Thus, we can retry with a new request.

2014-08-29 11:32:06 +02:00

presence-service.js

Determine and send user presence state

2014-08-26 16:25:27 +02:00