Commit Graph

278 Commits

Author SHA1 Message Date
paweldomas 1729f7e17e Recognizes focus user. Adds missing semicolons. 2014-12-05 17:02:40 +01:00
George Politis 5ba666de2e Restores broken config.displayJids functionality. 2014-12-05 16:49:21 +01:00
fo 8bb5994715 Fixes mixup between jid and resourceJid. 2014-12-04 18:04:17 +02: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 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
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
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
paweldomas b035bfc9aa Merge branch 'master' into ssfocus
Conflicts:
	index.html
	muc.js
	videolayout.js
2014-11-28 16:43:45 +01:00
paweldomas f06f4cd1ba Fix setting the mute icon(written by Boris Grozev). 2014-11-28 16:25:01 +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 cd6264d0df Adopts kick to new focus. 2014-11-28 16:18:58 +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 afaa96b737 Fixes merge mistake. 2014-11-28 16:16:55 +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 f629ec17fa Focus and debug changes 2014-11-28 16:00:57 +01:00
fo 1d4177faeb Adds a side panel toggler, settings menu, avatars, uuids. 2014-11-27 12:44:22 +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
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 7da0fd6794 Make it possible to pin a participant from the contact list, even if he's not in the lastN set. 2014-11-25 11:58:09 +01:00
hristoterezov 03f828ba9a Fixes issues when participant leaves caused by removing src dependancies. Stops the tracks when stream is removed. 2014-11-24 18:14:35 +02:00
Philipp Hancke 728e7ce70b try audio-only when GUM fails 2014-11-22 14:51:23 -08:00
hristoterezov 99da618811 Removes browser checks. Optimizes the browser specific code. 2014-11-21 16:50:16 +02:00
hristoterezov c2f6c9f7bc Removes the "src" attribute dependancies. Fixes the issues with not displaying the large video and thumbnails clicking not working on firefox. 2014-11-21 15:29:05 +02:00
George Politis 1ac99309e7 Hooks up participant pinning into lastN functionality. 2014-11-20 16:52:52 +01:00
George Politis 3fc819d12e Edits comment. 2014-11-18 17:23:28 +01:00
hristoterezov 2e26c212a2 Fixes the issue with the chrome video that is not displayed in firefox. 2014-11-14 17:44:38 +02:00
hristoterezov f5189d5cdc Fixes firefox issues. The firefox video is displayed in chrome. 2014-11-14 12:13:26 +02:00
hristoterezov aa5c2c11ad Removes the chrome check. Fixes some minor firefox compatibility issues. 2014-11-06 15:54:47 +02:00
fo f2a310f6c3 Adds notifications when a user joins/leaves or is added/removed from lastN. 2014-11-05 10:57:27 +02:00
hristoterezov cbb3b78d9a Removes brand.js 2014-11-04 16:14:02 +02:00
George Politis 4c04708a3a Adds hidden, and by default disabled, "displayJids" configuration option for debugging purposes. 2014-10-30 18:16:31 +01:00
Damian Minkov 5ce2ce8db6 Removes toggle lock icon, just lock or unlock it, depending the status returned by the server. 2014-10-30 17:32:03 +02:00
Damian Minkov de04bb8ef1 Changes the padlock to locked when a participant is entering a locked room and still haven't entered the key. We show padlock locked whenever the room requires a key to enter. 2014-10-28 14:46:06 +02:00
hristoterezov a3d0050328 Implements support for events for the API. Adds toggleChat and toggleContactList commands. Renames filmStrip to toggleFilmStrip command. Fixes issues with removing the embedded Jitsi Meet. 2014-10-27 15:24:09 +02:00
Damian Minkov a55e3f5d9d Fixes issue with unable to open second dialog on wrong room key entered. Still tests to come. Handle dialog action after the dialog is closed, otherwise the event for wrong key can come before the dialog is closed and will not be open again. 2014-10-24 16:33:48 +03:00
Damian Minkov b35e8aaf93 Removes unused, duplicate code method. 2014-10-24 13:26:20 +03:00
hristoterezov 667a8c1493 Implements API that allows external applications to embed Jitsi Meet. 2014-10-22 12:03:07 +03:00
Boris Grozev c7441d7f22 Removes an error message. 2014-10-17 17:12:01 +03:00
Boris Grozev 68e0592363 Revert "use all in lib, restrict to relay in app"
This reverts commit b268c7fdc5.
2014-10-17 15:37:42 +03:00
hristoterezov dc60cfc52a Implements connection quality indicator. 2014-10-16 18:11:26 +03:00
Philipp Hancke b268c7fdc5 use all in lib, restrict to relay in app 2014-10-16 13:45:41 +02:00
George Politis d20d568c28 Simplifies simulcast code. 2014-10-15 16:23:06 +02:00
Boris Grozev e380f88c77 Cleans up logging a bit. 2014-10-14 13:57:48 +03:00
Boris Grozev c5ce510da5 Changes the audio muted locally (instead of relying on self-presence). 2014-10-13 11:53:20 +03:00
Boris Grozev 63a9cb1e19 Removes an unused variable. 2014-10-13 10:38:07 +03:00
hristoterezov 8ed3b47850 Enables the room name generation when the property in interface_config.js doesn't exists. 2014-10-10 15:43:05 +03:00
George Politis e74d27bf88 Selects the datachannel that is ready for sending notifications to the bridge. 2014-10-02 19:23:12 +02:00
fo e938f144b0 Fixes bug with brigde unavailable message not shown to focus. 2014-10-02 10:53:25 +03:00
Boris Grozev c53cc032a0 Makes the generation of roomnames on the welcome page configurable and fixes some minor issues. 2014-10-01 21:23:16 +02:00
bgrozev 23c2df38ea Fix the urls to rightwatermark.png 2014-10-01 16:49:14 +03:00
paweldomas b7a229941c Fixes 'undefined' default SIP number. 2014-09-25 15:51:46 +02:00
hristoterezov 507e58dab6 Adds another element existence check to avoid JS errors in welcome page. 2014-09-25 15:07:06 +03:00
hristoterezov 5e58327a3f Adds element existence check to avoid JS errors in welcome page. 2014-09-25 15:01:18 +03:00
yanas 79bf672ca7 Clears some welcome_page and videolayout styles. 2014-09-25 12:48:37 +02:00
yanas f0a278cad5 Adds some interface config properties. 2014-09-24 16:45:19 +02:00
hristoterezov 6fe0864402 Changes secret key texts to password 2014-09-24 12:51:42 +03:00
fo 003571173e Removes an unnecessary message and changes the video bridge message. 2014-09-24 11:42:49 +03:00
paweldomas ce3c1da679 Do not show 'Media removed before had started' error dialog(keep it for log purpose only as it will happen always when peer leaves before session is initiated completely). 2014-09-23 15:19:54 +02:00
hristoterezov ab4ba5a9c3 Implements config property for disabling the prezi button 2014-09-23 15:27:12 +03:00
hristoterezov 6572ceda44 Resets local audio level when the user is muted. 2014-09-23 13:06:11 +03:00
hristoterezov 386e10a966 Adds check for datachanel state before sending data. 2014-09-19 16:19:55 +03:00
hristoterezov f6a846eecc Fixes JS error when enable / disable video. Changes the enable / disable video function to send presence with videomuted element. 2014-09-17 16:44:41 +03:00
hristoterezov aaf444bae4 Merge pull request #98 from fouksf/message-handler
Adds a message handler.
2014-09-16 17:51:32 +03:00
fo bb45d72737 Adds a message handler and messages to the user including when the video bridge is not available. 2014-09-16 17:41:03 +03:00
George Politis f2f91ff7cf Fixes problems with the adaptive simulcast. 2014-09-16 16:10:37 +02:00
George Politis 36af4da83d Implements first version of adaptive simulcast. 2014-09-15 21:42:44 +02:00
Philipp Hancke 75b8c5b962 Merge branch 'master' into tracking
Conflicts:
	index.html
2014-09-12 13:18:54 +02:00
Philipp Hancke 1a1aea4669 Merge branch 'master' into tracking
Conflicts:
	index.html
2014-09-12 13:13:28 +02:00
George Politis ffaa9a62b8 Adds simulcast support in meet. 2014-09-11 14:26:46 +02:00
bgrozev 233f18cb78 Fix a log message. 2014-09-11 11:48:55 +03:00
fo e633fed536 Adds keyboard shorcuts support for mute/unmute, start/stop camera, toggle chat, toggle film strip and push to talk functionality. 2014-09-09 12:52:51 +03:00
fo 32fab4c222 Hide the bottom toolbar with the header toolbar if the film strip is hidden. 2014-09-04 17:32:19 +03:00
Philipp Hancke df9ac36aa0 retain localAudio + localVideo when re-establishing a connection. fixes a bug report by markus kilas 2014-09-02 21:11:54 +02:00
hristoterezov b82786947a Fixes some welcome page minor issues. 2014-09-02 13:42:35 +03:00
hristoterezov f65640882f Fixes welcome page input Enter button action. 2014-09-02 11:03:53 +03:00
hristoterezov 2f8efe7a6a Fixes the issue with the wrong value of the invite dialog.(reported by Timmi) 2014-08-28 12:17:00 +03:00
hristoterezov 199fb025b9 Adds reload button to the input in the welcome page. 2014-08-27 13:59:28 +03:00
hristoterezov bcf4caaf00 Replaces the auto generated address string with string from the room name generator. 2014-08-27 12:25:50 +03:00
hristoterezov 2d8707626b Fixes issues with the welcome page. 2014-08-27 11:43:43 +03:00
yanas eec2c487fd Fixes setting of default display name in remote videos. 2014-08-27 09:20:05 +02:00
hristoterezov c00f60f57b Fixes some positions of elements from the welcome page. Adds "Join Again" button to hangup message box. 2014-08-26 18:30:49 +03:00
paweldomas e94c4238d1 Fixes crash on non HTTPS sites. 2014-08-26 13:03:30 +02:00
hristoterezov 5ccb720ecc Adds room name generator. 2014-08-26 13:54:43 +03:00
Philipp Hancke 381b764c4f add GUM tracking 2014-08-25 16:15:52 +02:00
Philipp Hancke 2d07ba1141 Merge branch 'master' into tracking 2014-08-25 16:08:43 +02:00
Paweł Domas 61a051b135 Merge pull request #102 from jitsi/gumchanges
use only a single GUM call
2014-08-25 16:02:56 +02:00
paweldomas 7d1d3b1e7e Fixes video ratio. 2014-08-25 16:02:18 +02:00
Philipp Hancke c6f7e192d0 move GUM to body.onload 2014-08-25 15:29:54 +02:00
Philipp Hancke 54ea1da98e use only a single GUM call 2014-08-25 15:04:59 +02:00
hristoterezov 08c6026521 Adds don't show welcome page checkbox and hang up button. 2014-08-25 15:48:16 +03:00
Philipp Hancke dacafdeb8a initial tracking infrastructure 2014-08-25 12:30:31 +02:00
yanas e89c7ea85c Adds a last-n user interface. Some code restructuring related to last-n and stream reception/deletion. Adds a contact list user interface. 2014-08-22 17:37:11 +02:00
paweldomas 325af308f5 Separates display name and presence status. Triggers separate event for presence status. 2014-08-22 16:21:56 +02:00