Commit Graph

3868 Commits

Author SHA1 Message Date
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
Richard Alam
97ffdd67f3 - dekshare options 2011-11-04 14:43:39 -04:00
Richard Alam
fe70b2fef3 - add option to autostart dekstop sharing 2011-11-04 14:43:00 -04:00
Richard Alam
a668e79494 - commons-fileupload and commons-io needs to be in red5/lib otherwise we get class not found FileItemFactory 2011-11-04 14:45:41 +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
7abb58d6ce - add onBWDone and onBWCheck for video, voice, and deskshare connections 2011-11-04 14:01:10 +00:00
Richard Alam
4172426a01 - deskshare works on socket but has exceptions on startup for tunneling 2011-11-04 14:00:26 +00:00
Richard Alam
f8adf89d9a remove aop jars 2011-11-04 12:55:55 +00:00
Richard Alam
2b91c3be7c - implement onBWCheck and onBWDone for connection 2011-11-04 12:53:57 +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
33dcc49893 Merge branch 'hangout-style' into camera-hints 2011-11-04 01:45:32 +00:00
Felipe Cecagno
003b612399 added a layout parameter for the video dock on config.xml; the layouts could be none (no action on click), smart (better adjustment positioning the big window on the top or on the right side) or hangout (the big window will always be on top) 2011-11-03 22:37:26 -02:00
Richard Alam
b795d159f7 build bbb-voice with red5 r4293 2011-11-03 20:24:50 +00:00
Richard Alam
806d0cb6d4 build video with red5 4293 2011-11-03 20:24:26 +00:00
Richard Alam
c75c132925 build bbb-apps with red5 r4293 2011-11-03 20:23:55 +00:00
Richard Alam
ec2cc83981 Merge branch 'master' into testing-with-red5-trunk 2011-11-03 17:31:27 +00:00
Richard Alam
2a33f7e2df fix logouturl from old locale popup 2011-11-02 17:22:30 -04:00
Richard Alam
54ca0a5bfd - change name of showing log button option 2011-11-02 14:18:40 -04:00
Richard Alam
fb29dee54f - make layout options work properly as toolbar doesn't hide when set to false 2011-11-02 14:07:45 -04:00
Richard Alam
74e95a4853 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-11-02 11:27:15 -04:00
Richard Alam
60577df2b1 - redirect properly to logout url when logout window is not shown 2011-11-02 10:59:29 -04:00
Localization Server
4c75e43b30 Updating locale 2011-11-01 22:40:01 +00:00
Richard Alam
22c2a0062e - fix regex in extracting userid and name from listener 2011-11-01 17:26:55 -04:00
Richard Alam
d327c26bfa - need to split local codes to convert to google translate locale codes 2011-11-01 16:56:01 -04:00
Richard Alam
2a3515a0f7 - sync chat language with language selector 2011-11-01 14:33:13 -04:00
Richard Alam
f97e357cf7 - display proper default locale in selector 2011-11-01 13:54:42 -04:00
Richard Alam
db80cff3d0 Merge branch 'master' into consolidate-locales-in-one-area
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
2011-11-01 13:34:09 -04:00
Richard Alam
7b36c465fa - Change text label when self muted/talking
- add param to prevent locales from being cached
2011-11-01 13:31:47 -04:00
Richard Alam
0d2234d5f7 try to set the language selector to default value 2011-11-01 13:21:27 -04:00
Richard Alam
f6c46bcedb - add locales in locales.xml 2011-11-01 10:20:35 -04:00
Richard Alam
349aab712d try to sync locales 2011-11-01 02:21:30 +00:00
Richard Alam
46d3b8b5be - fix to be able to switch from english and back 2011-11-01 01:44:21 +00:00
Richard Alam
87b7380320 rename Norwegian locale code from nb_No to no_NO 2011-11-01 01:44:03 +00:00
Richard Alam
b52578044e - refactor localization in preparation for fixing problem with setting up locales 2011-10-31 16:27:39 -04:00
Richard Alam
c6be4042c2 - moderator should always be able to mute/unmute himself.
- hide push to talk for viewer if locked by moderator
2011-10-31 13:48:01 -04:00
Markos Calderon
0e26498b49 changed bbb-voice to use the latest version of red5 2011-10-28 13:03:41 -07: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
Richard Alam
a22a349e12 minor cleanup 2011-10-26 17:01:56 -04:00
Richard Alam
5307806253 shortcircuit how chat listens for user joining/leaving for private chat 2011-10-26 16:37:34 -04:00