BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,379 Commits 13 Branches 260 Tags 1.1 GiB
0478a3f658
Commit Graph

947 Commits

Author SHA1 Message Date
perroned
a819652916 updating callbacks 2016-02-24 11:49:48 -08:00
perroned
5652417e02 normalize all callbacks passed when starting ds 2016-02-23 15:18:10 -08:00
perroned
65650d3484 normalizing callbacks 2016-02-23 15:16:39 -08:00
perroned
57ab378961 library comments 2016-02-23 14:06:45 -08:00
perroned
f486b24041 Firefox error handling 2016-02-23 14:06:24 -08:00
perroned
a42c9765f7 Firefox error handler when DS fails 2016-02-23 14:01:49 -08:00
perroned
581e7b0e02 Add extension key entry to config xml 2016-02-22 07:34:17 -08:00
perroned
ad6a0402d1 adding history of addition to library 2016-02-22 06:34:19 -08:00
perroned
ed7fbcf0e3 divide up code paths between chrome/ff and html5/flash 2016-02-17 12:33:49 -08:00
perroned
05488dda5d Firefox deskshare presenter 2016-02-17 12:30:24 -08:00
perroned
eb15680b4a documentation for modification to FSRTC lib with call types 2016-02-17 12:27:27 -08:00
perroned
1894d7e1e2 documentation for modification to FSRTC lib 2016-02-17 12:26:46 -08:00
perroned
a91eab1e05 temp fix for deskshare on Firefox 2016-02-17 08:17:10 -08:00
perroned
dedd00727a extra check for extension 2016-02-16 08:33:27 -08:00
perroned
d5057dbb74 Callback for html5/flash fix 2016-02-16 08:32:30 -08:00
Richard Alam
dd37445b7d - screenshare client 2016-02-10 19:43:38 +00:00
Richard Alam
6eb7c446e1 Merge pull request #3007 from capilkey/1.0-access-bugfix1 
Four minor accessibility fixes
 2016-02-08 17:22:36 -05:00
Chad Pilkey
d5db28ac3c removed unused functions from JS 2016-02-08 13:07:08 -08:00
Chad Pilkey
c40087ffac fixed some html labelling in the client 2016-02-08 13:06:34 -08:00
Fred Dixon
f1d322f3e2 Added Low Latency (h.263) profile 2016-02-08 12:11:48 -05:00
perroned
4c98822201 Add WebRTC option to config XML 2016-02-04 11:14:55 -08:00
Richard Alam
dbf02ba36e - desktop sharing doesn't stop when the applet is tunneling. Catch the exception and stop the applet. 2016-02-04 19:13:47 +00:00
Felipe Cecagno
dd928bf189 update copyright message to 2016 2016-02-03 15:23:37 -02:00
Felipe Cecagno
39af3980f9 update java applet with new certificate signed by RNP 2016-02-03 13:34:18 -02:00
Fred Dixon
3dbfd83747 Load get_flash_player.gif from BigBlueButton server 2016-01-30 11:32:25 -05:00
Fred Dixon
ef79077e09 Fixed undefined error when loading BigBlueButton.html 2016-01-30 11:31:35 -05:00
Felipe Cecagno
2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
 2016-01-26 18:33:31 -02:00
perroned
7d8610b68c hangup debug information 2016-01-19 10:33:05 -08:00
perroned
e983919b88 configuring server credentials and fixed Flash gUM issues 2016-01-19 08:22:17 -08:00
perroned
77a6dd586d Support for html5 and Flash 2016-01-18 07:29:42 -08:00
perroned
2216bf89a0 adding verto libraries 2016-01-18 07:24:13 -08:00
Chad Pilkey
008d59c85d Merge pull request #2947 from mconf/webrtc-reconnect 
WebRTC reconnect
 2016-01-13 15:25:33 -05:00
perroned
279f40a4c2 Updated Flash clients deskshare libs 2016-01-13 12:03:52 -08:00
Felipe Cecagno
d98bee07cf Merge webrtc-reconnect into bigbluebutton/master 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2016-01-12 15:27:01 -02:00
Chad Pilkey
3e9d6348ff update the video module to conform for accessibility 2016-01-08 15:00:23 -08:00
Richard Alam
838d6e0ad7 - merge Chad's closed caption work into Ghazi's breakout rooms work 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
 2016-01-08 19:06:42 +00:00
Felipe Cecagno
d1cfabdfa5 new deskshare applet signed by rnp 2016-01-04 15:49:53 -02:00
Felipe Cecagno
019cfa6cfb Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
 2016-01-04 15:14:27 -02:00
Felipe Cecagno
8f08e13dcc Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
 2015-12-30 18:35:13 -02:00
Felipe Cecagno
a340103fad make the shared notes default font size configurable by config.xml 2015-12-22 17:45:16 -02:00
Anton Georgiev
105fb2495d avoid issues oberved in verto 2015-12-11 16:45:36 +00:00
Chad Pilkey
71f8ff085f first try and adding caption ownership 2015-12-09 14:00:26 -08:00
Anton Georgiev
97bcb025b6 add webrtc deskshare module; comment out old deskshare module 2015-12-09 20:36:37 +00:00
Felipe Cecagno
f49d758582 change attribute on bbb_webrtc_bridge due to a new version if sip.js, from iceGatheringTimeout to iceCheckingTimeout 2015-12-08 17:43:14 -02:00
Felipe Cecagno
5d1534df8c Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/sip.js
 2015-12-08 17:42:43 -02:00
Felipe Cecagno
66379edc1d fix deskshare on java 1.9 2015-12-08 17:38:05 -02:00
Anton Georgiev
7bf1d4ce8c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3 
Conflicts:
	record-and-playback/core/scripts/bigbluebutton.yml
 2015-11-30 21:44:04 +00:00
Anton Georgiev
8ced2a3207 remove hardcoded defaults. Grab on the go 2015-11-30 21:20:56 +00:00
Felipe Cecagno
555e037d79 fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0 2015-11-30 01:06:38 -02:00
Pedro Beschorner Marin
36bbcc06d6 Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-video/.classpath
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/webapp/WEB-INF/red5-web.xml
	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/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_LA/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/src/BigBlueButton.mxml
	bigbluebutton-client/src/SharedNotesModule.mxml
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.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/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	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/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.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/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	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
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
	bigbluebutton-config/bigbluebutton-release
	bigbluebutton-config/bin/bbb-conf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
 2015-11-25 15:58:36 +00:00
Chad Pilkey
98c88558f2 trying a different approach to respond to changes to the text box 2015-11-13 15:30:32 -08:00
Felipe Cecagno
6e5729fc67 created toolbarVisibleByDefault and showToolbarButton attributes for shared notes window 2015-11-10 11:17:23 -02:00
Chad Pilkey
4dcc4a4c6e updated sipjs to match master 2015-11-06 08:47:41 -08:00
Chad Pilkey
42236569a5 update sip.js to include a ice candidate timeout 2015-11-04 16:44:55 -08:00
Chad Pilkey
03d2a376ad added in a 30s total timeout on iceGathering 2015-11-04 16:44:15 -08:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Felipe Cecagno
83ae244485 Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3 2015-10-19 11:49:36 -02:00
Richard Alam
25cd1701c6 Merge pull request #2844 from ritzalam/update-deskshare-0.9.0-jar 
- update 0.9 deskshare signed jar with new cert
 2015-10-16 16:20:51 -04:00
Richard Alam
3afe92a5b7 - update 0.9 deskshare signed jar with new cert 2015-10-16 20:18:45 +00:00
Richard Alam
8beff5f717 Merge pull request #2843 from ritzalam/update-deskhare-jar 
- new jar signed with cert that expires on oct 30, 2017
 2015-10-16 15:48:10 -04:00
Richard Alam
5e190e9578 - new jar signed with cert that expires on oct 30, 2017 2015-10-16 19:47:01 +00:00
Chad Pilkey
9f277583c2 the client responds to the first two caption messages 2015-10-15 15:42:01 -07:00
Felipe Cecagno
ec96c89105 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1-ssl 
Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
 2015-10-15 15:22:05 -03:00
Calvin Walton
f6adcde830 Update Firefox 41 hang workaround for 41.0.2 
Cherry-picked from b4e3561 on master.
 2015-10-15 14:17:55 -04:00
Calvin Walton
b4e3561fa6 Update Firefox 41 hang workaround for 41.0.2 2015-10-15 14:05:12 -04:00
Fred Dixon
e3c8520f67 Apply fix for this bug https://github.com/bigbluebutton/bigbluebutton/issues/2832 2015-10-09 16:22:30 -04:00
Anton Georgiev
a38f5b642a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-10-07 15:10:55 +00:00
Anton Georgiev
0f5c19e13b reset userAgent and callerIdName so we can switch between audio joining modes 2015-10-07 15:09:08 +00:00
Richard Alam
a2cf908425 - convert all extarnal ids in js api into internal user ids as using external user ids breaks when 
a user joins twice into the meeting
 2015-10-06 17:57:39 +00:00
Calvin Walton
dbd79cebb5 Workaround Firefox 41.0.1 hang on Windows 
On this particular browser, switch the Flash embed window mode to "opaque"
instead of "window". This causes buttons and right-click to be somewhat
unresponsive, but is still better than a complete browser hang.

The browser versions that the workaround is applied to is extremely limited,
because of the sideeffects.
 2015-10-05 11:26:31 -04:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Anton Georgiev
4253faa426 remove extra condiction 2015-09-24 16:05:41 +00:00
Anton Georgiev
2bd601cc08 simplify html5 redirect #2801 2015-09-24 15:58:17 +00:00
Anton Georgiev
07dfd89dd7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2015-09-23 21:24:34 +00:00
Anton Georgiev
6cfc16cde5 offer redirect to HTML5 only if available 2015-09-23 21:24:19 +00:00
Ghazi Triki
920fc97532 Merge branch 'master' into client-logging-to-server 2015-09-16 21:11:33 +01:00
Richard Alam
c13e17a7d4 Merge pull request #2770 from riadvice/chat-message-limit 
Add a maximum allowed length to chat message
 2015-09-16 15:04:26 -04:00
Ghazi Triki
07d7f389c1 Logging format can be configured in flex client application. 2015-09-16 18:55:09 +01:00
Richard Alam
899b98f81b Merge pull request #2780 from riadvice/puffin-browser 
Enable video and audio sharing for Puffin browser 4.6 and above.
 2015-09-15 16:12:25 -04:00
Felipe Cecagno
3e75ddbcee update the websocket server address if the page is loaded using https (so the socket server must be secure as well) 2015-09-12 14:13:18 -03:00
Calvin Walton
56fb7c8b06 Use protocol-relative links to load the 'get flash' button image 
This fixes a mixed content warning when loading the client over https
 2015-09-12 12:35:59 -03:00
Ghazi Triki
65f1b72294 Enable video and audio sharing for Puffin browser 4.6 and above. 2015-09-12 12:35:12 +01:00
Richard Alam
cfa6e30b23 Merge branch 'master' into client-to-server-logging 2015-09-10 17:52:58 +00:00
Calvin Walton
e7008957c9 Use protocol-relative links to load the 'get flash' button image 
This fixes a mixed content warning when loading the client over https
 2015-09-10 11:53:36 -04:00
Ghazi Triki
19dbba500b Chat message longer than "maxMessageLength" cannot be sent. 2015-09-07 16:10:49 +01:00
Chad Pilkey
b2693753c6 added a widescreen video profile 2015-09-04 17:49:22 -04:00
Richard Alam
82e9f4ea49 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-to-server-logging 2015-09-04 19:56:38 +00:00
Felipe Cecagno
c99e3fbfb4 Merge branch 'feature-1745' into mconf-live0.7.3 2015-09-03 14:24:33 -03:00
Felipe Cecagno
c8188670da Merge branch 'mconf-live0.6.4-auto-reconnect' into mconf-live0.7.2-auto-reconnect 
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-08-31 16:50:47 -03:00
Ghazi Triki
7ec8c6e3b7 Merge branch 'master' into emoji-status 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-08-28 19:06:48 +01:00
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
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2015-08-21 20:15:37 +00:00
Ghazi Triki
f0ed185c71 determineBrowser function in bbb_blinker.js detects Puffin mobile browser. 2015-08-18 22:57:34 +01:00
Anton Georgiev
6855e6b6d4 strip html UI for DeskShare 2015-08-13 20:14:50 +00:00
Anton Georgiev
d360e90aef make better use of available viewing space 2015-08-05 16:25:00 +00:00
Anton Georgiev
57687b11db update verto_extension[_share] 2015-08-05 14:48:47 +00: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
Anton Georgiev
9f1f43b850 add logs 2015-07-28 19:59:43 +00: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
Anton Georgiev
a1e90f6462 revert rewriting of verto_extension_share 2015-07-15 15:36:23 +00:00
Anton Georgiev
8b4c06c47c debugging; could connect to FS and share my webcam 2015-07-15 15:24:45 +00:00
Anton Georgiev
bbaaff51d0 add the rest of the req'd libs 2015-07-15 15:23:27 +00:00
Pedro Beschorner Marin
5dfa655003 Removed unused resource 2015-07-13 17:42:51 +00:00
Anton Georgiev
01c25bd8c5 add verto.js 2015-07-13 14:57:10 +00:00
Anton Georgiev
81c57c2b1a presenter trigger ds - first phase 2015-07-10 17:25:07 +00:00
perroned
56698418fe Adding mod_verto-bridge screenshare extension 2015-07-10 16:12:18 +00:00
perroned
093f292d19 Adding mod_verto-bridge extension 2015-07-10 16:12:05 +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