BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,393 Commits 13 Branches 260 Tags 1.1 GiB
50662e3e65
Commit Graph

252 Commits

Author SHA1 Message Date
Fred Dixon
566b245e3c
Merge pull request #6385 from pedrobmarin/keep-meeting-events 
Created property keepEvents at bbb-web to make redis record the event…
 2019-01-24 21:47:50 -05:00
Ghazi Triki
4a4edd0ca6 Update bigbluebutton-web to gradle 5.1 (Work In Progress) 2019-01-09 21:06:09 +01:00
Anton Georgiev
79ecdf56e8 BBB-web: add allowRequestsWithoutSession=false to handle stripped JSESSIONID 2019-01-08 19:54:08 +00:00
Pedro Beschorner Marin
ebffcb0848 Created property keepEvents at bbb-web to make redis record the events for all meetings 2018-12-11 18:37:31 -02:00
Ghazi Triki
d8588da28a Add support for redis password. 2018-11-22 16:02:55 -02:00
Ghazi Triki
e768cbe3c5 Updated red5 applications configuration to accept redis parameters. 2018-11-21 19:31:01 -02:00
Ghazi Triki
fbd1d631d6 Move redis communication classes from red5 applications to bbb-apps-common project. 2018-11-21 10:55:06 -02:00
Ghazi Triki
8e10280614 Fix configuration for akka and bbb-web projects. 2018-11-14 20:18:12 +01:00
Ghazi Triki
5550d4464d Updated bbb-screenshare project to use common redis classes from bbb-common-message. 2018-11-13 16:19:35 +01:00
Ghazi Triki
21cb59487c Move RedisStorageService from bigbluebutton-web to bbb-common-message and replace jedis with lettuce-core. 2018-11-06 18:54:27 +01:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.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/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Ghazi Triki
41f5249f4e Updated SVG conversion to simplify complex files. 2018-10-04 23:52:57 +01:00
Ghazi Triki
b6a5e75459 Down-scale image sized over 2MB. 2018-09-11 12:51:03 +01:00
Ghazi Triki
c21f5aabad Add new parameter userInactivityThresholdInMinutes to bigbluebutton.properties and improve inactive user warning and eject from server. 2018-07-27 15:02:04 +01:00
Ghazi Triki
5472456e90 Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg and UserActivitySignResponseMsg. 2018-07-25 21:14:38 +01:00
Ghazi Triki
5b34f93daa Move user inactivity configuration parameters to bigbluebutton-web application and rename them to userInactivityLogoutTimerInMinutes and userInactivityResponseDelayInMinutes. 2018-07-25 10:56:55 +01:00
Richard Alam
aef2fe577d
Merge pull request #5889 from kepstin/turn-stun-fix 
Fix comments in turn-stun-servers.xml (v2.2-dev)
 2018-07-20 15:39:17 -04:00
Calvin Walton
4faf1c9231 Fix comments in turn-stun-servers.xml 
When some code was being moved around, it looks like a bad sed command got run
on this file which made the comments/documentation unreadable.

Revert to the previous version of the file.
 2018-07-20 11:21:46 -04:00
Richard Alam
b9dad9ff19 Merge branch 'upload-vtt' of https://github.com/ritzalam/bigbluebutton into ritzalam-upload-vtt 2018-06-28 14:27:16 -07:00
Richard Alam
fc3605f301 - merging latest v20-release branch 2018-06-21 07:38:19 -07:00
Richard Alam
788ca15440 Implement end meeting callback url 
To use, add meta_endcallbackurl parameter on the create api call.
 2018-06-20 13:13:44 -07:00
Richard Alam
5df4bef903 - toggle presentation downloads 2018-06-07 12:13:00 -07:00
Richard Alam
2bb3b59b1b - handle put track api request 2018-05-29 07:19:19 -07:00
Richard Alam
384df10746 - generate png files for uploaded presentation 2018-04-10 13:06:08 -07:00
Richard Alam
7637cedd4b Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-21 12:48:20 -08:00
Richard Alam
78afb91562 - implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml 2017-12-21 10:40:44 -08:00
Richard Alam
beed7a1058 - make client logout timer configurable in bigbluebutton.properties 2017-12-15 14:59:00 -08:00
Richard Alam
715a0177fd Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-08 11:26:09 -08:00
Anton Georgiev
d6e8396407 add configuration to join via html5 for attendee or mod 2017-11-30 15:19:03 -05:00
Richard Alam
5bf8258074 - make max file uploaded presentation 2017-11-27 14:03:50 -08:00
Richard Alam
84cfda3459 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-guest-policy 2017-09-27 11:32:13 -07:00
Richard Alam
a124b2d0e8 - call presentation checker from bbb-web 2017-09-26 12:23:39 -07:00
Richard Alam
e062e42cd0 - implement redirect of client to guest waiting 2017-09-25 14:12:54 -07:00
Richard Alam
cdb39d469e - process get recordings api call 2017-09-03 10:52:18 -07:00
Richard Alam
34f66ea1e3 - oops forgot to commit oooffice wiring 2017-08-17 14:27:16 -07:00
Richard Alam
bf1031374a - pass timeout expire when last user leaves from bbb-web to akka-apps 2017-07-16 08:11:48 -07:00
Richard Alam
0f39d99ce5 - implement meeting expiry 2017-07-15 19:10:04 -07:00
Richard Alam
a0467f319c Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle 2017-07-15 09:30:02 -07:00
Richard Alam
b04519ef0f FreeSWITCH webrtc screenshare 
- use webrtc screenshare using FS Verto
 - publish screenshare as rtmp to red5
 - flash clients view screenshare from red5 rtmp

 Fix mute/unmute/talking of user in voice conference
 2017-07-11 13:31:56 -07:00
Richard Alam
8ca0d6c9fe - wire up new message path 2017-07-03 07:44:13 -07:00
Richard Alam
e56a758c5f - send create message from bbb-web 2017-05-24 15:19:03 -07:00
Richard Alam
6b14d31853 - wire up bbb-web 2017-05-19 19:13:25 -07:00
Richard Alam
b55beeb8fa - wire up redis publisher 2017-05-10 14:37:14 -07:00
Richard Alam
76a6d99ca3 - move java classes from bbb-web into bbb-common-web 2017-05-10 13:22:50 -07:00
Pedro Beschorner Marin
66a12c9c7a Moving the meeting life cycle management from bbb-web to akka-apps 2017-05-03 17:02:16 +00:00
Richard Alam
e89c832c8a Merge branch 'master' into bbb-2x-mconf 2017-04-25 07:40:30 -07:00
Richard Alam
69ba485fcc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-04-21 08:12:56 -07:00
Ghazi Triki
8142031afe Faster PDF pages counting by replacing "pdf2swf" command with "pdfinfo". 2017-04-20 18:02:31 +01:00
Ghazi Triki
3ff28e3e9d Rename GhostscriptPageExtractor to PageExtractorImp. 2017-04-19 19:10:14 +01:00
Ghazi Triki
466c931b92 Remove usage of GhostScript and replace it by pdftocairo and pdfseparate. 2017-04-19 16:30:46 +01:00
Richard Alam
a9590976c2 - allow setting default guest policy for meeting 2017-04-18 19:45:32 +00:00
Ghazi Triki
a2644c430c Improve the document conversion fallback logic by merging the pdf page extraction and image conversion using 'convert' to a single step page to image conversion using 'gs'. Anti-aliasing for text and shapes is also improved. 2017-04-13 18:29:33 +01:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
Richard Alam
1a2bd4d74d - add delay to processing of presentation to make sure that meeting has already been 
created. This makes sure that the meeting is able to handle the presentation
   processing events.
 2017-03-06 20:05:26 +00:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Ghazi Triki
e187634c2a Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room. 2016-10-14 16:33:17 +01:00
Ghazi Triki
0e72d7523d Make breakout rooms use the selected slide of the current presentation as default presentation. 2016-09-28 22:19:48 +01:00
Pedro Beschorner Marin
49d5f9c41c Refactored redis recording events 2016-09-21 16:32:11 +00:00
jfederico
3058564ae1 bbb-web: Fixed issue with registeredUser map not cleaned up 2016-08-29 13:53:50 -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
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
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
jfederico
f075895792 bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner) 2016-05-17 10:55:37 -04:00
Anton Georgiev
cdf1ee0729 add a request/reply for stun/turn info 2016-02-17 18:36:17 +00:00
Ghazi Triki
0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015 
# Conflicts:
#	akka-bbb-apps/build.sbt
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
#	akka-bbb-fsesl/build.sbt
#	bbb-common-message/build.sbt
#	bigbluebutton-apps/build.gradle
#	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2016-01-27 14:16:05 +01:00
Richard Alam
0b898d0d29 - change how we process upload presentation. Before, an uploaded presentation consumes all of the 
presentation conversion threads. If the presentation takes a lot of time and cpu to convert,
   other uploaded presentations gets queued up and cannot be processed in parallel.
 2016-01-21 17:24:13 +00:00
Richard Alam
16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi 
Conflicts:
	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-fsesl/build.sbt
	bigbluebutton-web/build.gradle
 2016-01-07 22:58:04 +00:00
Ghazi Triki
b51dbd94b5 Updated faulty PDF file conversion mechanism. Now, we go through the following process: 
- Extract the PDF page to a single PDF file.
- Convert the PDF file to a PNG image.
- Conert the PNG image to a SWF file.
 2015-12-17 20:47:05 +01:00
Ghazi Triki
febc7ca9ea - Implemented a new logic for detecting heavy converted swf files from PDF, using obejct placements, text and bitmap count. 
- pdf2swf conversion fallback to 'bitmap' instead of 'poly2bitmap' to garantee that file can be opened fast with flash player.
 2015-12-10 19:58:21 +01:00
Ghazi Triki
1da0bfe503 Inject maxSwfShapes to SwfAnalyser class. 2015-11-26 21:35:51 +01:00
Ghazi Triki
9d6f04ed16 Added SwfAnalyser to check the converted swf result. 2015-11-25 21:29:05 +01:00
Richard Alam
cecbc46d1d - create breakout room in bbb-web 2015-10-22 17:13:53 +00:00
Richard Alam
c47272fd2c - refactor how default presentation is downloaded 2015-10-21 20:51:58 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Maxim Khlobystov
5f491bf43b Cleaning up. 2015-07-15 16:58:15 -04:00
Calvin Walton
1af70d8e4e Use configured stun/turn servers when making webrtc call 2015-02-17 12:00:04 -05:00
Richard Alam
cdc6daced8 - add support for configuring stun and turn servers 
- add new /stuns api to be called by the Flash client
 2015-02-06 19:46:56 +00:00
Anton Georgiev
b0ccef5af0 Added config pngImagesRequired. If true, the slides will be converted to png for HTML5 client. False by default. 2015-01-09 16:14:05 +00:00
Richard Alam
9effb009d0 - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
Richard Alam
5af452c39f - start implementing auto start recording 2014-10-20 03:39:44 -07:00
Richard Alam
11b8fa711e - provide a way to support pre-built config.xml 2014-08-20 11:42:31 -07:00
Richard Alam
1fd2933bfd - fix processing of png image 2014-05-01 20:56:34 +00:00
Richard Alam
51e489a143 - modify how we send and receive messages to/from redis 2014-04-30 21:45:53 +00:00
Richard Alam
75d908625c - setup messaging classes 2014-04-30 15:53:27 +00:00
Richard Alam
ef6ffa20df - make keep alive run on it's own thread 2014-04-28 22:00:48 +00:00
Richard Alam
c44f4c90a3 - wire up png converter 2014-04-19 09:23:06 -07:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.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/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Richard Alam
6cf30e9f07 - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
Markos Calderon
5a09b5a6d2 adding a response when server is down 2013-06-25 18:26:49 -05:00
Markos Calderon
f520bef467 mark bbb-apss down if server doesn't respond back 2013-06-24 17:33:39 -05:00
Richard Alam
be8befb243 Merge branch 'master' into html5-bridge 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
 2013-05-09 17:25:25 +00:00
Richard Alam
0e386adab2 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-15 21:03:13 +00:00
jfederico
f56c4474e6 bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server. 2013-03-13 15:01:14 -04:00
Richard Alam
e6fe97db36 Merge branch 'master' into merge-master-into-dynamic-config 2013-02-07 18:53:01 +00:00
Markos Calderon
ba2da7004c Merge almost complete. Still red dot not working 2013-01-25 21:50:32 -05:00
Markos Calderon
f93d40adfe Added property for set max swf file size 2013-01-23 16:01:01 -05:00
Markos Calderon
983f93b0e4 Added license for bigbluebutton-web 2013-01-18 18:24:35 -05:00
Richard Alam
1f620583a2 - allow passing of configURL in create and join api calls 2012-12-09 00:23:33 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Markos Calderon
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05:00
Markos Calderon
3c7419c5ef load textfile from the client 2012-07-17 16:39:32 -07:00
Markos Calderon
3d0b3f9307 added extract text from presentations 2012-07-12 15:49:33 -07:00
Markos Calderon
9fed546de9 Initial changes for extract text 2012-07-11 15:37:31 -07:00
Richard Alam
5177a1737a - allow admin to turn off recording for whole server 2012-03-29 16:26:10 +00:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Richard Alam
8ffc8c9bdc - hook-up expired meeting background proc 2011-07-23 16:53:34 -04:00
Richard Alam
8e983345b8 - add property to set timeout for allowing time between creating a meeting and joining a meeting 
- change default meeting expiration to 1 minute
 - trigger ingest and processing when the meeting is removed form memory instead of when the last
   user leaves the meeting
 2011-07-23 11:13:29 -04:00
Richard Alam
4d2e503214 - add param to remove the meeting right away from memory instead of letting 
it linger for about an hour (the value of the expire meeting).
 2011-07-19 16:03:36 -04:00
Richard Alam
8c8e009baa - unit test passing again 2011-06-23 14:04:00 -04:00
Richard Alam
0b6e59e8ab - add duration parameter on creat API. This allows us to set a limit on the meeting length 
to prevent continuously recording a meeting whe someone forgets to logout
 2011-06-21 14:16:37 -04:00
Richard Alam
a71b30af9c - cleanup, fix merge issues, connect to redis explicitly when subscribing to a channel 2011-06-16 10:46:59 -04:00
Richard Alam
2765a178ce - merging changes from Markos 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/OfficeToPdfConversionSuccessFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/SupportedDocumentFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2011-06-16 09:28:14 -04:00
Richard Alam
120275071e - now DI works fine...had to delete bin and target dirs remnants from maven build 2011-06-15 17:28:31 -04:00
Richard Alam
58b51c9146 - remove spring integration....having problem with dependency injection 2011-06-15 16:57:06 -04:00
Marco Calderon
d022aafb61 Cleanup bigbluebutton-web and bigbluebutton-apps 2011-06-15 08:30:56 +00:00
Marco Calderon
04dff406e8 Merge branch 'ref-bbb-web-2' of github.com:bigbluebutton/bigbluebutton into ref-bbb-web-2 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
 2011-06-14 01:47:32 +00:00
Marco Calderon
e858828162 added gson and publish updates in bbb-web, missing receiving code in bbb-apps 2011-06-14 01:43:55 +00:00
Richard Alam
769470e232 - remove jms messages 2011-06-10 15:29:11 -04:00
Marco Calderon
2ac6aaa09a merge remove-bbb-commons, working prototype, need to add status method to listener 2011-06-09 01:35:24 +00:00
Richard Alam
134be90359 - handle incoming messages from bbb-apps 2011-06-01 17:58:55 -04:00
Richard Alam
cfe20900f2 - now has setup for testing 2011-05-30 16:26:11 -04:00
Marco Calderon
5bbb607c5d Added redis pool, pubsub, and maven3 support to bbb-web 2011-05-17 11:04:40 +00:00
Marco Calderon
245070b366 removed bbb-commons. TODO: update process method and endrequest meeting 2011-05-14 05:56:35 +00:00
Richard Alam
61ea9015e5 - set redis host and port in properties file 2011-05-04 11:14:35 -04:00
Marco Calderon
7c2498597b Added support pubsub for send updates from bbb-apps to bbb-web 2011-03-28 07:19:22 +00:00
Richard Alam
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -04:00
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
d0184c8210 - cleaning up bbb-web 2011-01-19 11:09:50 -05:00
Jeremy Thomerson
ac17421e6c work on end meeting API call (issue #394) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3864 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-09 19:29:59 +00:00
Jeremy Thomerson
500604eb55 getMeetingInfo API call working 
now just need to add more information to it


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 23:59:02 +00:00
Richard Alam
db5cc1c8f1 - setup fonts directory 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3237 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 19:41:03 +00:00
Richard Alam
dcea25fe5d - fix AGI to query dynamic conference service if conference is not found from database. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3199 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-04 16:22:53 +00:00
Richard Alam
c018114366 - modify how thread get created on doc conversion 
- make max number of pages allowed to be configurable thru the properties file

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3182 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-02 18:57:30 +00:00
Richard Alam
cdd1d9a0cf - can now convert upload image files (JPG and PNG) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3159 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-30 19:13:50 +00:00
Richard Alam
0369d208db - can now handle office documents 
- cleanup

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3155 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-30 17:17:45 +00:00
Richard Alam
310e330b97 - can now handle PDF 
- need to figure out why office doc throws SI exception

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3154 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-29 20:29:17 +00:00
Richard Alam
7e2a0b5b2e - checking in so we don't loose anything if something crashes 
- refactor uploaded presentation conversion
- write some unit tests
- add headers

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3153 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-28 19:38:08 +00:00
Jeremy Thomerson
f0bcd620ad have prototype of end-to-end JMS messaging for conference events with spring integration 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2657 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 21:31:23 +00:00
Richard Alam
91302c1ba1 - rename agi name 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2106 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-08-05 17:29:06 +00:00
Fred Dixon
419827e430 added LGPL license 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1831 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-30 18:45:42 +00:00
Fred Dixon
e098260a53 remove carriage returns for development on unix 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1534 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 22:35:22 +00:00
Richard Alam
0776a4d2b1 - need to use AGI to get conference number when someone joins the voice conference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1522 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 17:33:50 +00:00
Richard Alam
b69abde8f5 - fix some problem with creating default conference 
- remove Asterisk AMI/AGI beans from resources.xml as we don't need it for now

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1520 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 15:54:16 +00:00
Richard Alam
56d4f6fbe9 - make the directory where we store the meetme recording into the properties file to make it configurable 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1370 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-04 20:53:27 +00:00
Richard Alam
832d959dfe - rename AsteriskAgi to AsteriskAgiService so the logger gets injected by Spring 
- enable recording of audio conference

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1368 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-04 15:08:38 +00:00
Richard Alam
90d1d82098 - enable AgiService to be called from Asterisk in order to have dynamic voice conferencing 
- need to add this line to /etc/asterisk/extension.conf
  exten => 1300,1,Agi(agi://192.168.0.100/meetme.groovy)
  



git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1367 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-03 20:06:34 +00:00