BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,175 Commits 13 Branches 260 Tags 1.1 GiB
740ff53fb5
Commit Graph

222 Commits

Author SHA1 Message Date
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
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
a9590976c2 - allow setting default guest policy for meeting 2017-04-18 19:45:32 +00: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
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00: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
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
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
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
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
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
51e489a143 - modify how we send and receive messages to/from redis 2014-04-30 21:45:53 +00:00
Richard Alam
ef6ffa20df - make keep alive run on it's own thread 2014-04-28 22:00:48 +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
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
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
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
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
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
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
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
Richard Alam
98dc0bc272 - bringing bigbluebutton-web into trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1190 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-01 16:53:45 +00:00