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

783 Commits

Author SHA1 Message Date
Richard Alam
c331f9aaaf log received message from redis pubsub 2012-03-08 16:46:37 +00:00
Richard Alam
dafc3deb96 - create blank thumbnails for pages that failed to generate one 2012-03-07 17:28:18 +00:00
Richard Alam
6e73b5ee16 - improve logging for doc conversion 2012-03-07 16:24:44 +00:00
Richard Alam
197e07e289 - remove logging as it's too much 2012-03-07 16:23:06 +00:00
Markos Calderon
64b27f2ebe fix end meeting 2012-03-05 15:26:13 -08:00
Markos Calderon
cd584ba6ef fix for end meeting 2012-02-23 16:18:40 -08:00
Markos Calderon
59071bcb52 fix for end meeting request 2012-02-16 12:51:57 -08:00
Leonardo Crauss Daronco
f6f744cf5e Removed the tag <isListener> from getMeetingInfo and added a tag <listenerCount>. 
This is a simpler solution that doesn't require matching a voice conference user with a "normal" user.
 2012-02-16 13:48:26 -02:00
Leonardo Crauss Daronco
1d848b1aaa Added "isListener" to the response of "getMeetingInfo". Had to change bbb-apps, bbb-web and bbb-client to generate and detect events when the user starts/stops its audio. The method used in bbb-client to send the externalUserId can still be improved. 2012-02-16 14:14:23 +00:00
Leonardo Crauss Daronco
8da1535c28 Adding internalMeetingID, isPresenter, hasVideoStream, and videoStreamName to the response of getMeetingInfo. 2012-02-09 12:33:03 -02:00
Richard Alam
a73287ea29 - store logout url into a session to make sure we get a logour url for a user 2012-02-01 23:04:12 +00:00
Richard Alam
742fd24b2d - redirect to landing page when user refresh the browser and there is no session 2012-02-01 22:11:36 +00:00
Richard Alam
bc54a34736 - test if storing user info in hashmap will cleanup on tomcat6 restarts...on tomcat6 restarts, sessions 
aren't destroyed which allows users to join the meeting by just refreshing the browser which screws up
   bbb-apps state
 2012-02-01 20:51:43 +00:00
Richard Alam
456042f74c - add logging when trying to join session...investigating why we are allowed to refresh 
browser and join conference after restart of BBB
 2012-02-01 19:05:52 +00:00
Markos Calderon
d2c317c900 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-27 12:22:16 -08:00
Markos Calderon
01a90feab5 improvement for generate thumbnails 2012-01-27 12:21:48 -08:00
Markos Calderon
17097c26f7 Merge pull request #23 from gugat/issue1112 
In Api upload, strip any extension from the presentation directory
 2012-01-26 10:37:12 -08:00
Fred Dixon
f997391899 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-19 21:22:55 -05:00
Fred Dixon
6bcb73e014 Set 
removeMeetingWhenEnded=true

as default in bigbluebutton.properties.  This will reduce errors with 3rd party integrations when users end a meeting, change a parameter, then try
start the meeting again.
 2012-01-19 21:21:19 -05:00
Richard Alam
ecc979e274 - generate internal userid to be able to match users across subsytems 2012-01-18 15:46:29 +00:00
Fred Dixon
20d4587e3e Changed API welcome messages from 'use a headset to avoide echo' to 'you can mute yourself in the listeners window' (BigBlueButton 0.8 now uses Flash for acoustic echo cancellation) 2012-01-15 12:32:39 -05:00
Fred Dixon
bf254501f5 Changed bbb-web to using a rolling 20 days of logs 2012-01-15 12:31:14 -05:00
Fred Dixon
b66059168d increased the size of bbb-web.log to 25M and keep six rolling files (instead of three) 2012-01-15 12:05:21 -05:00
Markos Calderon
f82633fc75 adding logs to pubsub updates 2012-01-11 13:31:45 -08:00
Markos Calderon
e4ed4b868a fix end time when someone rejoins to a meeting 2012-01-11 13:17:09 -08:00
gugat
eba253fa04 In Api upload strip any extension from the presentation directory 2012-01-11 14:34:16 -05:00
Richard Alam
9c8aeae213 - if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation 2012-01-10 16:25:46 +00:00
Richard Alam
180d1acc58 - Make defaultLogoutUrl not blank so that bbb-conf --check does not complain 2012-01-09 23:23:44 +00:00
Markos Calderon
ea5331d0c9 now, bbb-web uses the internalUserId 2012-01-09 14:44:14 -08:00
Markos Calderon
2ad5c4365b fix to handle exceptions the updates of the API 2012-01-09 10:20:57 -08:00
gugat
1beac318f9 Meeting stays created infinitely when defaultMeetingCreateJoinDuration=0 
Solves issue 1097
 2011-12-18 11:46:09 -05:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Markos Calderon
c2b0f1588f fix urlencode in pre upload 2011-11-11 09:23:30 -08:00
Richard Alam
c5043a9f1d - fix the name properly as there are 60000 millis in a minute 2011-10-24 22:07:18 +00:00
Richard Alam
b52f5ae158 make it return the same response as 0.71a (fix isse 1027 http://code.google.com/p/bigbluebutton/issues/detail?id=1027) 2011-10-02 23:24:00 -04:00
Marco Calderon
d91607b1d8 changes to the length 2011-09-28 12:37:26 -05:00
Marco Calderon
6b7cdd3528 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-26 11:38:01 -05:00
Marco Calderon
a5a2fd67e0 a try-catch for compability with the old recordings 2011-09-26 11:36:46 -05:00
Richard Alam
f60023e7c9 Make meeting name optional to not break Moodle 1.9 integration 2011-09-23 19:15:59 -04:00
Marco Calderon
3425db56e7 added voicebridge to getMeetingInfo 2011-09-23 11:04:14 -05:00
Marco Calderon
261707478b fixed recording time 2011-09-22 12:50:35 -05:00
Richard Alam
1164bb3e8f - setup logout url when user enters instead of when user leaves because when the user clicks on the OK button 
on the logout window after one minute, the meeting is gone from bbb-web memory.
 2011-09-13 14:34:36 -04:00
Fred Dixon
9e93cc7b86 Removed depreciated message (we can look at this post 0.8) 2011-09-08 17:25:19 -07:00
Marco Calderon
c36951dca6 updated messaging module in bbb-apps 2011-09-08 12:11:34 -05:00
Marco Calderon
6a47157b22 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-06 12:47:35 -05:00
Marco Calderon
b80e4ea5a1 Added CDATA to getRecordings 2011-09-06 12:46:54 -05:00
Richard Alam
ed44841a4c - handle only pre-upload on first create API call 2011-09-06 11:48:38 -04:00
Fred Dixon
f4bc50a179 Modified default welcome message to give a bit more help to first time users. 2011-09-04 15:48:51 -07:00
Fred Dixon
b5f0464c46 Removed old API demos from bigbluebutton-web ... they are now moved to bbb-api-demo 2011-09-04 08:00:08 -07:00
Richard Alam
b9de9180eb - remove interface dec to fix bbb-web build breakage 2011-09-02 09:56:45 -04:00
Marco Calderon
ff575071d9 fix metadata values 2011-09-01 19:46:29 -05:00
Marco Calderon
6e41cae223 some fixes in the api 2011-08-31 17:22:10 +00:00
Marco Calderon
2db74d4d06 small fix for invalid password 2011-08-24 19:39:57 +00:00
Marco Calderon
deae7b0d15 fix for errors in api 2011-08-24 16:27:37 +00:00
Marco Calderon
dbd04839ec added backward compatibility for errors 2011-08-23 19:19:25 +00:00
Marco Calderon
5e457b71d1 initial backward compability for 0.71a 2011-08-23 02:46:37 +00:00
Richard Alam
160b037570 - the meeting has not actually ended when a user is in the meeting. Our logic removes the meeting when 
everyone leaves and a user rejoins the meeting within 1 minute.
 2011-08-22 15:12:34 -04:00
Richard Alam
ea76262a7c - add more logging to figure out why we are ending the meeting pre-maturely 2011-08-22 13:36:10 -04:00
Marco Calderon
4d734506f4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-17 15:41:43 +00:00
Richard Alam
7089da4f16 - Add more logs to figure out why we are cleaning meeting pre-maturely 
- Don't process recording for meeting that we are cleaning because no one joined it.
 2011-08-19 11:27:00 -04:00
Richard Alam
d591cbc07f - remove meeting if nobody joined after a certain number of minutes when the meeting was created 2011-08-19 10:41:53 -04:00
Richard Alam
28a8db58a3 - remove FLAT_REPO as we don't need it anymore. 2011-08-17 20:17:57 +00:00
Marco Calderon
e190d80e50 fixed name in meetings 2011-08-17 15:26:06 +00:00
Marco Calderon
f052b776d7 a temp solution for show the recording name 2011-08-10 14:33:04 +00:00
Marco Calderon
18fba79c4c Added metadata to getMeetingInfo 2011-08-04 23:14:08 +00:00
Richard Alam
daeb7fafc2 - bump api version to 0.8 2011-08-04 10:35:49 -04:00
Richard Alam
8ffc8c9bdc - hook-up expired meeting background proc 2011-07-23 16:53:34 -04:00
Richard Alam
3c76ace954 - have the background cleaner run eveyr minute 2011-07-23 16:47:06 -04:00
Richard Alam
0525511764 - add logging for meeting cleaner background proc 2011-07-23 16:36:27 -04:00
Richard Alam
8e983345b8 - add property to set timeout for allowing time between creating a meeting and joining a meeting 
- change default meeting expiration to 1 minute
 - trigger ingest and processing when the meeting is removed form memory instead of when the last
   user leaves the meeting
 2011-07-23 11:13:29 -04:00
Marco Calderon
d32110d36c api according to the latest spec 2011-06-30 02:33:12 +00:00
Richard Alam
2c65cc9ac2 - fix possible NPE when getting internal id of non-existing meeting 2011-07-20 15:26:19 -04:00
Richard Alam
b9e5b69a20 - add messageId to redis pub/sub messages to be able to filter and identify easily 2011-07-20 11:44:11 -04:00
Richard Alam
4d2e503214 - add param to remove the meeting right away from memory instead of letting 
it linger for about an hour (the value of the expire meeting).
 2011-07-19 16:03:36 -04:00
Richard Alam
46ea659796 - change default meeting duration to 0 (zero) which means no duration. This maintains 
compatibility with previous release allwoing the demo meeting to run infinitely (for
   example). 3rd-party apps must pass duration if they want to set it, especially if the
   meeting is being recorded.
 2011-07-19 15:27:18 -04:00
Richard Alam
c5f8aa9344 - rename simple playback to slides playback 2011-07-19 14:33:17 -04:00
Richard Alam
1796fbc777 - if there are any users in the meeting, then meeting is running 
- set the meeting to forciblyEnded if the end api has been called
 2011-07-19 13:49:11 -04:00
Marco Calderon
dd57d38fc4 fixed preupload 2011-06-24 21:04:10 +00:00
Marco Calderon
b9ee42b30d finish demo recording 2011-06-24 16:28:32 +00:00
Marco Calderon
e5e061ea99 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api 2011-06-23 07:55:19 +00:00
Richard Alam
d44fd0cbdd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-10 16:13:02 -04:00
Richard Alam
8a013304b6 - fix problem where %%CONFNAME%% doesn't get substituted 2011-07-10 16:11:14 -04:00
Fred Dixon
6f6cc70c6b Change set redisHost to 127.0.0.1 to match other config files 2011-07-10 10:23:01 -07:00
Richard Alam
9c3389e68f - fix problem for getting viewer password 2011-07-08 17:04:51 -04:00
Richard Alam
15990d2f55 - start hooking the api for recording 2011-06-27 12:52:17 -04:00
Richard Alam
7f4d38b5a6 - process metdata properly and simple playback 2011-06-26 10:56:03 -04:00
Richard Alam
dbfd92bff2 - fix join and create api 2011-06-24 11:09:12 -04:00
Richard Alam
9b3d901e34 - move things around 2011-06-24 10:57:56 -04:00
Richard Alam
c9ad8f15d7 - temporary commit 2011-06-23 17:02:37 -04:00
Richard Alam
f8abc966e9 - fix logout 2011-06-23 14:18:20 -04:00
Richard Alam
8c8e009baa - unit test passing again 2011-06-23 14:04:00 -04:00
Marco Calderon
af70819578 finish demo recordings 2011-06-23 07:54:23 +00:00
Richard Alam
e9bd55a563 - fix compile problem...get recordings isn't wired yet 2011-06-22 16:40:23 -04:00
Richard Alam
15b29db03f - add playback format into metadata.xml 
- implement get recordings for a meeting id
 2011-06-22 16:35:11 -04:00
Richard Alam
d044221d70 - start implementing get recording api 2011-06-22 15:53:27 -04:00
Marco Calderon
f02f1efffe need to add actions publish, unpublish, delete to the demo10 2011-06-22 06:32:08 +00:00
Richard Alam
0b6e59e8ab - add duration parameter on creat API. This allows us to set a limit on the meeting length 
to prevent continuously recording a meeting whe someone forgets to logout
 2011-06-21 14:16:37 -04:00
Richard Alam
140c187fd0 - clean-up 2011-06-20 16:36:41 -04:00
Richard Alam
3b67e6b5ef - group errors and send them all at once to the caller of the api 
- make errors consistent
 - return back createTime on a create API call
 - require createTime parameter on a join API call. This way users with stale join link won't be
   able to join a running meeting.
 2011-06-20 16:18:57 -04:00
Marco Calderon
fd8296c183 finish API 0.8... need to update response messages 2011-06-16 18:37:14 +00:00
Marco Calderon
42f4acd250 added setpublish, pending response xml 2011-06-16 14:43:31 +00:00
Marco Calderon
fc55bb8aee added to check multiple recordings in the call getRecordings 2011-03-08 21:06:04 +00:00
Marco Calderon
625d54e86c getRecordings call... Need to show metadata values 2011-03-08 09:44:31 +00:00
Marco Calderon
81627bc616 initial cleanup 2011-03-07 20:18:33 +00:00
Marco Calderon
356c77b41f removed redisport and redishost properties 2011-03-07 06:15:02 +00:00
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
8ba1e6484a Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bbb-video/.gitignore
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-16 14:49:57 -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
09e7475cd7 - point recorded status dir to the correct one 2011-06-03 11:19:53 -04:00
Richard Alam
1bb6e20291 - renamed ingenst-and-processing script 
- log when saving metadata
 2011-06-03 11:15:24 -04:00
Richard Alam
c3b0e376c5 Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-02 16:40:36 -04:00
Markos Calderon
105f13cc9a Edited bigbluebutton-web/web-app/demo/demo6.jsp via GitHub 2011-06-02 08:47:29 -07:00
Markos Calderon
196a9ccc2c fix demo6 2011-06-02 08:39:57 -07:00
Richard Alam
53ecbf53ba - cleanup 
- just store meeting info into metadata redis key
 2011-06-02 11:31:52 -04:00
Richard Alam
134be90359 - handle incoming messages from bbb-apps 2011-06-01 17:58:55 -04:00
Richard Alam
50dac08e11 - cleanup sign out api 2011-06-01 14:16:35 -04:00
Richard Alam
c6626c7a9a - write test for get meetings api 2011-06-01 12:42:50 -04:00
Richard Alam
ed1bf9d4f6 - implement test for get meeting info 2011-06-01 12:10:33 -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
Marco Calderon
1b8011fdce Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-01 05:31:12 +00:00
Richard Alam
de9f45bee9 - add meeting metadata 2011-06-01 18:07:57 -04:00
Marco Calderon
65c020fac0 demo recording page 2011-06-01 05:30:17 +00:00
Richard Alam
46a769cf2f - add test for end api 2011-06-01 02:47:01 +00:00
Richard Alam
c114289042 - add test for isMeetingRunning api 2011-05-31 17:51:07 -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
c40976dab5 - generate default voice conf numbers if none has been passed in the param. 2011-05-31 10:05:09 -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
01669ce4d7 - move api controller test to another package 2011-05-29 02:33:37 +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
ad9a4895b8 - cleanup jars 2011-05-28 17:57:09 +00:00
Richard Alam
0fbdd39a90 - add default metadata 2011-05-27 18:41:14 -04:00
Richard Alam
bc6c392da3 - formatting changes 2011-05-27 11:36:50 -04:00
Richard Alam
4748352a87 - remove bigbluebutton.properties override 2011-05-27 11:36:10 -04:00
Richard Alam
e4af92a9cc - start writing record api 2011-05-26 16:48:49 -04:00
Richard Alam
63636da8dc - add api controller unit tests 2011-05-26 14:25:31 -04:00
Richard Alam
54677ea07b - add README 2011-05-26 14:24:03 -04:00
Richard Alam
1e9a835615 - cleanup of bbb-web 2011-05-26 14:00:08 -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
Richard Alam
e56ce0bd36 - have bbb-web write the recroding <meeting-id>.done file 2011-05-05 18:38:22 -04:00
Richard Alam
61ea9015e5 - set redis host and port in properties file 2011-05-04 11:14:35 -04:00
Richard Alam
e7bbf63484 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2011-05-03 14:50:37 -04:00
Marco Calderon
48029bf469 update thin instructions and layout 2011-04-28 20:28:33 +00:00
BigBlueButton
4db0ee6cf3 Fixed disconnect bug. 2011-04-12 20:08:31 +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
Richard Alam
65d6e61890 - call the ruby scripts from bbb-web 2011-04-15 18:19:51 -04:00
Richard Alam
19694d87e0 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2011-04-04 11:15:09 -04:00
Richard Alam
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -04:00
Jeremy Thomerson
47126f4622 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into preupload_docs_beta 2011-03-22 18:15:20 -04: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
fe44e0bf53 - setup jedis so we can put conference metadata into events.xml 2011-02-15 11:43:53 -05:00
Richard Alam
d1e2af2f38 - add eclipse plugin 2011-02-15 11:43:17 -05:00
Richard Alam
7fa4f4bbe8 - rename copyToLib to resolveDeps to be consistent with bbb-apps 2011-02-15 11:00:56 -05:00
Richard Alam
dda58fe6bb - put rec and playback required params in properties file 2011-02-15 10:41:15 -05:00
Richard Alam
a8d9a48fb2 - trigger archive, ingest, publish of recording when the last user leaves the meeting 2011-02-14 14:18:21 -05:00
Richard Alam
8d895d7417 - add temp way to trigger ingest and processing 2011-02-11 15:31:34 -05:00
Jeremy Thomerson
7a236a6809 downloading and processing of files works for urls and encoded files 2011-01-25 17:28:57 -06:00
Ubuntu
f255ba5e2b Changed bigbluebutton-web/build.gradle to reference Env. Var. for local repo 2011-01-31 18:51:01 +00:00
Ubuntu
c470d2cbaa Changed bigbluebutton-apps/build.gradle to reference an Env. Var. for local dir 2011-01-31 18:43:52 +00:00
Jeremy Thomerson
c8b24e849c more work on doc pre upload - xml parsing 
now we are parsing xml that is passed in following example format:
<?xml version="1.0" encoding="UTF-8"?>
<modules>
        <module name="foo">
        </module>
        <module name="presentation">
                <document url="http://www.samplepdf.com/sample.pdf" />
        </module>
</modules>
 2011-01-14 19:16:09 -06:00
Jeremy Thomerson
ef6bd3a5f1 first test of preuploading documents in api create command 
this commit is for testing only
it simply gets apicontroller working with presentationservice
it uses a test file on the server - rather than accepting files in
the http request (which is the next step)
 2011-01-14 18:07:18 -06:00
Jeremy Thomerson
79e71b9258 improve scripts to allow easy dev/run cycle 2011-01-13 21:13:29 +00:00
Marco Calderon
ea10e4bb7c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 
Conflicts:
	.gitignore
	bigbluebutton-web/application.properties
 2011-01-03 19:15:11 +00: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
Richard Alam
b42b43079b Merge branch 'master' into record-and-playback-feature 2011-01-18 17:36:47 -05:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
Marco Calderon
e9c120dc9f voice recording for freeswitch 2011-01-12 18:10:50 +00:00
Marco Calderon
f37093d533 update demo filesfor support recording 2011-01-10 12:08:54 +00:00
Marco Calderon
11167ae29f added chrome plugin patch for test recording 2010-11-19 05:04:16 +00:00
Marco Calderon
49d7ea37f4 fix bug recording 2010-11-17 06:34:18 +00:00
Marco Calderon
d18276e64f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-11-11 03:01:42 +00:00
Marco Calderon
2d102450b9 added send parameter record from bbb-web to bbb-apps 2010-11-10 22:40:52 +00:00
Richard Alam
18b46ba729 - change conf num to start with 7 as that's what we have in the dialplan 2010-11-09 08:24:09 -05:00
Richard Alam
d01662da3e - handle findConference AGI call to check if a conference with a particular number is running 2010-11-02 09:39:56 -04:00
Marco Calderon
70d8e805b1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-30 19:54:08 +00: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
Richard Alam
920b21323e - set session timeout to 3 hours 2010-10-06 10:20:15 -04:00
Richard Alam
0c8977dfde Merge branch 'master' into merging-fs-support 
Conflicts:
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
 2010-07-20 16:28:59 -04:00
BigBlueButton
333dd13d6b - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
BigBlueButton
ea156fe61e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-07-19 19:45:52 +00:00
BigBlueButton
cad05a9ce1 - bbb-scheduling has been removed from bbb-web 2010-07-19 19:27:24 +00:00
BigBlueButton
1e6eff084b - Removed bbb-web scheduler 
- Merged the enter and signout function into the api controller
 2010-07-19 19:15:01 +00:00
Richard Alam
af873d63e8 - ignore bbb_conf_api.jsp as it's dynamically generated 2010-07-19 11:32:29 -04:00
Richard Alam
790e42dc86 Merge branch 'ljackson-master' into merging-fs-support 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/managers/ModuleManager.as
 2010-07-16 15:23:22 -04:00
Richard Alam
0e3286667b - change the api version to 0.7 2010-07-14 16:36:08 -04:00
Leif Jackson
8528b2d287 Merge commit 'bbb/master' 2010-07-14 02:53:29 +00:00
Richard Alam
ec256e7cb7 - upgrading versions from 0.64 to 0.7 2010-07-13 09:42:13 -04:00
Richard Alam
8968fb3593 - ignore bbb_conf_api.jsp 2010-07-12 16:21:06 -04:00
Richard Alam
ac92ed3756 - remove linefeeds 2010-07-12 16:05:31 -04:00
Richard Alam
0fb463a7c2 - put in a working demo1.jsp 2010-07-12 15:48:18 -04:00
Sebastian
5a27c0ebc3 Fixed a bug 2010-07-12 14:01:46 -04:00
Sebastian
a2124651e8 Fixed linefeeds in demo1.jsp 2010-07-12 12:23:14 -04:00
Leif Jackson
f236dc5c1c Merge commit 'bbb/master' sync with bbb 2010-07-11 04:28:39 +00:00
Sebastian
da9f036339 Removed a space character in demo_footer.jsp 2010-07-02 14:15:30 -04:00
Sebastian
f1d41fd991 Fixed a bug in demo_footer.jsp 2010-07-02 10:19:57 -04:00
Sebastian
b9a514199e fixed a patch in bigbluebutton.properties 2010-07-02 10:00:12 -04:00
Sebastian
3c8333f8c1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2010-06-30 15:21:22 -04:00
Sebastian
a35ac1d846 Updated bigbluebutton.properties 2010-06-30 15:20:02 -04:00
Richard Alam
1b2e7b1dc5 - merge in sebs changes 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2010-06-29 13:37:17 -04:00
Richard Alam
7042903b4b - remove loggedOutUrl value to easily easily maintain post-install script 2010-06-29 13:31:30 -04:00
Sebastian
552eb9edea removed the comment from bigbluebutton.properties and removed the link to redirect the server to www.bigbluebutton.org 2010-06-29 13:27:48 -04:00
Sebastian
adcff2c058 Updated the url in demo_footer.jsp 2010-06-29 13:24:53 -04:00
Leif Jackson
e67070cac5 Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel 2010-06-29 05:07:00 +00:00
Leif Jackson
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +00:00
Richard Alam
f62eb0ae68 - removing bootstrapping of old web interface 2010-06-22 15:46:57 -04:00
Richard Alam
18ff5a0930 - moving the webVoiceConf param into join API 2010-06-22 14:41:28 -04: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
BigBlueButton
07f6264e5c fixes #393 by returning the supplied user ID in the getMeetingInfo call 2010-05-31 17:13:36 +00:00
BigBlueButton
e4fd72681a - adding .gitignore 2010-05-30 03:55:46 +00:00
Richard Alam
400f90b9f2 - pass in correct password 2010-05-27 15:09:38 -04:00
Richard Alam
56ee75fcc2 - urlEncode meetingID to calculate checksum properly 2010-05-27 14:56:56 -04:00
Richard Alam
b88482dfd2 - fix test to use new bbb-api that includes command into checksum 2010-05-27 10:56:36 -04:00
Omar Shammas
019a05578b Enabled the Activity Monitor (Demo 4) to end a meeting - This feature is off, to turn on uncomment line 115 in demo4.js 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4349 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-21 18:19:03 +00:00
Omar Shammas
8678bcf116 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4332 af16638f-c34d-0410-8cfa-b39d5352b314 2010-05-17 14:00:29 +00:00
Richard Alam
ef93c3ec1c - add meetingID and externUserID to session 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4325 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 19:25:10 +00:00
Jeremy Thomerson
34c802ef27 update issue 528 
add a version number to response if you call /bigbluebutton/api with no parameters.
this does not require a checksum since the checksum generation differs between certain versions

we still need to change the build process to update the version in bigbluebutton.properties for each built version
i'll leave this part to Fred.  I'd suggest using the following versioning process:
0.7-SNAPSHOT - for builds between releases
0.7-final - for release build versions

Owner: ffdixon
Status: Started



git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4322 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 17:40:17 +00:00
Omar Shammas
4d0fb66801 Fixed demo API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4321 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 15:52:56 +00:00
Jeremy Thomerson
f3fa0f5da2 addition to issue #394 - now adds a response parameter that indicates whether the meeting has been forcibly ended 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4311 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 19:30:01 +00: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
b3be60e2df addition to issue #473 - make meetingID required parameter to create call 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4308 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 19:00:00 +00:00
Jeremy Thomerson
08242fb324 fixes issue #473 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4305 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 18:44:22 +00:00
Jeremy Thomerson
24b7dcad60 fixes issue #487 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4304 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-12 18:19:47 +00:00
Jeremy Thomerson
814df400bb fixes issue #510 
assign a random password if none is supplied.  this is what the API spec has always said would happen, but for some reason, it wasn't happening

now it does.  note that if you have any kind of requirements that your passwords must be numeric, a certain length, etc, you really need to pass them in yourself


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4276 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-08 02:14:47 +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
c737c7e7f8 add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4272 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 21:53:52 +00:00
Xie Yan Qing
0b740cf948 Set character encoding to UTF-8 in demo pages to support Asian characters. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4238 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-04 01:14:40 +00:00
Islam El-Ashi
ec64ebe0d1 Changed header titles for demo API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4100 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-04-02 20:15:15 +00:00
Richard Alam
5a3041c2ef - refer install instructions to wiki 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4090 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-04-02 14:56:39 +00:00
Richard Alam
fb167bc7b2 - change repo dir to /home/firstuser/dev/repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4077 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-31 14:38:59 +00:00
Richard Alam
34518c19cc - adding deprecation notice to bbb-web scheduler 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4056 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-29 19:32:01 +00:00
Islam El-Ashi
7109cdd29d Added 'create your own meeting' to the list of demos 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4041 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-29 14:47:34 +00:00
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
Islam El-Ashi
a90712b2d2 Renamed demo1 from 'Join a meeting' to 'Join a course' + added header to demo4 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4023 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-25 21:21:03 +00:00
Islam El-Ashi
12334c12e9 Added demo4_helper 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4007 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 22:17:55 +00:00
Islam El-Ashi
07ba64c540 Removed demo 4 security restriction + added demo4 javascript 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4006 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 22:05:33 +00:00
Islam El-Ashi
98ea9f40a3 moved demo4 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4005 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 21:57:27 +00:00
Islam El-Ashi
5cb078e8ab Added demo 4: activity monitor 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4004 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-24 21:44:56 +00:00
Chris Liu
39088f8c00 Changed some UTF-16 to UTF-8 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3972 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-23 17:19:55 +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
Chris Liu
a84993f485 Changed all UTF-16 back to UTF-8 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3969 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-23 14:17:11 +00:00
Chris Liu
f0d49c6478 git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3967 af16638f-c34d-0410-8cfa-b39d5352b314 2010-03-22 20:42:47 +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
Chris Liu
6e6d73e6af Added UTF-16 support. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3965 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-22 20:22:25 +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
895ff7d53b spring integration using full-on objects now 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3793 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 21:51:43 +00:00
Islam El-Ashi
522a0dd113 Changed include in test_bbb_api 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3792 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 20:59:13 +00:00
Islam El-Ashi
a7175ecdef Decouple presentation module from + included bbb_api_conf in bbb_test_api 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3790 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 20:43:11 +00:00
Jeremy Thomerson
dbbace5f0a adding common messaging jar to classpath 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3785 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:30:43 +00:00
Richard Alam
4807c2f7f5 - modify local repo to /opt/bigbluebutton/repo so it's more generic and match with Hudson 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3782 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:16:28 +00:00
Richard Alam
300eafa9d5 - add build.gradle to setup local repo as well as drag in bbb-common-message lib 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3779 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 16:32:52 +00:00
Fred Dixon
70638b6ac9 Fixed syntax error in demo3.jsp 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3723 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-15 02:11:47 +00:00
Fred Dixon
7acb8859f1 Added banner image to demo API exampes. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3722 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-15 00:43:13 +00:00
Fred Dixon
f33123c8a7 Added logoutURL to demo3.jsp so it should return to the demo page, not the server's home page 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3721 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-15 00:16:55 +00:00
Fred Dixon
152ce11b39 Updated the API demos to show how to create a meeting that requires a password 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3720 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-14 23:57:13 +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
a4c0d6527d revert back..accidentally put scala nature 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3685 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 20:01:31 +00:00
Richard Alam
7d4a7476b7 update classpath 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3684 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 19:58:28 +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
8beb3ac42c - test hook. Point your browser to http://<ip>/bigbluebutton/test/test_bbb.jsp 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3680 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 17:32:36 +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
1ac73ea743 - ugggh typo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3601 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-03 19:02:03 +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
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
Fred Dixon
50f0f91e5e checking that upgrades work 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3161 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-30 20:34:00 +00:00
Fred Dixon
93e2578f2c updates to api demos 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3160 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-30 20:11:08 +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
Fred Dixon
0ab10f6112 removed login.jsp from demos 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3158 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-30 18:53:47 +00:00
Fred Dixon
782444b325 More work in the API examples 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3156 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-30 18:36:20 +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
363e24cb31 changes to demo3.jsp and login.jsp to get the URLs correct 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3148 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-24 03:38:34 +00:00
Fred Dixon
4ee66efe4b minor update to trigger build 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3147 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-24 03:27:27 +00:00