BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,230 Commits 13 Branches 260 Tags 1.1 GiB
4792698ca4
Commit Graph

450 Commits

Author SHA1 Message Date
Ajay Gopinath
540ed95984 Fixed shapes not being received bug. Fixed text toolbar not moving with window/whiteboard. Added 'text size' feature to text tool options. 2012-07-10 14:51:53 -04:00
Richard Alam
575ffb45b8 - start modifying server side 2012-07-10 12:23:43 +00:00
Ajay Gopinath
c38b719823 FINALLY! FINISHED TEXT TOOL. 2012-07-08 21:12:37 -04:00
Ajay Gopinath
8715327475 Modified record event to include fill color. Need to finish text tool and presentation GUI. 2012-07-08 14:30:46 -04:00
Ajay Gopinath
0ef622f959 Added triangle tool and made fill color selectable rather than making it the same as the line color of the DrawObject. 2012-07-06 22:36:41 -04:00
Ajay Gopinath
a9fabf0028 Fixed duplication of GraphicObjects glitch when zooming and changing view modes. Added sprite transformation libraries but need to integrate with program. 2012-07-06 15:40:35 -04:00
Richard Alam
459d486309 Merge remote branch 'origin/add-pointer-record' into add-more-whiteboard-features 2012-07-06 16:00:06 +00:00
Markos Calderon
e378ee146c added changes for record presentation pointer 2012-07-05 14:59:13 -07:00
Ajay Gopinath
e2d536a8f4 Added eraser and highlighter tool. Fixed text normalization issue. Need to add recogniition of individual objects. Text is buggy. 2012-07-05 01:34:51 -04:00
Ajay Gopinath
938103972d Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
Ajay Gopinath
782154bba9 Finished adding fill selection tool and transparency option tool. 2012-06-30 18:47:31 -04:00
Ajay Gopinath
7ac7a51ebe red5 opened to dev successfully. Start of development of bbb-apps. 2012-06-22 14:41:06 -04:00
Felipe Cecagno
ded77508fe first version of the server side layout module - it allows users to lock and unlock the current layout; the layout is defined as a String, which should be a XML String but may be anything, this way is much easy to extend the layout management, since it won't need to change the server code 2012-06-15 11:34:57 -03:00
Richard Alam
b5b6d5f954 - update red5 to latest (r4316) 2012-04-22 15:03:43 +00:00
Richard Alam
17b3922295 - don't use map to determine ESL message 2012-04-12 16:31:34 +00:00
Richard Alam
835670f592 - retry indefinitely to connect to FreeSWITCH ESL 2012-03-27 15:24:50 +00:00
Richard Alam
c23b3be31a - fix cast exception on file upload 
- fix "undefined" on fileupload window
 2012-02-24 20:19:37 +00:00
Richard Alam
5abe4eecb4 - remove w,h,x,y from message as we don't use them 2012-02-21 19:42:39 +00:00
Richard Alam
4740d1c10a - add more parameters on message from presenter to viewer 2012-02-16 18:52:39 +00:00
Richard Alam
e79a650a05 - remove optimization for pencil tool 2012-02-15 22:48:42 +00:00
Markos Calderon
83ebc7a24e changes in latentFeedback and added a check size in bbb-apps 2012-01-23 13:06:58 -08:00
Richard Alam
ecc979e274 - generate internal userid to be able to match users across subsytems 2012-01-18 15:46:29 +00:00
Markos Calderon
e7b839614f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-09 14:45:08 -08:00
Markos Calderon
ea5331d0c9 now, bbb-web uses the internalUserId 2012-01-09 14:44:14 -08:00
Richard Alam
6b24878a5c - fail fast when cannot connect to FS-ESL on startup 2012-01-09 21:40:46 +00:00
Richard Alam
c858a6919b - try to connect to FS-ESL when the connection has dropped. 2012-01-09 19:16:34 +00:00
Markos Calderon
66831d0808 Merge branch 'updating-jedis-config' 2011-12-14 14:18:56 -08:00
Markos Calderon
f889d23fc0 fix for userid mismatch in API 2011-12-13 14:44:17 -08:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Richard Alam
0bbe44e785 move assign presenter logic to users/participants. This fixes a race condition where the first moderator 
doesn't become presenter by default.
 2011-12-08 21:43:16 +00:00
Richard Alam
aa923319a7 Merge branch 'master' into refactor-chat-client 2011-11-22 15:36:25 +00:00
Markos Calderon
ec94029de2 added comments for the ChatObject class 2011-11-21 09:13:48 -08:00
Markos Calderon
5e102ceb1b sending a chatobject class to the server 2011-11-21 08:50:45 -08:00
Richard Alam
6e6cb5527e - upgrade fs-esl lib 2011-11-19 18:44:41 +00:00
Richard Alam
97b4a3e38a - change jars that we need to package with red5 2011-11-19 17:38:04 +00:00
Markos Calderon
33dcf0e2b3 fixed send private message 2011-11-18 17:46:56 -08:00
Markos Calderon
57677bf239 fixed problem with pipe, however need some cleanup 2011-11-18 16:42:25 -08:00
Markos Calderon
ac6073527c initial changes 2011-11-18 12:06:35 -08:00
Richard Alam
5ea0e41b2d upgrading to fixed red.jar for rtmpt 2011-11-16 21:28:09 +00:00
Richard Alam
ba8bc03ef7 - re-add aop jars as it's needed for JVM shutdown hook...but needs to be in red5/lib dir 2011-11-04 14:44:33 +00:00
Richard Alam
f8adf89d9a remove aop jars 2011-11-04 12:55:55 +00:00
Richard Alam
bb86f44150 - compile with red5-r4293 
- still some errors to resolve
   - had to add aop jars in bbb-apps
   - deskshare is choking on tunneling
   - exceptions when starting red5 manually
 2011-11-04 02:07:35 +00:00
Richard Alam
c75c132925 build bbb-apps with red5 r4293 2011-11-03 20:23:55 +00:00
Richard Alam
968a5d7967 Merge branch 'master' into testing-with-red5-trunk 
Conflicts:
	bigbluebutton-apps/build.gradle
 2011-10-27 10:58:53 -04:00
Markos Calderon
0d7924d650 changes in log files 2011-10-26 12:02:41 -07:00
Richard Alam
2564314aac check if shared object is null as user may have left and will result an NPE when sending private chat 2011-10-25 10:34:46 -04:00
Richard Alam
d7b665f463 add some debug logging on why the client doesn't get updated after some time. This happens 
on demo after a few days but difficult to reproduce locally.
 2011-10-24 13:04:44 -04:00
Richard Alam
8ef0d266ed more cleanup 2011-10-19 16:44:28 -04:00
Richard Alam
ea889de5a4 cleanup 2011-10-19 16:42:16 -04:00
Richard Alam
1a9c19e1a6 - up version and remove asterisk-java dependency 2011-10-19 15:38:05 -04:00
Richard Alam
34d6d9cc69 - remove asterisk for cleanup as we only now use FS for 0.8...can add back support in the future 2011-10-19 15:29:55 -04:00
Richard Alam
d9bc91768e completely remove spring integration 2011-10-19 14:58:17 -04:00
Richard Alam
3fa22c6909 - changing build dependencies 2011-10-19 10:34:15 -04:00
Richard Alam
e6606ecc27 - revert back as Red5 is throwing an NPE 2011-10-18 11:46:11 -04:00
Richard Alam
8b42a433c2 fix logging as it was incorrectly logging that it can't find the room 2011-10-03 09:46:35 -07:00
Richard Alam
45e6a473f5 - fix issue where voice bridge is not removed properly when the meeting ends. 2011-10-11 18:50:24 -04:00
Richard Alam
8e98ae63bd show pre-uploaded presentation in drop down 2011-10-03 01:46:37 -04:00
Marco Calderon
c36951dca6 updated messaging module in bbb-apps 2011-09-08 12:11:34 -05: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
41269197ca - check it meeting is already being recorded 2011-07-10 10:31:49 -04:00
Richard Alam
8c8e009baa - unit test passing again 2011-06-23 14:04:00 -04: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
480489fc7f - change numberOfPages to String so that the message gets forwarded to the client. 
- stopped activeMQ and Mysql and it works...so we've removed dependency to ActiveMQ and MySQL
 2011-06-16 12:48:31 -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
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