BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,055 Commits 13 Branches 260 Tags 1.1 GiB
351df9c1f6
Commit Graph

666 Commits

Author SHA1 Message Date
Richard Alam
8cdf4cd1dd - remove html tag in welcome message as chat will format it 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3340 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-19 18:10:36 +00:00
Fred Dixon
104ea65352 removing spaces around ' = ' bigbluebutton.properties ... tracking down a bug in the upgrade scripts 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3305 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-14 16:08:06 +00:00
Fred Dixon
c1dd1c4ee1 updates to draft welcome message in chat window 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3247 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-09 06:56:08 +00:00
Richard Alam
80e25349a1 - reformat welcome message 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3243 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-08 15:51:43 +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
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
25e2104eee - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3232 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 17:41:03 +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
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
aa565b4d5a - update doc 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3185 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-02 22:39:35 +00:00
Richard Alam
1727582cd8 - fix so that securitySalt can be set in the properties file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3184 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-02 22:38:51 +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
Fred Dixon
fa81684cc0 Have bbb-web log to /var/www/bigbluebutton; add JSON support for reply when calling create() in ApiController.groovy 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3145 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-24 02:21:26 +00:00
Fred Dixon
e73b2ea920 updates bigbluebutton.properties to support securitySalt for API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3144 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-24 02:05:45 +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
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
Fred Dixon
a08f7b4c9b removed spaces from bigbluebutton.properties to make upgrading packages easier 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3027 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-21 03:34:43 +00:00
Fred Dixon
339d0729b2 enabled openoffice for bigbluebutton.properties in bbb-web. This was to update the bbb-web package for integrating DJP's conversion of office documents into BigBlueButton. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3010 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-15 00:27:43 +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
Fred Dixon
ecd0b438f5 updates to bigbluebutton.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2877 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-07 00:08:32 +00:00
Fred Dixon
ecba245df4 added support for .grails/bigbluebutton-config.properties in bbb-web when developing locally 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2802 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-03 23:18:34 +00:00
Fred Dixon
6c39a3af70 removed reference to /etc/defaults/bigbluebutton (not used) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2797 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-03 20:27:01 +00:00
Fred Dixon
b4b5c5dd37 removed hardcoded path in bigbluebutton-web/grails-app/conf/Config.groovy 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2768 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-10-30 19:39:24 +00:00
Richard Alam
3b7bd3676f - put a logged out url landing page 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2722 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-10-27 20:57:40 +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
a45e0cac52 - remove id from url mapping 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2628 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 18:14:18 +00:00
Richard Alam
1e9dd27215 - add boolean transactional false to DynamicConferenceService 
- change API again

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2627 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 17:41:30 +00:00
Richard Alam
b7064ec12a - change Adhoc API from POST to GETs 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2620 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 17:16:18 +00:00
Jeremy Thomerson
c84d23244d more work on dynamic conferencing api 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2612 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 05:20:00 +00:00
Jeremy Thomerson
c002986fd1 change url mapping for my api so as not to conflict with richard's and fix bug in create method returning duplicate xml 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2611 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-25 03:33:24 +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
7ac215b5c5 - modify adhoc controller so it supports xml, form, and json requests 
- create a demo on how to call it using jquery

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2600 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-24 18:20:19 +00:00
Richard Alam
2e57f81df1 - fix logging 
- put logs in /tmp/logs

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2599 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-24 18:13:53 +00:00
Richard Alam
cbeb98c867 - setup demo for creating adhoc conf 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2598 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-23 19:56:44 +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
4e733c1cba - when resulting swf file is greater than 500K, use an image snapshot to generate the slide 
- send out generating thumbnails progess update

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2369 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-09-04 17:58:34 +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
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
Tyler Copeland
5be57e60da Update the wording for default session 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1607 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-12 15:31:43 +00:00
Richard Alam
a2a18a9448 - fix problem when creating a new user 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1601 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-11 19:38:02 +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
9282339540 - flush right away to database when saving domain in bootstrap 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1510 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-06-01 15:18:03 +00:00
Richard Alam
be91497b09 - remove phil and alice from bootstrap 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1504 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-29 21:18:49 +00:00
Fred Dixon
3fc60ec0e0 assign default conference to admin user 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1482 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-29 00:35:41 +00:00
Fred Dixon
d54e1038e8 updated bigbluebutton.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1477 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-28 21:43:47 +00:00
Richard Alam
5983047344 - create a default conference and session (85115) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1465 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-28 15:21:40 +00:00
Richard Alam
ca2059bcf7 - trigger hudson build 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1418 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-08 15:13:14 +00:00
Richard Alam
3b250897f8 - conferenceRecordingDir seems not to work...hardcore it for now since it probably won't change anyways 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1405 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-06 19:37:00 +00:00
Richard Alam
e80dfc7214 - set conferenceRecordingDir into AsteriskAgiService bean 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1399 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-06 19:15: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
dc05281d35 - Adding noPdfMarkWorkaround into PresentationService as a workaround for this problem 
http://groups.google.com/group/comp.lang.postscript/browse_thread/thread/c2e264ca76534ce0?pli=1

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1355 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-01 20:27:03 +00:00
Richard Alam
575262dd44 - change name of swftools, imagemagick and ghostscript in properties file to make it clear to the user to enter the directory or executable 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1351 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-05-01 16:01:04 +00:00
Richard Alam
5a7ca059b3 - put bigbluebutton web server url into properties file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1339 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-29 21:09:37 +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
8d894ccb24 - put back fix for uploaded files with space on filenames 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1282 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-04-18 00:44:12 +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