Commit Graph

4206 Commits

Author SHA1 Message Date
Fred Dixon
5000dcc13e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-21 09:20:38 -08:00
Richard Alam
337b21342b Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-11-21 15:25:11 -05:00
Richard Alam
3393fc5b62 add new locales 2011-11-21 15:24:55 -05:00
Fred Dixon
80ebe82610 Added sorting of modification date to demo10.jsp 2011-11-21 09:20:31 -08:00
Markos Calderon
ec94029de2 added comments for the ChatObject class 2011-11-21 09:13:48 -08:00
gugat
381e120c65 Use ffmpeg to concatenate videos. Mencoder command hangs with popen. 2011-11-21 09:03:41 -08:00
Markos Calderon
5e102ceb1b sending a chatobject class to the server 2011-11-21 08:50:45 -08:00
Fred Dixon
af5683857c Fixed incorrect path for demo4.jsp 2011-11-20 11:42:40 -08:00
Fred Dixon
a3849c9a52 Removed old comments from rap-worker.rb 2011-11-20 11:16:11 -08:00
Fred Dixon
b627af54fe Added demo4/jquery.min.js (older version) for demo4.jsp 2011-11-20 11:15:07 -08:00
Fred Dixon
a4b541bdd3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-20 06:35:15 -08:00
Fred Dixon
fc71c3c0eb Added more checks to bbb-record --watch to monitor the processing of a recording 2011-11-20 06:33:55 -08:00
Richard Alam
bfd6316040 - stick with scala 2.7.7 for now as we have compile problems with upgrad 2011-11-19 19:53:47 +00:00
Richard Alam
9c76d27dc7 - up version fs-esl lib 2011-11-19 18:45:20 +00:00
Richard Alam
6e6cb5527e - upgrade fs-esl lib 2011-11-19 18:44:41 +00:00
Richard Alam
0bb82324c5 - lower the timeout as 25sec is too long 2011-11-19 18:33:05 +00:00
Richard Alam
6b61b49ea0 - remove dependencies on children as we don't build the parent project but build each individually 2011-11-19 18:15:08 +00:00
Richard Alam
7ca98289b6 - parent build.gradle needs compile instead of providedCompile 2011-11-19 17:46:40 +00:00
Richard Alam
97b4a3e38a - change jars that we need to package with red5 2011-11-19 17:38:04 +00:00
Richard Alam
3ae59e68fc Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into testing-with-red5-trunk 2011-11-19 15:33:16 +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
Markos Calderon
2d6ae1210e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-17 10:33:09 -08:00
Markos Calderon
67914cf1f4 fixed problem with demo10 2011-11-17 10:32:15 -08:00
Richard Alam
4619dee0c4 Merge branch 'master' into testing-with-red5-trunk 2011-11-16 21:29:20 +00:00
Richard Alam
5ea0e41b2d upgrading to fixed red.jar for rtmpt 2011-11-16 21:28:09 +00:00
Richard Alam
2f421059bb add option to not show close button for camera view window 2011-11-15 18:23:56 -05:00
Markos Calderon
d56130a239 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-15 13:02:22 -08:00
Markos Calderon
cb497006f9 fixed demo10 to support paging 2011-11-15 13:01:30 -08:00
Richard Alam
2043d68b48 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into testing-with-red5-trunk 2011-11-15 15:41:40 +00:00
Richard Alam
62c3b220a1 change silence limit from 10 to 60 minutes as some people join the meeting very early
and thus prevents the recording from being processed.
2011-11-15 10:19:12 -05:00
Markos Calderon
9476e3b175 added expire time to bbb landing page 2011-11-14 11:26:29 -08:00
Markos Calderon
c2b0f1588f fix urlencode in pre upload 2011-11-11 09:23:30 -08:00
Markos Calderon
7b511015e2 fix for jpg images in playback 2011-11-10 08:59:41 -08:00
Richard Alam
89c1f23fbd Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into testing-with-red5-trunk 2011-11-10 15:45:53 +00:00
Richard Alam
cf8efce46e - updating locales files from mygengo 2011-11-09 11:04:08 -05:00
Richard Alam
2acd95b677 Merge branch 'master' into hangout-style 2011-11-09 10:08:11 -05:00
Richard Alam
de7c948c21 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-11-09 10:07:42 -05:00
Richard Alam
c4949f245d check if we have deskshare window open before closing 2011-11-09 10:07:06 -05:00
Fred Dixon
1832ed1da4 Updating index.html for beta-3 2011-11-08 18:51:53 -08:00
Fred Dixon
b557c4f623 Made /etc/cron.daily/bigbluebutton executable 2011-11-08 16:24:15 -08:00
Fred Dixon
196eadfdb8 Added cron.daily job to remove presentations older than 11 days, and remove recordings for desktop sharing and webcams (if present) 2011-11-08 15:23:47 -08:00
Felipe Cecagno
9e5611c9ab added the parameter oneAlwaysBigger to videodock module on config.xml. if oneAlwaysBigger is true, one window will always be bigger on videodock layout 2011-11-08 21:15:16 -02:00
Richard Alam
cf7389e6e0 download js and css so that we don't depend on internet connection for demo to work 2011-11-08 14:45:57 -05:00
Richard Alam
cc1acd9951 open deskshare publish window in lower left corner 2011-11-08 13:20:29 -05:00
Richard Alam
5ff8bd24ab Merge branch 'hangout-style' 2011-11-08 12:55:48 -05:00
Richard Alam
97d70e93f5 lower motion level and activity timeout so that we don't get into a
loop trying to determine if cam is used by another app
2011-11-08 12:53:19 -05:00
Richard Alam
dabe4b37cf - auto publish deskshare
- fix autopublishing when switching presenter
2011-11-07 14:46:44 -05:00
Richard Alam
13565c988b Merge branch 'master' into testing-with-red5-trunk 2011-11-04 19:17:33 +00:00