BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,655 Commits 13 Branches 260 Tags 1.1 GiB
ec96c89105
Commit Graph

437 Commits

Author SHA1 Message Date
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
Fred Dixon
e3c8520f67 Apply fix for this bug https://github.com/bigbluebutton/bigbluebutton/issues/2832 2015-10-09 16:22:30 -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
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
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
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
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
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
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
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
Anton Georgiev
238f1e56ff meteor endpoint /html5client/check. update BigBlueButton.html 2015-03-13 20:43:32 +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