Commit Graph

193 Commits

Author SHA1 Message Date
Richard Alam
3393f2b98a - setup a way to trigger a conversion process on the server. This way we'll be able to test and monitor
if the conversion process works


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3600 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-03 18:58:51 +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
Fred Dixon
79fe33c11c Modified demo3.jsp so invites join as Viewer. This means only the person who created the meeting will be moderator.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3484 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 22:57:56 +00:00
Fred Dixon
2831cd3a5f Removed the 0.63-beta text from bbb_banner.jpg in bbb-web
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3483 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 22:19:42 +00:00
Fred Dixon
46f2c36442 Updating favicon.ico in web interface
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3473 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 18:57:52 +00:00
Fred Dixon
900bca4ff9 Minor tweek on welcome message.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3464 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 02:18:26 +00:00
Fred Dixon
6c060e5592 Updated API demos to show use of %%CONFNAME%% in welcome message.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3463 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 02:11:47 +00:00
Fred Dixon
6f81c10801 updating welcome messag in bigbluebutton.properties
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3462 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 00:54:41 +00:00
Fred Dixon
17d76eadb8 Minor edits to API demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3460 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 23:53:11 +00:00
Fred Dixon
e6398a1586 Once character update to trigger update of devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3458 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 22:28:44 +00:00
Fred Dixon
f04d4c3319 Properly urlencode meetingID in bbb_api.jsp
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3457 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 22:17:57 +00:00
Fred Dixon
1fe8bbfafd Ensure that meetingID is urlencoded in bbb_api.jsp
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3456 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 20:13:50 +00:00
Fred Dixon
5fc8093df4 Changed demo2.jsp to use the welcome message parameter
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3455 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 19:37:15 +00:00
Fred Dixon
ffd55fd5a1 Cleanup of the API Demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3453 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 19:19:14 +00:00
Fred Dixon
cbe0c2bde8 update to demo1.jsp to trigger a rebuild of packages
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3452 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 01:32:31 +00:00
Fred Dixon
f25115381b Adding error handling to demo[1,2,3].jsp pages
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3451 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 01:22:23 +00:00
Fred Dixon
04a4428a88 Needed to add back picking up a configuration file from file:${userHome}/.grails/-config.properties so that we could setup the development environment on the VM without overwritting the existing bigbluebutton.properties
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3450 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 01:19:57 +00:00
Fred Dixon
6382edf74e added back @import for bbb_api_conf.jsp to bbb_api.jsp
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3449 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 00:08:52 +00:00
Fred Dixon
24947df9be For developting bbb-web using the VM, changing run-war to run-app so the developer can get debug messages to the console
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3448 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 23:53:40 +00:00
Fred Dixon
585a659e9e extracted the salt and BigBlueButtonURL into a separate file bbb_api_conf.jsp so its not checked into SVN
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3437 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 21:28:45 +00:00
Richard Alam
2efe8ca25d - allow keyword substitution on welcome message. Now you can have something like
<br>Welcome to %%CONFNAME%%.<br><br>Dial: %%DIALNUM%% Conference: %%CONFNUM%% in your
welcome message.

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3435 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 20:59:43 +00:00
Richard Alam
451231e8df - remove space so easy to parse
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3434 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 19:44:06 +00:00
Richard Alam
0cf30e3dde - provide a way to enable/disable old scheduling mechanism
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3432 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 19:03:03 +00:00
Richard Alam
3ef4c41d0e - limit conference numbers from 70000-79999
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3419 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-21 21:43:49 +00:00
Fred Dixon
a3d41e5e8a Changed message in build.xml for bbb-web to 'grails run-app' to 'grails run-war'
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3389 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-20 23:59:49 +00:00
Chris Liu
3543a7737e Fixed build.xml for bbb-web
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3370 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-20 18:20:22 +00:00
Richard Alam
99c9822f9f - test to trigger build
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3364 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-19 22:10:45 +00:00
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
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
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
f7dd241bbb - pass conference name or meetingID when a user joins so we can display on the client.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3200 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-04 17:39:00 +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
Fred Dixon
9bae69959c Updated demo3.jsp -- worked around a bug in IE8 that was preventing the user from automatically joining the meeting
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3179 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-01 23:08:21 +00:00
Fred Dixon
1ccad22c5c More formatting updates to API demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3177 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 22:17:06 +00:00
Fred Dixon
9c233d5c40 formatting updates to api demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3175 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:55:44 +00:00
Fred Dixon
4dc7bc5824 formatting updates to api demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3174 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:48:15 +00:00
Fred Dixon
291ea27074 Modified demo3.jsp to currently work without asterisk being able to confirm the dynamically created room.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3169 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:07:22 +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
Fred Dixon
689624afdd Got demo3.jsp working with spaces in usernames
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3165 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 22:53:57 +00:00
Fred Dixon
e9fc475dc8 demo3.jsp now asks for name before attempting to join a meeting.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3164 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 21:29:08 +00:00
Fred Dixon
12b2e6ce8f updates to demo3 (create a meeting)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3163 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 21:09:59 +00:00