BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,908 Commits 13 Branches 260 Tags 1.1 GiB
11123423b1
Commit Graph

271 Commits

Author SHA1 Message Date
Marco Calderon
f703f6b476 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-11-06 10:16:02 +00:00
Marco Calderon
b428e9c3a4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-30 00:36:21 +00:00
Richard Alam
ca27def324 - presenter settings are rounded off which screws up presentation synching. Change Long to Double. 2010-10-28 10:38:39 -04:00
Marco Calderon
d186288749 added record conference call to BBB API 2010-10-24 08:59:23 +00:00
Marco Calderon
6b5b610a88 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-21 12:01:00 +00:00
Richard Alam
91ffaeb27e - hook into shutdown event so we can kick all users from the conference 2010-10-18 13:24:45 -04:00
Richard Alam
48d7e00892 - add methods to kick all users out of the conference 2010-10-18 13:24:12 -04:00
Fred Dixon
e2750b6419 - Added checks bin bbb-conf to see if bbb-voice-conference or bbb-freeswitch-config are installed 2010-10-16 20:51:49 -04:00
Marco Calderon
4fed45a444 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-14 17:03:04 +00:00
Richard Alam
cceacbfb6e - add an info log when a user join and leave a conference 2010-10-09 11:48:51 -04:00
Marco Calderon
828d1766d6 Support for record directly in files 2010-10-04 23:23:26 +00:00
Richard Alam
0b4f21026c - cleanup and adding bin to gitignore 2010-09-25 11:17:24 -04:00
deniszgonjanin
bdf857b56e Chat History fix for 0.71 2010-09-24 09:12:35 +00:00
Marco Calderon
82101daca5 update recording events 2010-09-22 03:50:32 +00:00
Fred Dixon
db89deba78 Added more checks to bbb-conf & set esl.host=127.0.0.1 in bigbluebutton.properites so we don't need to assign an IP address for red5 to connect to freeswitch 2010-09-20 01:47:17 +00:00
Marco Calderon
839e3e5226 update format message for storing from JSON to XML 2010-09-13 17:22:54 +00:00
deniszgonjanin
b8a1b45e0d Desktop Sharing region selection 2010-09-08 03:56:31 +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
Richard Alam
cf865ec52e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into support-both-ulaw-and-speex 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
 2010-08-04 10:07:45 -04:00
deniszgonjanin
6142ae978c Merged Neeraj's GSoC Chat Translation into Chat, along with a new User Interface for Chat 2010-08-04 19:47:54 +00: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
Richard Alam
916428f7f6 - modify to use resolveDeps 2010-07-21 13:11:20 -04:00
Richard Alam
f77f627707 - rename copyToLib task to resolveDeps (resolve dependencies) 
- add resolver for netty lib
 2010-07-21 13:07:12 -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
Leif Jackson
f236dc5c1c Merge commit 'bbb/master' sync with bbb 2010-07-11 04:28:39 +00: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
Richard Alam
2c98d5c5e4 - add README 2010-06-30 11:59:58 -04:00
Richard Alam
ca975a9778 - remove IDE specific files 2010-06-30 11:58:57 -04: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
b880bbca36 - add files and directories to .gitignore 
- fix problem where webcam icon stays disabled when webcam is closed
 2010-05-31 10:36:15 -04:00
BigBlueButton
e4fd72681a - adding .gitignore 2010-05-30 03:55:46 +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
Jeremy Thomerson
aeaa9dd19d fix classpath issue (another reason these eclipse files shouldn't be committed into svn) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4274 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-07 23:34:15 +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
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
6ba909804e - change repo dir to /home/firstuser/dev/repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4078 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-31 14:39:14 +00:00
Richard Alam
8741d474b5 - upgrade to red5-0.9.1 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4050 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-29 18:18:31 +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
Jeremy Thomerson
1aec508ef4 adding common messaging jar to classpath 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3784 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:30:32 +00:00
Richard Alam
a45d7104f1 - 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@3783 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:16:42 +00:00
Richard Alam
f2d24be6f3 - modify build.gradle to pull in bbb-common-message from local repo 
- setup scala (Not used for now)

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3780 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 16:34:16 +00:00
Richard Alam
ac3d302727 - upgrade to Red5 0.9 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3743 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-19 18:13:23 +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
8ae5e7ab59 merge in latest from SVN and fix classpaths 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3681 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 18:34:55 +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
Richard Alam
1091fc3efd - got conference apps implemented 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3064 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 22:35:50 +00:00
Richard Alam
7ac82267ad - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3062 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 16:16:22 +00:00
Richard Alam
51531c90e4 - checking in things..don't want to loose these as eclipse is acting like a spoiled brat this morning :) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3061 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-03 16:05:03 +00:00
Richard Alam
d7ddb37b27 - implement appkonference events and commands 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3058 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 22:34:37 +00:00
Richard Alam
e38ebecda6 - handle new memberId field from AMI events 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3057 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 18:24:47 +00:00
Richard Alam
1983b03fa8 - rename classes to match event names generated by appkonference 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3055 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-12-01 15:55:46 +00:00
Richard Alam
c0e27540e9 - put java classes into java src folder 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3053 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 22:17:43 +00:00
Richard Alam
5971e22115 - add appkonference events 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3052 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 22:11:15 +00:00
Richard Alam
e24adb55ec - convert build to gradle 
- haven't figured out the tests yet though

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3051 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 20:18:53 +00:00
Richard Alam
659c0055b6 - cleanup and move things around 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3050 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:42:13 +00:00
Richard Alam
ac19017e13 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3049 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:40:03 +00:00
Richard Alam
ff892e1635 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3048 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:38:43 +00:00
Richard Alam
822741a3c6 - start refactor bbb-apps 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3046 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-30 17:35:37 +00:00
DJP
829e5c9635 Error handling on file convertion failed - Additional filetype support 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2989 af16638f-c34d-0410-8cfa-b39d5352b314
 2009-11-11 00:41:24 +00:00