Commit Graph

17 Commits

Author SHA1 Message Date
George Politis dc5d5f8436 Nukes colibri.*.js and restores original file structure of strophe.jingle. 2014-12-26 10:40:06 +01:00
hristoterezov e2058edfdd Merge branch 'master' into firefox
Conflicts:
	libs/colibri/colibri.focus.js
	videolayout.js
2014-12-01 14:12:04 +02:00
Philipp Hancke c438676eae Merge pull request #190 from jitsi/remove-old-bundle-plans
remove old bundle plan
2014-11-25 18:48:11 -08:00
hristoterezov 5213583af2 Merge branch 'master' into firefox
Conflicts:
	app.js
	libs/strophe/strophe.jingle.adapter.js
	simulcast.js
	videolayout.js
2014-11-25 17:01:46 +02:00
George Politis 982c8cbfac Reverts 3c21b09fa4 2014-11-18 17:26:43 +01:00
Boris Grozev d97a8c63f9 Fix converting a format with multiple parameters from Jingle to SDP. 2014-11-14 21:17:39 +02:00
hristoterezov f5189d5cdc Fixes firefox issues. The firefox video is displayed in chrome. 2014-11-14 12:13:26 +02:00
George Politis 3c21b09fa4 Fixes typo in comment. 2014-11-12 11:41:11 +01:00
George Politis a0092b78ca Fixes desktop sharing when used with simulcast. 2014-11-11 15:50:46 +01:00
Philipp Hancke 4a115ee215 remove old ssrc code as well 2014-11-05 18:56:31 -08:00
Philipp Hancke 6c7dac23ec remove old bundle plan 2014-11-05 12:18:20 -08:00
George Politis ffaa9a62b8 Adds simulcast support in meet. 2014-09-11 14:26:46 +02:00
paweldomas be42629a63 Adopts XEP-0343 for DTLS/SCTP Jingle signaling. 2014-06-04 16:51:05 +03:00
paweldomas 0509b8e3c4 Adds SCTP data channels. 2014-06-04 16:51:04 +03:00
Boris Grozev d7ed97ef3a Updates the DTLS fingerpring XML namespace. 2014-04-02 20:28:40 +02:00
paweldomas 3e34df8730 Makes it possible to switch video streams during the session. Adds desktop sharing feature for chrome. 2014-03-13 14:44:44 +01:00
paweldomas 3c7de1a79d Splits strophe and colibri libs into separate scripts. 2014-03-06 15:28:36 +01:00