Commit Graph

3866 Commits

Author SHA1 Message Date
Richard Alam
92ba8d547f - remove the maximize override as it was not handling the maximize properly... 2012-01-10 19:02:59 +00:00
Richard Alam
37d77f2ddc Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-01-10 16:26:37 +00:00
Richard Alam
9c8aeae213 - if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation 2012-01-10 16:25:46 +00:00
Richard Alam
40da022fa8 Merge pull request #21 from gugat/issue1110
Trim presentation name before it is sent to the web server.
2012-01-10 08:03:38 -08:00
gugat
b69d521bae Trim presentation name before it is sent to the web server. 2012-01-10 10:35:29 -05:00
Richard Alam
180d1acc58 - Make defaultLogoutUrl not blank so that bbb-conf --check does not complain 2012-01-09 23:23:44 +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
90e112692a - if the user has no mic, join him to the voice conference anyway as listener. Don't display the mic check window. 2012-01-09 22:35:58 +00:00
Richard Alam
6bf086f27b - fail fast when an attempt to join the voice conference is made but we failed to register with FS. 2012-01-09 21:51:54 +00: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
Richard Alam
785c7e6eec Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-01-09 19:01:00 +00:00
Markos Calderon
2ad5c4365b fix to handle exceptions the updates of the API 2012-01-09 10:20:57 -08:00
Markos Calderon
fdc4cfe037 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-09 10:20:08 -08:00
Richard Alam
3ae110e40b - cleanup logs 2012-01-09 16:45:11 +00:00
Richard Alam
e7c1d5e334 - call FS anyway even if red5 hasn't registered 2012-01-09 16:42:43 +00:00
Markos Calderon
4e6bdabc37 Merge pull request #20 from gugat/issue1106
Solve issue 1106 . Return silence with lenght of the recording when there is not audio file.
2012-01-06 09:29:57 -08:00
Markos Calderon
4a797ecdc1 Merge remote branch 'gugat/issue1106' 2012-01-06 09:17:06 -08:00
Richard Alam
0792a7eb5d - removing the videoDisplay results in Flash exception in debug Flash player as it complains that
the display is not a child of the caller.
2012-01-06 16:43:55 +00:00
gugat
d685a5456a Return silence with lenght of the recording when there is not audio file. 2012-01-06 11:35:02 -05:00
Richard Alam
8a383f6e8b Merge pull request #19 from gugat/issue963
Solve issue 963 . Add --check option to bbb-record.
2012-01-05 14:21:16 -08:00
gugat
ea2c453807 Add info log messages from each method of generators
Add info log messages from publish script of slides. The log was empty before, was just created.
Add --check option to bbb-record. Taking same logic from bbb-conf and adding info about the failed task with each error.
2012-01-05 17:07:34 -05:00
Richard Alam
543b002c50 - cleanup...removing dead code 2012-01-05 15:44:53 +00:00
Richard Alam
ba02d53fa2 - cleanup exception when displaying toolbar 2012-01-05 15:30:12 +00:00
Richard Alam
5537efd9d1 Fix http://code.google.com/p/bigbluebutton/issues/detail?id=1046 to not display iframe when sharing desktop 2012-01-04 18:41:06 +00:00
Richard Alam
aaa06087fb - disable publish buttons once clicked to prevent user from clicking multiple times resulting
in multiple deskshare sessions.
2012-01-04 18:28:08 +00:00
Richard Alam
529b340d20 - fix problem where the first moderator doesn't become presenter if no presentation has been
pre-uploaded. See issue http://code.google.com/p/bigbluebutton/issues/detail?id=1103
2012-01-04 16:15:23 +00:00
Richard Alam
0bad7f6a59 - statically link RSLs to amke sure dependencies are available and those behind strict firewalls that can't download from
Adobe will be able to run the client
2012-01-03 22:25:57 +00:00
Richard Alam
617823f2b2 encode username into UTF-8 to make sure that chars that is equivalent to newline will not break SDP 2012-01-03 22:09:01 +00:00
Richard Alam
c0e459e5e2 - don't display any version number by default. The version number will be set by what's in
config.xml
2012-01-03 18:46:57 +00:00
Markos Calderon
692a162e74 Merge pull request #17 from gugat/meeting-last-forever
Meeting stays created infinitely when defaultMeetingCreateJoinDuration=0
2011-12-20 13:50:18 -08:00
Richard Alam
34a57089a4 update locale strings to latest from mygengo 2011-12-20 15:49:45 +00:00
gugat
1beac318f9 Meeting stays created infinitely when defaultMeetingCreateJoinDuration=0
Solves issue 1097
2011-12-18 11:46:09 -05:00
Richard Alam
62efbc9c37 - use the master locale string (en_US) if the preferred locale string is unavailable 2011-12-15 18:57:17 +00:00
Markos Calderon
66831d0808 Merge branch 'updating-jedis-config' 2011-12-14 14:18:56 -08:00
Markos Calderon
48d63068b6 Merge branch 'fix-userid-api' 2011-12-14 14:17:19 -08:00
Markos Calderon
52403a6bf9 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into optimize-rap-worker 2011-12-13 15:00:21 -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
240c7df9ad try to maximize deskshare view window by default 2011-12-09 21:02:50 +00:00
Richard Alam
192f784df0 - make chat window larger and move video dock to bottom left when
display is less that 768 height.
2011-12-09 20:28:00 +00:00
Richard Alam
95a6cb398c Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-12-09 03:17:09 +00:00
Richard Alam
6e44d04c6a fix problem where UI is not set properly when first moderator becomes presenter 2011-12-09 03:16:40 +00:00
Fred Dixon
bb8b64aff6 removed --version flag from bbb-record 2011-12-08 15:10:53 -08:00
Fred Dixon
906954156f Only include files that end in .nginx -- this gets around a bug in the upgrade scripts where the packaging create /etc/bigbluebutton/nginx/slides.nginx:1 and cause nginx to fail to restart 2011-12-08 15:10:16 -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
9224107ec2 Merge branch 'master' into refactor-chat-client 2011-12-07 21:52:17 +00:00
Markos Calderon
77f664c6bd checking dirs instead of done files 2011-12-07 13:18:21 -08:00
Markos Calderon
c95a8bc56a adding a checking in rap-worker 2011-12-06 12:22:35 -08:00