Commit Graph

63 Commits

Author SHA1 Message Date
Marco Calderon
839e3e5226 update format message for storing from JSON to XML 2010-09-13 17:22:54 +00:00
Richard Alam
dbbea7ae2a Merge branch 'master' into record-and-playback-feature
Conflicts:
	bigbluebutton-client/.actionScriptProperties
2010-08-27 11:05:19 -04:00
Marco Calderon
2f69b4e48b javadoc recorder module - logs updated to java code, playback-web update and playback-client update 2010-08-16 17:41:05 +00:00
Sebastian
4447ac6585 No more need to comment or uncomment "bbb-voice-freeswitch.xml" to use freeswitch or asterisk 2010-08-09 16:36:51 -04:00
Richard Alam
fc05379396 - cleanup the logging which has the old groovy ${var} string 2010-08-09 07:58:31 -04:00
Richard Alam
0ce51b5ba0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-08-09 04:22:41 -04:00
Richard Alam
342e2de46c - change thread sleep to 5 sec from 25 sec as it takes a long time for bbb-apps to startup 2010-08-09 03:35:35 -04:00
Marco Calderon
6c84e2c561 Changes: bbb-apps from groovy to java, add recording module and updated events-recorder and bbb-commons 2010-08-02 10:33:36 +00:00
Richard Alam
3f16b01126 - works great with echo app but not with conference. 2010-07-30 15:41:20 -04:00
Richard Alam
365da7d6c6 - add instructions on how to switch from Asterisk to FS 2010-07-23 14:12:02 -04:00
Richard Alam
c18e312df9 - forgot the import files 2010-07-23 14:07:38 -04:00
Richard Alam
027d85e48f - separate FS and asterisk configs for easy switching 2010-07-23 12:07:53 -04:00
Richard Alam
c847a4ab3b - connect to local freeswitch 2010-07-23 11:39:28 -04:00
Richard Alam
4b5e6196f1 - connect to local freeswitch by default 2010-07-21 16:21:41 -04:00
Leif Jackson
75dd3b6fd6 Created HeartbeatMonitor Event Observer. Will reconnect to Freeswitch if the switch is restared...etc. TODO: There should be some intergration between the bbb-voice object and the Monitor via the webconference framework To allow for kick all, then warn that FS is not available right now - Could also be extended to use the stats in the Heartbeat such as Idle-CPU, Session-Count, Core-UUID to impement cluster/lb of FS servers 2010-07-01 05:44:46 +00:00
Leif Jackson
c2e97c4b60 NPE exception in Action event handler 2010-06-29 06:58:40 +00:00
Leif Jackson
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +00:00
deniszgonjanin
13790e0bbb Fix for several 0.7 release bugs, as well as a new way for modules to receive updates about users joining and leaving 2010-06-24 07:42:16 +00:00
Richard Alam
33d63c1cb7 - add externUserID to participant
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4327 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-14 19:26:31 +00:00
Denis Zgonjanin
40c81337e3 Corrected small bug in whiteboard optimization algorithm
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4302 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 16:32:12 +00:00
Denis Zgonjanin
f00f568200 Optimization for whiteboard freehand shapes. Removed unnecessary data points. This improves bandwidth usage, and doesn't choke Flash Player as much when there are a lot of shapes drawn on the same page.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4301 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 16:27:12 +00:00
Denis Zgonjanin
c7ee585301 Fixed Issue 502 - server side
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4265 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-07 17:44:33 +00:00
Denis Zgonjanin
3c30a4075a Whiteboard red5 server side application
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4235 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-03 12:16:43 +00:00
Richard Alam
05eec810bf - remove presentation properly: When the current presentation is removed, clear the presentation window
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3922 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-17 20:37:44 +00:00
Richard Alam
0dc56303fd - fix so that latecomers would have access to the presentations uploaded before they joined. Currently, when a
presentation get uploaded, then a late participant joins and becomes presenter, he/she cannot switch or load a
previously uploaded presentation

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3918 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-16 20:30:20 +00:00
Jeremy Thomerson
55589f9ca0 end meeting API call now kicks everyone from the conference
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3867 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-09 23:33:25 +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
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
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
Jeremy Thomerson
827a65b647 move some common classes to bbb-common-message for spring integration changes
This commit simply moves a few of the classes to bbb-common-message and makes all of the related build changes to support this change.
No functionality was changed (at least intentionally).

Next step is to change the current Spring Integration messages (conference started / stopped) to send the whole conference in the message and confirm that this is working as intended.  Then it's easy to add other API calls


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3791 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 20:51:29 +00:00
Richard Alam
c165308edb - mute/unmute all except those participants marked as locked. If participant is locked, it will keep it's status as muted or unmuted while the others will be muted/unmuted as requested.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3692 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-10 13:48:40 +00:00
Richard Alam
14da2aa65b - don't create recoding file
- remove recording for now

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3623 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-04 15:14:17 +00:00
Richard Alam
95b1d5567e - add more comment so we don't have to update the wiki
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3443 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 21:53:24 +00:00
Richard Alam
d9661be9a3 - latecomers should be able to sync there slide with the presenter's
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3321 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-17 16:51:13 +00:00
Richard Alam
34fbff77d1 - handle new message from bbb-web and send to client
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3168 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 19:47:05 +00:00
DJP
6d14ff08db presentation file error handling : new message code depending on specific error
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3114 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:08:17 +00:00
DJP
e0ff381156 Added error handling on presentation module to be compatible with i18n string generation by Flash client
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3107 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 20:45:42 +00:00
Richard Alam
f970b70513 - rename classes
- modify so that to set which app to use, you need to only modify bigbluebutton.properties
by setting asterisk.application=konference or asterisk.application=meetme

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3102 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 17:38:28 +00:00
Richard Alam
1ab69215fe - cleanup
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3081 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-07 21:51:09 +00:00
Richard Alam
12eff569b9 - fix problem where when a second participant joins in, she sees the first participant as muted
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3080 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-07 21:47:10 +00:00
Richard Alam
8b92d6c9a7 - cleanup
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3079 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-07 20:16:59 +00:00
Richard Alam
b73c85b604 - add some instructions on how to configure voice conf app
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3075 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-07 19:00:14 +00:00
Richard Alam
81457e0231 - use spring integration on wiring some of the beans
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3073 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-06 04:38:22 +00:00
Richard Alam
4c324b9f41 - make appkonference as default conference app
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3072 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-06 00:37:50 +00:00
Richard Alam
3714ee2807 - add headers
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3071 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-05 23:04:35 +00:00
Richard Alam
11e8ba68fb - try setting up for spring integration
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3069 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-04 23:15:38 +00:00
Richard Alam
275bb52119 - cleanup
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3068 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-04 22:51:19 +00:00
Richard Alam
ab672bd438 - meetme now works except talker updates
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3067 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-04 22:48:33 +00:00
Richard Alam
0372092bec - meetme now works except talker updates
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3066 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-04 20:56:47 +00:00
Richard Alam
d137362acb - appkonference ami notifications now works...next meetme
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3065 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-04 04:01:29 +00:00