Commit Graph

664 Commits

Author SHA1 Message Date
Richard Alam
873a8c125b - fix so that we are checking logoutURL properly from properties file
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4033 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-26 20:06:54 +00:00
Richard Alam
9871f9acfa - rename loggedOutUrl to logoutURL to be consistent with the API
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4032 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-26 15:34:56 +00:00
Chris Liu
a417446d83 Reversed the UTF-16 changes Richard made.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3971 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-23 15:46:15 +00:00
Richard Alam
1613c9bd59 - encode xml response to UTF-16. Fixes issue 421
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3966 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-22 20:24:03 +00:00
Jeremy Thomerson
ceb0f375e3 add getMeetings call that lists all meetings on server
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3932 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-18 19:55:13 +00:00
Jeremy Thomerson
15894cf901 fix stupid typo that i kept forgetting to fix (for oh, like a year)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3876 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-10 20:59:04 +00:00
Jeremy Thomerson
26248d7f2f end meeting API call - issue #394
forgot to check this in yesterday


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3871 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-10 17:36:49 +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
Jeremy Thomerson
f01048df78 getMeetingInfo works when meeting hasn't started
references issue #393



git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3825 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-08 17:56:13 +00:00
Jeremy Thomerson
b7515facaa require moderator password for getMeetingInfo call
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3799 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-05 00:47:39 +00:00
Jeremy Thomerson
cef2d9fc2d complete getMeetingInfo API call
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3797 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-05 00:24:15 +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
Jeremy Thomerson
bdb9832e54 work on getMeetingInfo API call
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3795 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 22:41:46 +00:00
Jeremy Thomerson
491109b741 fixes issue 343
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3707 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-11 18:03:53 +00:00
Richard Alam
947b79dc8c - add a way to configure a test conference room thru the API
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3683 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 19:11:05 +00:00
Richard Alam
76e1baa682 - change logoutUrl to logoutURL to be consistent with other param names
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3679 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 16:23:38 +00:00
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
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
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
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
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
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
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
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
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
5de4b3ef3c Fixed IOError Popup on upload - break up the backend redirection after file upload to save bandwidth for client
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2993 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-11 01:52:09 +00:00
Richard Alam
fa360130da - redirect to default url when logged out url is not defined
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2870 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-06 22:07:11 +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
83c3927b0a fix cast which for some reason works under 10 but not over
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2682 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-15 04:10:52 +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
2741362a3e - change voiceBridge to voicebridge so it's compatible with PublicSessionController. THis way we dont' have to change config.xml in the client.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2647 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 19:43:53 +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
c29c09f5c3 add isMeetingRunning api call
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2614 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:58:31 +00:00
Jeremy Thomerson
596cac75f2 work on join meeting call
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2613 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:47:50 +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
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
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
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
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
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
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
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
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
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
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
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
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
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