Commit Graph

689 Commits

Author SHA1 Message Date
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
f3c8ee1055 - cleanup, convert println to log
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2601 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:28:56 +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
Jeremy Thomerson
c37f52013d update svn ignore to ignore build artifacts and fix .classpath for groovy 1.6.4
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2589 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 22:42:32 +00:00
Richard Alam
a589578751 - upgrade groovy to 1.6.4
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2577 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 14:37:52 +00:00
Richard Alam
e3f9a3dba0 - checkin jsecurity 0.4.1
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2576 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 14:23:57 +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
Fred Dixon
5fa71b60dc updates to bbb_banner.jpg
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2479 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 09:50:58 +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
3b78af5d4f - send thumbnails message twice...need to figure out why we are loosing messages
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2422 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-10 17:15:29 +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
Fred Dixon
5f8ccedb04 updates to bbb-web
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2209 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-12 16:33:07 +00:00
Richard Alam
c1f4214b3a - change banner
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2206 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-12 15:50:37 +00:00
Richard Alam
c79ae8b689 - remove number of attendees for now as it's not being used and just confuses users
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2164 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-11 15:14:14 +00:00
Richard Alam
56aeba1abf - convert print to log
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2107 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 17:53:19 +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
Richard Alam
05ad3510e9 - modify agi script so all it does is query for the conference...the logic is handled in the dialplan
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2105 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 15:52:36 +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
0687899829 - put in license file
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1606 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-12 15:28:59 +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
Tyler Copeland
c1f423e6a9 Updated banner image
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1600 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:10:36 +00:00
Richard Alam
93bc275683 - fix managing users
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1599 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:06:09 +00:00
Tyler Copeland
da03e4d201 test commit
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1598 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:02:04 +00:00
Richard Alam
da762f5164 - fix problem where the client gets loaded even when user enters the wrong password
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1585 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-10 14:49:24 +00:00
Richard Alam
3fc40d425e - display more info when joining a conference
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1568 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-05 14:46:34 +00:00
Richard Alam
789a61f38e - display default username and password
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1566 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 21:13:23 +00:00
Richard Alam
78b3ab1c3f - change favicon
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1565 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 20:07:59 +00:00
Richard Alam
4b11be9518 - login directly into the client when a user successfully enters a passsword
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1564 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 19:36:30 +00:00
Richard Alam
fca9a1fbcc - remove new schedule link as it should be only accessible from the conference page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1561 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 20:00:35 +00:00
Richard Alam
9997466eee - comment out record, time scheduling, and host password as we don't use it for now
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1559 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 19:42:48 +00:00
Fred Dixon
b692425b3b small updates to build.sh and streamlined join in preview of new session
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1542 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 01:48:29 +00:00
Fred Dixon
782cc2d321 testing commit of a touched file
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1537 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 00:24:55 +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
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
4aa64ce1b1 - fix NPE problem with scheduling
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1513 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-01 19:31:33 +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
Fred Dixon
af3461fac4 added build script for Ubuntu
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1508 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-01 01:57:33 +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
d48a25ec4a modify text of join screen
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1484 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:40:35 +00:00
Fred Dixon
9128e11737 modify the shortcut to join a session
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1483 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:37:51 +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
93a0215443 add shortcut to join session when scheduling it
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1481 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-28 23:32:18 +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
2bee4d2ddd - change logo
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1463 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-27 15:21:52 +00:00
Richard Alam
75f5fc575d - fix link when showing conference session
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1452 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-21 14:21:37 +00:00
Richard Alam
cfe414e8b3 - Add to to refresh browser
- Add "CLICK HERE TO JOIN"

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1425 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 20:20: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
71a7398ee7 - set version to 0.1
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1417 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 15:05:11 +00:00
Richard Alam
4db5c733ee - put a check in so that it won't check conflicts if there is none
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1416 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 14:45:45 +00:00
Richard Alam
eb786d9b89 - change audio recording directory
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1414 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 14:21:21 +00:00
Richard Alam
45e1bf2fcb - remove duration
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1411 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 02:58:52 +00:00
Richard Alam
b7fffff463 - preset conference number
- use conference number in joining
- check if there is a conflict when scheduling session

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1410 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 02:32:56 +00:00
Richard Alam
04260c65ab - add more logging when in agi
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1409 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 13:07:17 +00:00
Richard Alam
b7f3f65079 - log where we are recording the audio file
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1408 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 12:52:20 +00:00
Richard Alam
bb3e419e7e - hardcode /var/spool/asterisk/meetme (recordings dir) for now...can't seem to make it work...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1407 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 12:34:24 +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
89da6bf5ab - display bbb-web version
- must do "grails set-version xxx" before build

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1392 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-05 18:46:56 +00:00
Richard Alam
372882c568 - set role as MODERATOR when logging in as host as we don't support HOST for now
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1389 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-05 17:47:33 +00:00
Richard Alam
339a8908c6 - set the default end time an hour after start date time
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1371 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 21:08:18 +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
948e351d3a - setup recording only when the host asked the session to be recorded
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1369 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 15:20:59 +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
7ab8d3cdb4 - fix issue where process hangsup during waitFor() on getNumberOfPages...()
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1362 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-02 16:18:23 +00:00
Richard Alam
f109871e17 - add logging to see if command is executing
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1358 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 21:02:15 +00:00
Richard Alam
c0389d1c29 - fix typo in var name
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1357 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:55:56 +00:00
Richard Alam
e3f158d50e - need to wait for the pdf2swf to end before checking exitValue in getPageNumber()
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1356 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:55:10 +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
f64008a003 - add more logging to determine why conversion is failing in Ubuntu
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1354 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:10:44 +00:00
Richard Alam
34e533ecbd - replace invalid chars from presentation name and uploaded filename
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1353 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 17:56:59 +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
c8f37afd0d - modify to show conference session information before joining
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1346 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-30 19:12:28 +00:00
Richard Alam
0f35da8582 - add some debug logs and fix links on displaying session info
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1340 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-29 21:33:15 +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
minoustudio
5bd1196edf 20090414: multi-presentation
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1239 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-14 15:47:33 +00:00
minoustudio
338e094484 20090414: multi-presentation
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1238 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-14 15:47:16 +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