Commit Graph

809 Commits

Author SHA1 Message Date
paweldomas 4b8eef0f3e Adds 'jicofo' to jitsi-meet-prosody Depends. 2014-12-04 12:31:41 +01:00
paweldomas 4776605dec Merge branch 'ssfocus' 2014-12-04 11:19:45 +01:00
Zalmoxisus 7b0be8e953 Prevent XSS injection using 'nick' on presence
Also allows special characters in displayName. Fixes issue #182.
2014-12-03 22:44:03 +02:00
George Politis 5af92474c3 Attempts to prevent ghost contacts from appearing in the contact list. 2014-12-03 12:47:44 +01:00
paweldomas f749bed1dd Adds jicofo debian package integration. 2014-12-02 20:11:54 +01:00
paweldomas e308025143 Merge branch 'master' into ssfocus
Conflicts:
	config.js
	libs/strophe/strophe.jingle.session.js
	rtp_sts.js
2014-12-02 20:09:24 +01:00
Damian Minkov 63dd6df217 Updates strophe to use a patch that handles only result and error responses when an iq is send (https://github.com/strophe/strophejs/pull/95). Fixes a problem with openfire sending us iq packages with id which we have already used. 2014-12-02 15:21:12 +02:00
Damian Minkov bb5d178220 Uses sendIQ method to send iq packets, this way the id attribute will be added. 2014-12-02 15:21:12 +02:00
hristoterezov edb89a65d5 Adds config property for enabling firefox support 2014-12-01 19:59:51 +02:00
hristoterezov e2058edfdd Merge branch 'master' into firefox
Conflicts:
	libs/colibri/colibri.focus.js
	videolayout.js
2014-12-01 14:12:04 +02:00
hristoterezov 6cf96c5d72 Fixes an issue with black thumbnails 2014-12-01 13:15:36 +02:00
hristoterezov abe3ef199f Fixes an issue with strange values of bitrate statistics. 2014-12-01 12:58:03 +02:00
Philipp Hancke 50b4f33207 Merge pull request #99 from jitsi/nackpli
add nack pli
2014-11-28 15:36:33 -08:00
Philipp Hancke 0663efe8cb Merge pull request #199 from jitsi/audioonly-again
try audio-only when GUM fails
2014-11-28 15:35:57 -08:00
hristoterezov 501c97b27c Implements firefox support for the rtp stats 2014-11-28 19:47:19 +02:00
George Politis d4a5b3cf2e Fixes typo in comments. 2014-11-28 17:06:36 +01:00
George Politis 37bb4b82ad Fixes issue introduced by 71e290a8ad.
simulcastlayerschanged/ing should run if lastN is disabled.
2014-11-28 17:00:16 +01:00
paweldomas b035bfc9aa Merge branch 'master' into ssfocus
Conflicts:
	index.html
	muc.js
	videolayout.js
2014-11-28 16:43:45 +01:00
paweldomas 6b968b1d14 Adds config options to the conference iq sent to the focus. 2014-11-28 16:31:01 +01:00
paweldomas f06f4cd1ba Fix setting the mute icon(written by Boris Grozev). 2014-11-28 16:25:01 +01:00
paweldomas b5ecdc8dee Sends peer connection stats to the focus(written by Boris Grozev). 2014-11-28 16:24:33 +01:00
paweldomas 7e90d73003 Saves PeerConnection statistics and prepares to send them over XMPP(written by Boris Grozev). 2014-11-28 16:23:57 +01:00
paweldomas 71b63cd0b3 Adds Pako (an implementation of zlib deflate). Written by Boris Grozev. 2014-11-28 16:23:17 +01:00
paweldomas 8f94ac8b09 Detects focus user in reliable way(through user real JID). Fixes kicked event when both 307 and 110 status codes are received in MUC presence. 2014-11-28 16:21:01 +01:00
paweldomas 871c661ba9 Adds support for muting audio on the bridge. 2014-11-28 16:20:43 +01:00
paweldomas 3f3046893e Ignore unrecognised 'default' stream. 2014-11-28 16:20:24 +01:00
paweldomas 0f6b6ae960 Adjusts recording button handling to the new focus(not finished). 2014-11-28 16:19:20 +01:00
paweldomas cd6264d0df Adopts kick to new focus. 2014-11-28 16:18:58 +01:00
paweldomas 285096cc99 Uses separate exp backoff timers for 'not ready' and error responses from the focus. 2014-11-28 16:18:31 +01:00
paweldomas 84a453597c Reloads the page when focus leaves to dispose MUC room. Adds exponential backoff to focus polling. 2014-11-28 16:18:12 +01:00
paweldomas 7dc8102dee Replaces 'focus' occurrences with moderator for handling privileged functionalities. 2014-11-28 16:17:53 +01:00
paweldomas ed2d7e4282 Fixes jshint warnings in toolbar_toggler.js 2014-11-28 16:17:13 +01:00
paweldomas afaa96b737 Fixes merge mistake. 2014-11-28 16:16:55 +01:00
paweldomas d8ebea0d8b Fixes some of shint warnings in toolbar.js 2014-11-28 16:16:27 +01:00
paweldomas a0fef34a1f Removes unused vars from moderatemuc.js. and fixes jshint warnings. 2014-11-28 16:16:04 +01:00
paweldomas 9d3aef2efa Fixes code comment. 2014-11-28 16:15:29 +01:00
paweldomas 6646b2821a Adds MUC role change notifications. 2014-11-28 16:14:54 +01:00
paweldomas 613e18952b Waits for the focus to join first. 2014-11-28 16:05:43 +01:00
paweldomas 6afcfb2598 Basic recording. 2014-11-28 16:05:10 +01:00
paweldomas 4efad3d3da Advertises rtcp-mux and BUNDLE if it's enabled. 2014-11-28 16:03:35 +01:00
paweldomas 73571e7a18 Send media presence after session-accept. 2014-11-28 16:02:27 +01:00
paweldomas f629ec17fa Focus and debug changes 2014-11-28 16:00:57 +01:00
George Politis a8909028c8 Modifies the avatars, lastN and adaptive lastN handling so that they play nicely together. 2014-11-28 12:29:52 +01:00
fo 5b9b45c91b Fixes a bug when there is no active speaker currently. 2014-11-27 18:27:31 +02:00
fo 1d0b4d0ecb Fixes a bug with avatar when no id or email is sent with presence. 2014-11-27 18:14:43 +02:00
fo 1d4177faeb Adds a side panel toggler, settings menu, avatars, uuids. 2014-11-27 12:44:22 +02:00
hristoterezov 9b5edde621 Fixes the issue with the large video that doesn't fill the large video container. 2014-11-26 16:36:42 +02:00
hristoterezov c6cc570f1d Fixes issues caused by the merge with master. Fixes the simulcast conferences on chrome. 2014-11-26 14:10:41 +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