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

689 Commits

Author SHA1 Message Date
Fred Dixon
f9080afe95 Merge pull request #3226 from capilkey/closed-captioning-fixes 
Closed captioning upgrades
 2016-07-18 15:26:25 -06:00
Chad Pilkey
8b1b3b6fee add caption tabindex and localized strings 2016-07-18 14:17:44 -07:00
Chad Pilkey
027d803770 move caption window to its own layout 2016-07-18 14:17:44 -07:00
Richard Alam
e0b756cce9 Fix issue 3204 
- Need to pass sessionToken to get stuns for webrtc call.
 2016-07-15 18:05:08 +00:00
Richard Alam
c5984219c3 Add help on how to use new screenshare 
Provide a way for users to learn how to use the new screen share as
 the steps to launch it differs depending on OS and browser.
 2016-07-14 19:20:25 +00:00
Chad Pilkey
5dd6d86b36 upgrade sip.js to 0.7.5 2016-07-07 21:06:11 +00:00
Ghazi Triki
3d21b291cb Added new option "enableBreakoutRooms" to users module. 2016-06-02 21:05:18 +01:00
Fred Dixon
cd1779afbe Remove XML block for older deskshare module 2016-05-29 21:58:00 -04:00
Fred Dixon
098cb8e560 Commented out Deskshare in config.xml.template 2016-05-28 16:03:37 -04:00
Richard Alam
6233105f69 Merge pull request #3150 from perroned/join-components-with-skeleton 
Adds deskshare video to html5 client
 2016-05-27 21:45:53 -04:00
perroned
2145cc0d1e Stops fucntion that broke video viewing on html5 2016-05-26 20:25:27 +00:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
Anton Georgiev
0861e192b9 disable webrtc deskshare for now 2016-05-19 17:59:58 +00:00
Anton Georgiev
4981344062 Merge branch 'mod-verto-1' of github.com:perroned/bigbluebutton into merge-webrtc-ds 
Conflicts:
	bigbluebutton-html5/app/client/globals_audio.coffee
	bigbluebutton-html5/app/client/verto.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/server.coffee
 2016-05-19 15:48:40 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.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/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.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/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
b2a4a150c4 - add Occitan locale 2016-05-12 15:19:13 +00:00
Richard Alam
b9cb2298b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-1.1-dev-java8 2016-04-14 20:05:22 +00:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome 
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
 2016-04-05 14:04:37 -04:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
perroned
088d3eb4cd Linker checks for Edge browser 2016-04-02 19:32:29 -05:00
perroned
388ff0705c Moves verto credentials to config.xml 2016-04-01 14:47:40 -05:00
Richard Alam
7d5c9d63e4 Upgrade to Java 8 
Upgrade to Java 8 and merge screenshare feature.

Conflicts:
	bigbluebutton-client/.actionScriptProperties
 2016-03-21 20:19:48 +00:00
Richard Alam
a684aa4dfc Merge into bbb-1.1.dev 
Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.

Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2016-03-21 18:12:30 +00:00
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
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
perroned
7d8610b68c hangup debug information 2016-01-19 10:33:05 -08:00