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

570 Commits

Author SHA1 Message Date
Richard Alam
2454e6b9a1 - add timestamp to internal meeting id. So that the external meeting id can be re-used 
especially if the meeting is recorded.
 2011-06-16 16:45:14 -04:00
Richard Alam
7cdc6adb83 - cleanup 2011-06-16 14:43:40 -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
0452324425 - putting back code 2011-06-16 09:18:57 -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
8d63e0a717 - continue refactoring bbb-web, renamed a few classes, and change get-meetings-info api 2011-06-01 10:51:40 -04:00
Richard Alam
e3ef2e5f6f - add isMeetingRunning test 2011-05-31 16:59:04 -04:00
Richard Alam
6f9563b190 - put some steps into own methods 2011-05-31 16:10:31 -04:00
Richard Alam
78adae0696 - join and create api have unit tests 2011-05-31 15:23:44 -04:00
Richard Alam
26f98fe879 - write test for create api 2011-05-30 17:39:03 -04:00
Richard Alam
cfe20900f2 - now has setup for testing 2011-05-30 16:26:11 -04:00
Richard Alam
335fd9591d - start refactoring bbb-web again...without trying to merge remove-bbb-commons branch 2011-05-30 01:42:50 +00:00
Richard Alam
4745b0e381 - run pubsub listener on own thread 2011-05-29 03:24:39 +00:00
Richard Alam
db6f7b49f3 - put all redis classes into Messaging Service 
- wee need to be able to mock the messaging service to make it unit testable
 2011-05-29 02:32:13 +00:00
Richard Alam
0fbdd39a90 - add default metadata 2011-05-27 18:41:14 -04:00
Richard Alam
e4af92a9cc - start writing record api 2011-05-26 16:48:49 -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
Marco Calderon
a9fcd56a88 refactoring bbb-apps 2011-05-11 02:09:10 +00:00
Marco Calderon
48029bf469 update thin instructions and layout 2011-04-28 20:28:33 +00:00
Marco Calderon
40cca71b04 added metadata parameter 2011-03-28 12:07:00 +00:00
Marco Calderon
7c2498597b Added support pubsub for send updates from bbb-apps to bbb-web 2011-03-28 07:19:22 +00:00
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
19c3971e1f - store meeting info in redis so we can include in events.xml 2011-02-16 10:34:49 -05:00
Richard Alam
0f82ae3e26 - add getters and setters 2011-01-19 11:36:48 -05:00
Richard Alam
d0184c8210 - cleaning up bbb-web 2011-01-19 11:09:50 -05:00
Marco Calderon
78794d5952 Fix bigbluebutton-web for recording 2010-10-30 19:51:40 +00:00
Marco Calderon
d186288749 added record conference call to BBB API 2010-10-24 08:59:23 +00:00
BigBlueButton
333dd13d6b - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
Richard Alam
ab9caa1616 - add webVoiceConf API so third parties can pass in different extension fo voip 2010-06-22 11:24:22 -04:00
Jeremy Thomerson
6e77a17fdc fixes issue #394 - now does not allow you to rejoin a conference that was already ended 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4309 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 19:08:07 +00:00
Jeremy Thomerson
be9314d6cf fixes issue #247 
automatically cleans out conferences that have either:
1 - been created, but not started in XX minutes
2 - or, started, and were ended at least XX minutes ago

you can set the number of XX minutes in bigbluebutton-web bigbluebutton.properties like: 
beans.dynamicConferenceService.minutesElapsedBeforeMeetingExpiration=60



git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4275 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-08 01:43:22 +00: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
Richard Alam
9781c2abd2 - add "logoutUrl" as API create param. This allows you to pass a URL where the participant will be brought when she logs out 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3581 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-31 02:29:51 +00:00
Richard Alam
1c928d826e - provide a way to pass a welcome message that gets displayed on the chat when a participant joins the web conference 
- the message can be set on bigbluebutton.properties but is better to pass it on the create API as "welcome" variable

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3239 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 22:22:58 +00:00
Richard Alam
4e545a737d - add option to pdf2swf for AMV2 support and fonts directory. THis way we can hightlight text on the 
resulting slides

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3235 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 19:06:47 +00:00
Richard Alam
a65559fa96 - fix logging when deployed to tomcat 
1. use our own log4j.properties file instead of having grails auto-generate one
 2. modify web.xml template to use spring's log4config listener instead of grail's one
 3. remove duplicate slf4j library
 4. leave log4j DSL in Config.groovy to enable logging when developing and running "grails run-war"
 5. log is written to /var/log/bigbluebutton/bbb-web.log

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3231 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 17:29:12 +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
c74577871a - change messages sent to client during conversion 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3166 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-31 19:39:14 +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
Richard Alam
eeaeb5bb61 - refactor presentation classes from groovy to java...java has better tool support for eclipse 
- start extracting out some code from PresentationService into it's own classes

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3132 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-22 21:06:23 +00:00
DJP
5190321157 Fixed indent + better error handling 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3111 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-17 23:06:09 +00:00
DJP
f95e878278 Get rid of client command line wrapper (jodconverter-cli) for Office2Pdf. Resolved Issue 257 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3028 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-21 11:59:19 +00:00
DJP
61f38d9645 Fixed indent 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3023 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-20 23:48:15 +00:00
DJP
41f9e5c502 Fixed class name Office2SWF -> Office2Pdf which is more correct 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3022 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-20 23:47:48 +00:00
DJP
a650246a77 Fixed bug when there was only one page in file presentation, no thumbnail was renamed due to filename temp-thumb.png instead of temp-thumb-X.png when multiple files 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3020 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-20 23:39:55 +00:00
DJP
4b878746e1 Web service update for Additional filetype support 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2990 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-11 00:43:39 +00:00
Jeremy Thomerson
c871480f00 support voice bridge in API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2676 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-10-09 05:01:08 +00:00
Jeremy Thomerson
98a02ebec2 fix a couple little things in the API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2675 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-10-09 04:27:42 +00:00
Jeremy Thomerson
e376f2c75e working conference service - create and join api calls 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2659 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-28 21:56:13 +00:00
Richard Alam
0a9d4ac945 - change voicebridge param so we can support other than 85115 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2633 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 19:13:51 +00:00
Jeremy Thomerson
4b3102e521 merging my branch into trunk 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2608 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 03:00:15 +00:00
Richard Alam
ac32baf6bf - checking in adhoc REST api 
- moving to jsecurity 0.4.1


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2572 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-21 20:45:55 +00:00
Richard Alam
f76afe580d - upgrade to grails 1.1.1 
- upgrade to jsecurity 0.4
- merge portal controller from Jeremy
- start implement adhoc conference api

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2570 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-20 19:19:50 +00:00
Richard Alam
d861ee94ca - add header 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2463 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-11 16:01:51 +00:00
Richard Alam
4cc227cd99 - refactor presentation service 
- generate blank slide or thumbnail if conversion fails for that page
- if the resulting swf file is greater than 500K, generate a SWF file using a PNG snapshot to make resulting SWF file smaller. This helps to improve performance when rendering the slide on the client

Config Changes:
/etc/nginx/sites-available/bigbluebutton
 - set client_max_body_size       20m; // Allow 20Mb file upload
 
- put blank slide and thumbnail in /var/bigbluebutton/blank (see bigbluebutton.properties)

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2356 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-02 19:42:10 +00:00
Fred Dixon
24a92381e7 remove carriage returns for development on unix 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1535 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-02 22:35:52 +00:00
Richard Alam
29c99178eb - merge in branches/developers/ritzalam/bbb-web-playback 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1336 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-29 19:38:46 +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