Commit Graph

3511 Commits

Author SHA1 Message Date
Localization Server
b357dc56cb Updating locale 2011-07-26 10:00:03 +00:00
Localization Server
430cb4cdc2 Updating locale 2011-07-26 08:20:02 +00:00
Localization Server
8b890735ba Updating locale 2011-07-25 15:20:02 +00:00
gugat
0593ebdc14 Avoid squished deskshare video 2011-07-24 19:17:53 -05:00
gugat
b226c6e58f Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-24 19:14:48 -05:00
Richard Alam
8ffc8c9bdc - hook-up expired meeting background proc 2011-07-23 16:53:34 -04:00
Richard Alam
3c76ace954 - have the background cleaner run eveyr minute 2011-07-23 16:47:06 -04:00
Richard Alam
a3649c5937 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-23 16:36:53 -04:00
Richard Alam
0525511764 - add logging for meeting cleaner background proc 2011-07-23 16:36:27 -04:00
Richard Alam
d5b4a7a88f - Flash chokes on mx_internal. Need to find a better way to determine screen widht/height from Application as
it is recommended to use FlexGlobals for SDK 4.5.
2011-07-23 20:22:52 +00:00
Richard Alam
9fe1dbb5f7 - comment out code for H264. Flash Player version below 11 chokes if we
put this in even if we put a check to activate it only if the FP is 11.
2011-07-23 20:20:30 +00:00
Richard Alam
206d94dae8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-23 18:52:28 +00:00
Richard Alam
6a4d886944 - try commenting out h264 stuff...seems it's screwing up webcam and presentation 2011-07-23 18:51:42 +00:00
Richard Alam
2a02abe63d - remove extra param on connection request to red5 2011-07-23 13:05:31 -04:00
Richard Alam
93805c1101 - generate config.xml from template when build from hudson 2011-07-23 16:54:05 +00:00
Richard Alam
7415e604ca - fix build problem 2011-07-23 11:43:05 -04:00
Richard Alam
8e983345b8 - add property to set timeout for allowing time between creating a meeting and joining a meeting
- change default meeting expiration to 1 minute
 - trigger ingest and processing when the meeting is removed form memory instead of when the last
   user leaves the meeting
2011-07-23 11:13:29 -04:00
Richard Alam
3e408401a4 Merge branch 'merge-master-into-client-testing' 2011-07-23 14:09:41 +00:00
Richard Alam
151cbbda9d - only activate H264 if Flash Player is at least version 11 2011-07-23 14:06:05 +00:00
Richard Alam
533b436820 - Make configuration work with Flex 4.5.1 2011-07-22 20:50:56 +00:00
Richard Alam
b7ab683e84 - merge master into echo-cancel and h264 branches
Conflicts:
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml
2011-07-21 17:49:08 +00:00
Richard Alam
783add527e - play around with melomel 2011-07-21 17:22:25 +00:00
Richard Alam
7cec704916 - play around with h264 2011-07-21 17:21:52 +00:00
Richard Alam
3d3f6bbab1 - rename simple to slides
- merge guga's work to pre-load images when playing back recording
2011-07-21 11:58:22 -04:00
Richard Alam
96aaae0a7a Merge remote branch 'guga/refactor' 2011-07-21 11:56:52 -04:00
Richard Alam
c6867b940b - add option in config.xml to not display prompt when logging out 2011-07-21 11:22:48 -04:00
gugat
d2d711704e Fix bug while installing third party tools 2011-07-20 20:39:26 -05:00
gugat
59031812be Add logger in rap-worker.rb 2011-07-20 20:13:22 -05:00
gugat
e7c78c3759 PreLoad Images in slides' playback 2011-07-20 18:19:17 -05:00
Richard Alam
2c65cc9ac2 - fix possible NPE when getting internal id of non-existing meeting 2011-07-20 15:26:19 -04:00
Richard Alam
21acb8e566 - change simple to slides 2011-07-20 14:57:11 -04:00
Richard Alam
71e5e9ca97 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-20 11:44:54 -04: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
Localization Server
f699e997a2 Updating locale 2011-07-20 03:20:07 +00:00
Richard Alam
d989e96295 - show toolbar by default 2011-07-19 17:08:10 -04:00
Richard Alam
4d2e503214 - add param to remove the meeting right away from memory instead of letting
it linger for about an hour (the value of the expire meeting).
2011-07-19 16:03:36 -04:00
Richard Alam
46ea659796 - change default meeting duration to 0 (zero) which means no duration. This maintains
compatibility with previous release allwoing the demo meeting to run infinitely (for
   example). 3rd-party apps must pass duration if they want to set it, especially if the
   meeting is being recorded.
2011-07-19 15:27:18 -04:00
Richard Alam
c5f8aa9344 - rename simple playback to slides playback 2011-07-19 14:33:17 -04:00
Richard Alam
1796fbc777 - if there are any users in the meeting, then meeting is running
- set the meeting to forciblyEnded if the end api has been called
2011-07-19 13:49:11 -04:00
Richard Alam
e97a57e813 - make imagemagick generate smaller PNG files.... 2011-07-19 11:36:03 -04:00
Richard Alam
0a8ac376fe - add config property to show/hide toolbar 2011-07-18 14:00:41 -04:00
gugat
e721dd19a1 Require open4 in recordandplayback.rb
Add open4 to Gemfile
2011-07-15 17:09:11 -05:00
Richard Alam
138bc17d1c - load Demo*.pdf from new location 2011-07-15 14:06:56 -04:00
Richard Alam
060bb66f49 - move pre-uploaded demo pdfs into new dir 2011-07-15 14:05:56 -04:00
Richard Alam
20330a1252 Merge remote branch 'guga/refactor' into guga-pull 2011-07-15 09:53:35 -04:00
Richard Alam
4d5b2056b1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-15 09:49:47 -04:00
Richard Alam
f51300c5d9 - try out custom broadcaster 2011-07-15 09:49:11 -04:00
gugat
c56facd64c Change image presentations (gif, jpg) to png, so they will be played properly 2011-07-14 18:51:51 -05:00
gugat
51d0ba5bf7 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into respaldo 2011-07-14 18:46:42 -05:00
Richard Alam
192b54d978 - fix wrong attributes in config.xml tempalte 2011-07-14 14:56:09 -04:00