Commit Graph

354 Commits

Author SHA1 Message Date
paweldomas 73317c920a Merge branch 'master' into multiple-tracks 2015-11-04 15:09:51 -06:00
damencho 5446c513f5 Adds room name parameter to the bosh connection. 2015-11-03 14:32:41 -06:00
paweldomas b1f617502e Integrates token authentication. 2015-11-03 13:21:52 -06:00
Boris Grozev a5e15025f8 Implements switching streams on firefox by using RTPSender.replaceTrack(). Fixes bugs with switching between camera and screen sharing. 2015-11-03 11:27:48 -06:00
damencho 67b35f0f1e Uses inactive callback if available instead of deprecated onended one. 2015-11-02 16:42:32 -06:00
damencho 249e032ad6 Uses stopping tracks and use MediaStream.stop method only if defined. Based on previous code and inspired by PR #390. 2015-11-02 16:42:32 -06:00
damencho fa138eae43 Replaces deprecated ended call with active check for media streams. 2015-11-02 16:42:32 -06:00
damencho b08308e5e4 Fixes isMuted check. 2015-11-02 10:48:09 -06:00
damencho 74227e182a Makes sure we use stream.ended in one place. 2015-10-30 17:57:25 -05:00
damencho 8cebbbb347 Stops the MediaStream using the utility method in RTC. 2015-10-30 17:57:25 -05:00
damencho 1ba0a182f6 Makes sure we add/remove all onended events for media streams in one central place. 2015-10-30 17:57:25 -05:00
damencho 11e1197901 Uses one method from RTC to stop media streams. 2015-10-30 17:57:25 -05:00
Boris Grozev 932af962b2 Adds an option to advertise our SSRCs in presence to the MUC (as well as
Jingle) for backward compatibility with jirecon. Partially reverts
a1b0677442
2015-10-29 16:50:33 -05:00
Boris Grozev e0522f6977 Simplifies code. 2015-10-29 16:30:36 -05:00
Boris Grozev 9111797913 Removes a tangle of spaghetti. 2015-10-29 14:30:30 -05:00
Boris Grozev a2ad7b8f53 Mutes video elements. 2015-10-28 12:05:42 -05:00
paweldomas 7abe02d756 Merge audio and video on the receiver's side. 2015-10-28 12:01:21 -05:00
Boris Grozev cd1e761699 Creates multiple (Jitsi-Meet) MediaStreams if the RTCMediaStream object
contains both audio and video tracks.
2015-10-28 11:30:48 -05:00
bgrozev 30c601e054 Removes words from the roomname generator. 2015-10-21 09:46:54 -05:00
Boris Grozev 23ff99db6e Implements choosing from a list of possible BOSH addresses. 2015-10-20 10:44:41 -05:00
Boris Grozev 554808549e Fixes a bug reported by George Politis. 2015-10-19 15:59:24 -05:00
Boris Grozev 657a3fb2e1 Removes comments (fixes warnings). 2015-10-19 15:59:16 -05:00
bgrozev bbbe1fe5c7 Merge pull request #374 from spellauge/authdomain2
authdomain2
2015-10-14 11:25:19 -05:00
Boris Grozev ae793726ca Allows the URLProcessor to replace a property even if its type changes. 2015-10-12 17:46:58 -05:00
Spellauge 277f340063 authdomain2 2015-10-12 17:38:35 +02:00
Boris Grozev cf8950110f Adds additional logs, including timestamps relative to the initial
request.
2015-10-06 16:57:14 -05:00
yanas 9a5d2012d3 Adds jsdoc to previous commit 2015-10-06 15:02:46 -05:00
Yana Stamcheva 8a678286f7 Makes video screen fit configurable. 2015-10-06 14:37:18 -05:00
Emil Ivov 097c008a63 add display name to stats debug info 2015-10-04 16:13:28 -05:00
Marc Laporte 220fe7e993 Fix a typo 2015-10-01 22:27:32 -04:00
Boris Grozev 0bbae86f68 Fixes a bug with prematurely removed remote videos on firefox. 2015-10-01 17:56:45 -05:00
Boris Grozev ff2b7ca921 Removes unused parameters, adds documentation. 2015-10-01 17:56:45 -05:00
Boris Grozev ebdd91df4e Removes the sid property from MediaStream (how did we end up having a
Jingle session ID in MediaStream and passing it around in the UI?)
2015-10-01 17:56:45 -05:00
Boris Grozev 4934779187 Simplifies code, removes unused code. 2015-10-01 17:56:45 -05:00
damencho f626c5fbc0 Adds null check for the connection when checking whether we have joined a muc. 2015-09-29 11:55:39 -05:00
damencho ababa0fadc Changes some logging levels. 2015-09-28 17:48:41 -05:00
damencho 54b9379577 Fixes storing display name in local members list, avoid dominant speaker to delete it. 2015-09-25 17:38:28 -05:00
damencho fd954580b7 Fixes for FF: failing avatar tests and problem when last participant leaves the owner video does not switch to local video. 2015-09-23 13:50:28 -05:00
Lyubomir Marinov c992222c70 Removes duplication. Allows automated functional testing to access the WebRTC data channels. 2015-09-22 18:51:24 -05:00
Boris Grozev 506d0722bd Removes hard-coded constants and uses the events API in the statistics
module.
2015-09-21 11:29:23 -05:00
Boris Grozev 62d3b749bb Adds config options to filter out TCP or UDP candidates (for the purpose
of forcing one or the other in automated tests).
2015-09-21 11:28:55 -05:00
paweldomas 260b610725 Fixes issue with avatar not being displayed when user is in the lastN set, but has video muted. 2015-09-17 19:04:56 +02:00
hristoterezov 39c5ef2f5a Fixes jshint 2015-09-16 17:44:53 -05:00
hristoterezov b59f8d3da6 Merge branch 'issue/client-analytics' of https://github.com/gerges/jitsi-meet into gerges-issue/client-analytics
Conflicts:
	modules/UI/toolbars/BottomToolbar.js
2015-09-16 17:42:51 -05:00
Boris Grozev 745417be18 Tries to fix connecting after XMPP authentication is requested. 2015-09-14 16:06:58 -05:00
Boris Grozev fdf73a9b4e Fixes jshint warnings. 2015-09-14 09:26:24 -05:00
Boris Grozev dff4666bc6 Merge branch 'master' into lint 2015-09-14 09:26:16 -05:00
Boris Grozev 5ac3304956 Fixes a typo reported by Hamid Yaseen. Closes #283. 2015-09-11 17:20:24 -05:00
hristoterezov 161673cecb Merge branch 'issue/toolbar-config' of https://github.com/gerges/jitsi-meet into gerges-issue/toolbar-config
Conflicts:
	index.html
	libs/app.bundle.js
2015-09-11 14:49:20 -05:00
Boris Grozev bd58e6c799 Enables the jshint maximum line length check (80 chars) globally, and only overrides it in certain files. 2015-09-10 22:28:16 -05:00