BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,207 Commits 13 Branches 260 Tags 1.1 GiB
6fd5e289eb
Commit Graph

745 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
2b1a0274eb Merge branch 'auto-reconnect' into mconf-live0.6.4-auto-reconnect 2015-08-28 16:34:21 +00:00
Ghazi Triki
35e8d03949 - Added new EmojiGrid component. 
- Replaced raise hand feature by emoji status in client (WIP)
 2015-08-27 21:31:46 +01:00
Chad Pilkey
760b7b306a add in an ICE connection timeout set to 60s 2015-08-26 16:56:52 -04:00
RafaFP
6545dd89c5 Implemented the feature which changes the name of the locations to Portuguese (Brazilian) when the user changes the locale to Portuguese (Brazilian). 
#ref1745
 2015-08-24 21:26:24 +00:00
Ghazi Triki
c4d240950f Configuration property enableRaiseHand renamed to enableEmojiStatus. 2015-08-23 16:35:10 +01:00
Ghazi Triki
96a27c103c Log level can be configured in flex client application. 2015-08-22 17:15:12 +01:00
Ghazi Triki
4de187d833 Created new logging target ServerLogTarget to store flex logs to server. 2015-08-22 13:02:51 +01:00
Ghazi Triki
f0ed185c71 determineBrowser function in bbb_blinker.js detects Puffin mobile browser. 2015-08-18 22:57:34 +01:00
Ghazi Triki
83666a7caa Merge branch 'development' into as3-logging 
Conflicts:
	bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
	bigbluebutton-client/src/org/bigbluebutton/core/services/UsersService.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/PollResultObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as
 2015-07-29 19:44:29 +01:00
Felipe Cecagno
210cd92e50 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-config/web/index.html
 2015-07-27 16:58:55 -03:00
Felipe Cecagno
e3f2df289b new deskshare applet signed by RNP, with Mconf logo 2015-07-27 16:26:13 -03:00
Richard Alam
27c8b521fb - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-07-24 16:00:30 +00:00
Ghazi Triki
632df068ad Added logging entry to application configuration. 2015-07-22 11:59:15 +01:00
Ghazi Triki
eafaac15f6 - Added JSNLogTarget for jsnlog library. ( still experimental because too slow ). 
- Removed JSLog and JSLogger classes to unifiy JavaScript logging output.
 2015-07-21 05:39:36 +01:00
Pedro Beschorner Marin
5dfa655003 Removed unused resource 2015-07-13 17:42:51 +00:00
Pedro Beschorner Marin
324ed1b9ab Merge branch 'auto-reconnect' into mconf-live0.6.4 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2015-07-03 14:35:08 +00:00
Chad Pilkey
fa808ec594 Uncommenting the PollingModule in config.xml.template 2015-07-02 14:08:29 -04:00
Felipe Cecagno
c79be37591 Merge branch 'mconf-live0.6.4' into base-for-0.6.4 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2015-06-22 17:18:26 -03:00
Felipe Cecagno
a2a7e9af24 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.6.4 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
 2015-06-19 15:11:13 -03:00
Felipe Cecagno
e657cddc8d new deskshare applet signed by RNP, with Mconf logo 2015-06-19 14:50:30 -03:00
Richard Alam
2a93dbf4a7 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-06-17 15:59:27 +00:00
Felipe Cecagno
a819933ebf Merge branch 'webrtc-reconnect' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:48:23 -03:00
Felipe Cecagno
ddfbd0b138 Merge branch 'webrtc-reconnect' into v0.9.0-release 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:43:10 -03:00
Felipe Cecagno
cad68ba530 make client check compatible with v0.9.0-release 2015-05-26 17:03:33 -03:00
Felipe Cecagno
034cccda1e Merge branch 'fix-layout-module' into mconf-live0.6.3 2015-05-24 20:07:52 -03:00
Felipe Cecagno
6e13383689 updated default layouts definition 2015-05-24 20:07:18 -03:00
Felipe Cecagno
c072bbd410 Merge branch 'webrtc-timeout' into mconf-live0.6.3 2015-05-21 12:54:58 -03:00
Felipe Cecagno
aca0db14e3 reduced the ice gathering timeout to 3 seconds instead of 5 2015-05-21 12:54:50 -03:00
Felipe Cecagno
707674958c Merge branch 'webrtc-timeout' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-config/web/index.html
 2015-05-17 23:32:36 -03:00
Felipe Cecagno
b555c579a8 Merge branch 'webrtc-timeout' into v0.9.0-release 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
 2015-05-17 23:29:48 -03:00
Felipe Cecagno
2a5f4ebedb cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code 2015-05-17 23:08:41 -03:00
Felipe Cecagno
7cb12f8b49 Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release 
Conflicts:
	bbb-api-demo/src/main/webapp/demo10_helper.jsp
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/cy_GB/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_419/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/hy_AM/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ms_MY/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-05-17 19:25:26 -03:00
Felipe Cecagno
19e54bfe66 refactored the autoreconnect capability 
- multiple disconnections are reestablished in order, first the main bigbluebutton connection, then the other connections
- if the user was sharing video, and the video connection drops, the video views close and it reconnect in a consistent state
- if the user is connected to webrtc and the main connection drops, the webrtc connection will still be active, then the server will send a UserLeft message to everyone and will reconnect the user as a phone user, so the UI continues consistent; when the user reconnects, it will reuse the voice information

IMPORTANT: modify external.xml in order to disable media timeout
/opt/freeswitch/conf/sip_profiles/external.xml:    <param name="rtp-timeout-sec" value="0"/>
 2015-05-08 12:43:25 -03:00
Richard Alam
537786044c Merge pull request #637 from maxdoumit/Deskshare-TLS 
Deskshare tls
 2015-05-08 10:07:03 -04:00
maxdoumit
cd90de09f8 Changed names and removed unused function 2015-05-07 09:47:15 -07:00
maxdoumit
07aa31e936 Added missing config in the config.xml.template 2015-05-07 08:53:31 -07:00
maxdoumit
d9e88b7620 Added TLS option for the screenshare applet 2015-05-06 12:18:28 -07:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Pedro Beschorner Marin
ecf21c8664 Added a timer to control ICE gathering process 2015-04-24 14:11:17 -03:00
Felipe Cecagno
af98c4a62c Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-04-17 12:24:39 -03:00
Felipe Cecagno
25ddb7958d removed the endTime since it's always null 2015-04-17 12:24:12 -03:00
Pedro Beschorner Marin
5fa32ca80e Some cleanup 2015-04-17 11:17:54 -03:00
Pedro Beschorner Marin
51cfa5f5fa Surrounded bye so error can be caught and trigger cancel 2015-04-16 17:01:23 +00:00
perroned
f0f28f2f76 Update method we check call status 2015-04-16 08:56:56 -07:00
perroned
59b02e3b2f Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 2015-04-15 05:49:32 -07:00
perroned
19816f060e avoid conflict 2015-04-13 04:08:03 -07:00
Anton Georgiev
61d64ad9cc Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-04-10 19:21:40 +00:00
Anton Georgiev
c4edf0cbf3 prepend the callerIdName so it is recognized as a global audio user 2015-04-10 18:51:46 +00:00
Chad Pilkey
475cbb4756 removed some unused layout options 2015-04-06 12:05:46 -07:00
Felipe Cecagno
b7eca98c92 force the browser to update the branding file using ?v=VERSION 2015-04-06 14:23:22 -03:00
perroned
8467f40148 Documentation for listen only 2015-04-06 07:29:25 -07:00
Chad Pilkey
3f51358618 reworked the applet mouse listeners to simplify and improve the functionality 2015-04-02 11:45:30 -07:00
perroned
2580c24f6a cleaned up 2015-04-02 08:37:51 -07:00
Felipe Cecagno
77bd320887 Merge branch 'audio-hints-flag' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-04-01 09:48:00 -03:00
perroned
4e1ad3b42a Added extra field allowing for listen only 2015-03-31 12:35:09 -07:00
Chad Pilkey
3b5ab7cbbe improved the chat url regex 2015-03-27 14:32:27 -07:00
Pedro Beschorner Marin
a2d7f43130 Added a config option to enable/disable WebRTC audio connection browser's hints 2015-03-26 12:38:43 -03:00
Richard Alam
c63c371e7b - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1909 2015-03-25 21:58:09 -03:00
Richard Alam
2a0786d19c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-1909 2015-03-25 21:15:20 +00:00
Richard Alam
315ac0688c - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1909 2015-03-25 21:14:48 +00:00
Chad Pilkey
f7a99342b5 increase webrtc transfer timeout 2015-03-25 14:05:26 -07:00
Mateus Dalepiane
7a0e75ace3 Merge branch 'mdalepiane/reconnect-webrtc' into mconf-live0.6.2 2015-03-25 12:10:04 -03:00
Mateus Dalepiane
2d14eaf531 Fix WebRTC user agent callbacks 
This applies to connect and disconnect websocket events.
 2015-03-24 12:51:31 -03:00
Chad Pilkey
6bd3c4d1f4 Merge pull request #570 from BBBManager/bbb-lock-settings 
Bbb lock settings
 2015-03-20 13:09:17 -04:00
Fred Dixon
c4d50d59dc Merge pull request #574 from capilkey/add-ready-notification 
Added a 'ready' notification when the client starts up for screen readers
 2015-03-18 19:53:09 -04:00
Fred Dixon
b214de3d2c Merge pull request #575 from capilkey/fix-webrtc-null-errors 
check for null before calling UA.stop()
 2015-03-18 19:52:57 -04:00
Chad Pilkey
afb5787941 check for null before calling UA.stop() 2015-03-18 15:36:29 -07:00
Chad Pilkey
c5e0436204 added a 'ready' notification when the client starts up for screen readers 2015-03-18 14:21:01 -07:00
Richard Alam
acc58d250f - lower log level when not able to load html5 client 2015-03-18 18:19:55 +00:00
Tiago Daniel Jacobs
44e387b2dd Merge remote-tracking branch 'bbboficial/master' into bbb-lock-settings 2015-03-16 20:04:32 +00:00
Tiago Daniel Jacobs
3c5ba8c5b9 Changing template to include the muteOnStart option 2015-03-16 18:06:41 +00:00
Fred Dixon
2bf6d05ca1 Merge pull request #565 from antobinary/meteor-endpoint 
meteor endpoint /html5client/check. update BigBlueButton.html
 2015-03-13 17:31:06 -04:00
Anton Georgiev
238f1e56ff meteor endpoint /html5client/check. update BigBlueButton.html 2015-03-13 20:43:32 +00:00
Tiago Daniel Jacobs
0f130e9f69 Removed unused property 2015-03-12 21:40:16 +00:00
Tiago Daniel Jacobs
f6139c5b4a Updating the config.xml with the lockOnJoin* properties 2015-03-12 21:23:36 +00:00
Anton Georgiev
efc126f410 styled the wrong div 2015-03-10 16:11:56 +00:00
Anton Georgiev
edb667a419 minor styling changes 2015-03-10 15:28:39 +00:00
Anton Georgiev
ee69c62309 first check if the html5 client is running and then attempt to redirect the user 2015-03-06 22:44:13 +00:00
Anton Georgiev
deec36b411 style the redirect page a bit 2015-03-06 22:43:51 +00:00
Anton Georgiev
e77b295517 Merge branch 'master' into flash-redirect 2015-03-05 22:56:34 +00:00
Anton Georgiev
f62fd4ce31 due to this the html5 client was not able to join a voice conf without a flash user already joined 2015-03-05 21:10:27 +00:00
Anton Georgiev
0a79f0dc29 the redirection page offers installing Flash or redirection 2015-03-05 17:30:09 +00:00
Anton Georgiev
44429a6bd6 redirect user to HTML5 client if Flash not installed/enabled. Must be attendee (for now) 2015-03-04 23:51:33 +00:00
Chad Pilkey
8de57dfc36 Fixed the WhiteboardModule definition in config.xml 2015-03-04 10:43:54 -05:00
Felipe Cecagno
bb330cf0a2 Merge branch '090-deskshare-window' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-03-02 00:25:02 -03:00
Chad Pilkey
815be28d0b Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-03-02 00:53:10 +00:00
Mateus Dalepiane
f3ba92c087 Partially working 2015-03-01 12:27:20 -03:00
Chad Pilkey
eb17e4a056 added extra logging information to TURN debugging 2015-02-24 12:15:01 -08:00
Chad Pilkey
4be1b5c2e3 remove disclaimer from bbblogger.js 2015-02-24 11:36:41 -08:00
Chad Pilkey
4336612830 fixed a null error and race condition with the TURN support 2015-02-24 11:36:14 -08:00
Richard Alam
65c35e1137 Merge pull request #520 from bigbluebutton/add-more-info-js-log 
- add more info into JS log
 2015-02-17 19:26:22 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Richard Alam
931d1624d7 - add more info into JS log 2015-02-18 00:09:10 +00:00
Calvin Walton
1af70d8e4e Use configured stun/turn servers when making webrtc call 2015-02-17 12:00:04 -05:00
Fred Dixon
0c5e427093 Merge pull request #514 from capilkey/pixel-align-fix 
move the pixel alignment check to a callback
 2015-02-12 18:57:29 -05:00
Chad Pilkey
537f5b6e9a move the pixel alignment check to a callback 2015-02-12 15:52:03 -08:00
Fred Dixon
aa518d6ef0 Merge pull request #513 from capilkey/cut-call-time 
Cut WebRTC call time
 2015-02-12 18:13:09 -05:00
Chad Pilkey
10874f986d move <script> tag to the correct place in BigBlueButton.html 2015-02-12 14:26:19 -08:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Richard Alam
aa0e92137b - remove querying of stun from flash. We will be doing this outside in JS instead. 2015-02-12 18:29:39 +00:00