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

337 Commits

Author SHA1 Message Date
Richard Alam
a71b30af9c - cleanup, fix merge issues, connect to redis explicitly when subscribing to a channel 2011-06-16 10:46:59 -04:00
Marco Calderon
d022aafb61 Cleanup bigbluebutton-web and bigbluebutton-apps 2011-06-15 08:30:56 +00:00
Marco Calderon
f1a55ba26b bigbluebutton-apps handles the presentation messages using gson 
TODO: cleanup, logs, and some updates
 2011-06-15 01:42:56 +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
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
bc1d9ef562 - add back to groovy jar file back as it broke spring integration 2011-05-31 16:32:23 -04:00
Richard Alam
ad9a4895b8 - cleanup jars 2011-05-28 17:57:09 +00: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
Marco Calderon
6681c56575 initial changes in bbb-apps 2011-05-05 09:16:40 +00:00
Richard Alam
1930c76c73 - upgrade dependency to red5-1.0rc1 2011-05-03 17:45:42 -04:00
Richard Alam
2b34a0eae1 - upgrade FS ESL jar to 0.8.1 with changes for recording events 2011-05-03 17:35:19 -04:00
Marco Calderon
64fcc4ac94 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-03-28 07:22:01 +00:00
Richard Alam
553592b3f1 - change dependencies to be able to run on Red5 1.0 RC 
With this change, we will need to package our own Red5 1.0 RC
 2011-04-22 12:00:26 -04: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
c0e1a1ebcb - fix some compile problems 2011-04-04 11:28:44 -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
9785cde147 - remove unneeded class 2011-03-29 10:04:21 -04:00
Richard Alam
f39dbd4f11 - implement recording listeners for desktop sharing 2011-03-26 15:50:19 -04:00
Richard Alam
17422c3007 - can't really ignore a file that has been tracked by git. The way to ignore changes to a file is to 
git update-index --assume-unchanged src/main/webapp/WEB-INF/bigbluebutton.properties
   which temporarily untracks the file. And then when you want to track again, do
       git update-index --no-assume-unchanged src/main/webapp/WEB-INF/bigbluebutton.properties
 2011-03-23 13:59:51 -04:00
Richard Alam
303920e3c5 - create default bigbluebutton.properties and add to .gitignore. This way, developers 
can customize to match there dev environment and won't checkin their settings
 2011-03-23 12:51:23 -04:00
Richard Alam
92c0af9f49 - remove LIVE|RECORD mode as we are not using it 2011-03-22 10:23:32 -04:00
Richard Alam
2798f4db2b - can't get redis pool working...connect each time for now 2011-03-22 10:19:53 -04:00
Richard Alam
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -04:00
Richard Alam
bc293a33f5 - move the tests into proper directory so that gradle can find it 2011-03-18 15:33:16 -04:00
Richard Alam
efb8a84892 - make "gradle test" run the tests 2011-03-18 15:31:09 -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
Jeremy Thomerson
005f7b74c2 preupload of slides is working 
when a room is created, we scan the directory looking for preuploaded presentations and
share them so that they appear when users join
 2011-03-01 15:45:19 -06:00
Jeremy Thomerson
d2c54b90bd enhance vm-build-debug.sh to exit when there is a build failure 
rather than continuing to start red5 with a broken build
 2011-03-01 14:49:30 -06:00
Marco Calderon
3a19058d54 changes in bbb-apps redis pubsub 2011-02-22 21:45:20 +00:00
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
0f0e02de71 - connect to Jedis for each call for now until we figure out how not to get disconnected from Redis after 300sec 2011-02-14 14:17:05 -05: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
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
b4c2edd11d - cleanup and change recording filename to pass timestamp not date 2011-01-26 12:42:55 -05:00
Richard Alam
b493b74de5 - handle start-recording and stop-recording events from freesiwtch 
- record the start-recording and stop-recording events passing in recording timestamps and filename
 2011-01-26 12:21:02 -05:00
Richard Alam
8274e745c1 - fix problem where module and event names are null 2011-01-23 13:34:18 -05:00
Richard Alam
fcee6861bf - missed meetingId in the public chat event 2011-01-23 11:51:30 -05:00
Richard Alam
92c887bd1d - pull events into their own classes so it's easier to track and modify 2011-01-22 21:45:27 -05:00
Richard Alam
1689dca1c9 - can now record voice events 
- to do development: you need to install and run redis 2.04 from http://redis.io/download
 - edit /usr/share/red5/webapps/bigbluebutton/WEB-INF/bigbluebutton.properties to point to your redis host
 - we'll try redis to see how it performs. It's easy to support other mechanism (JMS) if we need to.
 2011-01-21 16:28:31 -05:00
Richard Alam
0e540d6d9a - Collapse recording by removing some intermediate classes (RecorderSession) 2011-01-21 13:09:49 -05:00
Richard Alam
b8c9a9b991 - do an RPUSH instead of an LPUSH 2011-01-20 15:15:49 -05:00
Richard Alam
da37e60618 - add timestampst to recordings 2011-01-20 14:33:08 -05:00
Richard Alam
6d1948f782 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-01-19 11:10:05 -05:00
Marco Calderon
49acc46a5f added storing redis for events properties 2011-01-19 05:53:23 +00:00
Richard Alam
b42b43079b Merge branch 'master' into record-and-playback-feature 2011-01-18 17:36:47 -05:00
Richard Alam
e15ceddb11 - upgrade to latest fs java esl 
- start recording of voice conference when the first person joins the voice conference
Conflicts:
	bigbluebutton-apps/build.gradle
 2011-01-18 11:15:12 -05:00
Richard Alam
12cf6e25cf - start recording of voice when the first person joins the voice conference 2011-01-18 11:04:38 -05:00
Richard Alam
81e98c9d90 - update to new version of fs esl 2011-01-18 11:03:49 -05:00
Marco Calderon
b31ec47a3d added redis support 2011-01-18 14:15:34 +00:00
Richard Alam
26c1a82215 - merge-in latest fs-java-esl from freeswitch-contrib 2011-01-17 16:26:06 -05:00
Richard Alam
18130b3e02 - add jedis dependency 2011-01-14 02:25:42 -05:00
Marco Calderon
e9c120dc9f voice recording for freeswitch 2011-01-12 18:10:50 +00:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
Marco Calderon
c0a28e231a Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-12-17 12:10:02 +00:00
@deniszgonjanin
872291494b Added recording to whiteboard module, to get a good feeling of how record and playback works. 2010-12-22 00:39:39 +00:00
Marco Calderon
d6c8b30e19 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-12-17 12:03:11 +00:00
Marco Calderon
1c39504480 added voice recording freeswitch 2010-12-17 12:01:05 +00:00
@deniszgonjanin
79563801b3 Decoupled sending from recording of chat messages 2010-12-15 18:18:37 +00:00
Richard Alam
095f532e35 - add more info on log so we can correlate with the red5 error.log if the client dropped because of connection problems 2010-11-25 15:59:07 -05: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
2d102450b9 added send parameter record from bbb-web to bbb-apps 2010-11-10 22:40:52 +00:00
Richard Alam
27ebeb1dda - add license headers to bbb-apps 2010-11-06 10:25:30 -04:00
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