Commit Graph

2047 Commits

Author SHA1 Message Date
Richard Alam
8bcaeb1edf - update deskshare standlone html 2012-04-24 22:20:12 +00:00
Richard Alam
17ae1eb459 - handle NetworkChange separately as we don't want to disconnect a wireless user when the connection hiccups 2012-04-21 16:07:12 +00:00
Richard Alam
9357ee289e - join the conference only when successfully connected to the server 2012-04-17 21:41:25 +00:00
Richard Alam
41a8d61651 - remove icon for deskshare and webcam
- change default line thickness to 2 for whiteboard
2012-04-16 22:37:24 +00:00
Richard Alam
af8620f292 - remove tunnel log on java console as it is confusing 2012-04-16 18:37:45 +00:00
Richard Alam
01a7a4be94 - updating locales 2012-04-16 14:39:04 +00:00
Richard Alam
f7aa80ba45 - change icons for voice, video and deskshare 2012-04-13 21:36:59 +00:00
Richard Alam
49bab2514b - change how we decode byte stream into frames
- add an end frame delimeter so we can handle frames easily
2012-04-12 21:49:37 +00:00
Richard Alam
05140aeb90 - auto rejoin the user when she gets disconnected from the voice conference without
explicitly requesting to leave the voice conference.
SIDE EFFECT:
  This "feature" make kicking the user from the voice conference a "broken feature" as
  the user get rejoined when kicked from the voice conference. We'll ahve to figure out
  how to detect that a user was disconnected because he was ejected by the moderator.
2012-04-05 14:33:54 +00:00
Fred Dixon
b761f23651 Edited audio-test.mp3 to 10 seconds 2012-03-25 20:01:29 -04:00
Richard Alam
0723e820b6 - add more logging to figure out why deskskare hangs when getting exceptions 2012-03-21 17:32:32 +00:00
Richard Alam
ec372dd538 - try to make deskshare resilient to corrupted packets 2012-03-15 22:06:33 +00:00
Richard Alam
942307740f - close window when stream has stopped 2012-03-15 21:41:11 +00:00
Richard Alam
b17cf9a9bc - fix issue 1125 once more 2012-03-09 21:40:10 +00:00
Richard Alam
fad4a7dc1c - fix issue 1125 where chat box is hidden because of scolling on a Mac 2012-03-06 16:34:53 +00:00
Richard Alam
ab5c81bb4a Merge pull request #24 from mconf/resolution-from-streamname
Resolution from streamname
2012-03-05 09:37:21 -08:00
Richard Alam
b967b3b1d8 - revert back changes in build.xml for join-mock 2012-03-02 23:03:06 +00:00
Richard Alam
fbc7354318 - remove join-mock step from build 2012-03-02 22:42:28 +00:00
Richard Alam
be76c7d8ab - update locale to 0.8-beta4 2012-03-01 19:15:31 +00:00
Richard Alam
93349e84e6 - update locale version to 0.8-beta4 and (c) to 2012 2012-03-01 19:00:50 +00:00
Richard Alam
49b59cc189 - update with new locales 2012-03-01 18:32:27 +00:00
Richard Alam
3aea936f77 - cleanup 2012-02-29 21:20:06 +00:00
Richard Alam
a409c3597d - minor cleanup 2012-02-29 21:12:03 +00:00
Richard Alam
90a9b10281 - handle resize of fit-to-width properly 2012-02-29 21:09:20 +00:00
Richard Alam
801ea6f2a7 - try to fit the page to window when resizing window and is fit-to-width 2012-02-29 20:44:02 +00:00
Richard Alam
6175c95f0c - do not reset to display the whole page when the page is loaded 2012-02-29 17:20:07 +00:00
Richard Alam
ab78322384 - use icon for each fit-to-page and fit-to-width 2012-02-28 22:27:08 +00:00
Richard Alam
0e795da75f - use fit-to-page as default for each new page
- update icons and locale strings
2012-02-28 18:31:27 +00:00
Richard Alam
bd368125d3 Merge branch 'master' into implement-fit-to-width 2012-02-28 17:25:05 +00:00
Richard Alam
b9fca184f0 - change how to do ftw and zooming 2012-02-28 13:01:22 +00:00
Fred Dixon
96777c07ec Added icons for fit-to-page and fit-to-width 2012-02-27 18:41:15 -05:00
Fred Dixon
ef6d74cefa Pulled out definitions for bigbluebutton-client and bigbluebutton-web from default bigbluebutton.nginx. These are now stored in /etc/bigbluebutton/nginx 2012-02-25 12:15:26 -05:00
Richard Alam
fd06e03c01 - hide reset button for portrait docs 2012-02-24 21:20:47 +00:00
Richard Alam
6961733340 - change brackground color of presentation window 2012-02-24 20:41:22 +00:00
Richard Alam
43be308ebe Merge branch 'master' into implement-fit-to-width 2012-02-24 20:31:16 +00:00
Richard Alam
6bdfb78495 - don't disable the cancel window so that it can be closed in case the conversion fails.
- put back resize handler to resize slide in real-time
2012-02-24 20:29:21 +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
b09ed1c231 - hide zoom slider when ftw 2012-02-24 18:43:09 +00:00
Richard Alam
a277d6c339 display ftw properly when switching pages 2012-02-24 16:51:18 +00:00
Richard Alam
e41af8caef - adjust slide display properly for ftw 2012-02-24 14:28:59 +00:00
Richard Alam
3777f433a1 - continue to extract the calculations 2012-02-23 22:36:42 +00:00
Richard Alam
db03520f77 - extracting out slide calculations into separate class 2012-02-23 21:59:42 +00:00
Richard Alam
2947518eb6 - DRYing up bounds detection code 2012-02-23 20:22:49 +00:00
Richard Alam
e4d86ae2f3 - bounds detect then using zoom slider for ftw 2012-02-23 19:38:32 +00:00
Richard Alam
b9f4dbe168 - hook zoom slider 2012-02-23 19:25:28 +00:00
Richard Alam
3213cc0299 - put the shapes list into it's own class so we don't have to depend on the window being shown to
receive the shape messages...we redraw the shapes when the window gets displayed
2012-02-23 15:24:21 +00:00
Fred Dixon
9fd046a961 remove code to copy config.xml and join-mock.xml, will leave these steps to the instructions 2012-02-22 19:41:47 -05:00
Fred Dixon
24c1c69156 Added logic in build.xml to copy config.xml and join-mock.xml if not in the bigbluebutton-client source tree 2012-02-22 17:32:55 -05:00
Richard Alam
efc63bfa66 - load whiteboard shapes for latecomers 2012-02-22 21:30:42 +00:00
Richard Alam
b86268c5da - don't move slide when resizing fit to page 2012-02-21 21:59:49 +00:00
Richard Alam
c067698906 - send updates while presenter draw shapes aside from pencil 2012-02-21 21:43:58 +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
ef95f1ee69 - hook up whiteboard history 2012-02-21 18:55:53 +00:00
Richard Alam
5aa67ab7d0 - hook up undo and clear buttons 2012-02-21 18:29:50 +00:00
Richard Alam
111fabcb3c - FINALLY! Got the shapes to work properly when zooming and resizing. 2012-02-21 16:34:05 +00:00
Richard Alam
0a2a6761c3 - convert int to Number 2012-02-20 16:54:01 +00:00
Richard Alam
1131abaa3f - display shapes in viewer 2012-02-20 15:14:48 +00:00
Richard Alam
a1fb358ffd - figure out why shapes aren't aligining properly 2012-02-20 14:06:55 +00:00
Richard Alam
56f97d4332 - make sure step is correct on how to resize shape when canvas is resized 2012-02-16 19:52:57 +00:00
Richard Alam
4740d1c10a - add more parameters on message from presenter to viewer 2012-02-16 18:52:39 +00:00
Richard Alam
f46b1ea9a7 - handle the mouse up properly when presenter resizes the window 2012-02-16 16:41:33 +00:00
Felipe Cecagno
8a1b14a2ba using a regular expression to test the stream name format; if the stream name does not fit the pattern, the resolution of the video will be set to the lowest resolution configured in config.xml 2012-02-16 12:51:53 -02:00
Richard Alam
f60fccb10b - scales properly unless you want to be very picky for small lines that shift a bit 2012-02-15 22:49:04 +00:00
Felipe Cecagno
099c80c7aa identifies the remote video resolution from its stream name; previously it was parsing the stream name comparing the beginning of the stream name with the resolutions configured in the config.xml
it will enable third party applications, such as the Android client, to stream video with any resolutions
2012-02-15 17:52:46 -02:00
Richard Alam
244c76a57b - don't round off point locs 2012-02-15 19:05:45 +00:00
Richard Alam
3f9bb3526b - make sure viewed region doesn't go above 100 percent 2012-02-15 15:59:39 +00:00
Richard Alam
7b13b85d00 whiteboard scales properly 2012-02-15 15:39:26 +00:00
Richard Alam
c071377b5e - a little bit of moving around code...changing the factory to return DrawObject instead of Shape 2012-02-14 20:31:06 +00:00
Richard Alam
fc3405c936 - set canvas size on resize 2012-02-14 20:20:41 +00:00
Fred Dixon
2e458d147d Tweaked the settings for VideoconfModule to slightly improve quality video. Bandwidth of video will take on aberage 50 KiB/S 2012-02-12 12:26:20 -05:00
Richard Alam
c077075b52 - sync whitebaord but problem with sync when resizing window 2012-02-10 22:29:42 +00:00
Richard Alam
57f3dc8be7 - sync works except for resizing the height of ftw when doc is fully displayed 2012-02-10 21:14:16 +00:00
Richard Alam
01786e2d69 - sync ftw and ftp...need to recalculate when resising window height only when full page is displayed 2012-02-10 18:34:47 +00:00
Richard Alam
3f7ccf8c1f - ftw syncs...but switching presentation problem with not resetting dimensions 2012-02-09 22:49:36 +00:00
Richard Alam
7ec749e5fb - fit ftw resizing 2012-02-09 22:34:44 +00:00
Richard Alam
3ed9778968 - ftp syncs properly...need to do ftw 2012-02-09 22:15:53 +00:00
Richard Alam
df00baa2ea - sync fit-to-page 2012-02-09 19:07:34 +00:00
Richard Alam
d3b13edd55 try to sync viewed region in viewers window 2012-02-08 23:32:53 +00:00
Richard Alam
691b39469e resize ftp whiled zoomed 2012-02-08 20:10:26 +00:00
Richard Alam
1e60c9270f - move things around...more work need to be done on ftp resize while zoomed 2012-02-08 19:49:50 +00:00
Richard Alam
6772f10d7f - resize ftp with bounds detection 2012-02-08 19:28:26 +00:00
Richard Alam
4b9c1971b0 fix ftw resizing
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/Slide.as
2012-02-08 18:43:35 +00:00
Richard Alam
a7d7be6133 make zoom, resize, move working for both ftp and ftp 2012-02-08 18:09:12 +00:00
Richard Alam
e69ace830f - remove percentage calculations 2012-02-08 16:56:48 +00:00
Richard Alam
90a670e1f9 - use percentages 2012-02-08 16:32:53 +00:00
Richard Alam
613023de60 calculate shared region in percentage 2012-02-07 19:17:09 +00:00
Richard Alam
37880b4af7 - ftp zoom properly 2012-02-06 22:24:05 +00:00
Richard Alam
b23b6c51f0 fix ftp and ftw move 2012-02-06 21:40:53 +00:00
Richard Alam
8dd8bd065a - make window layout absolute and calculate x,y 2012-02-06 18:44:17 +00:00
Richard Alam
3c53b996e6 extract slide into it's own class 2012-02-05 12:42:34 -08:00
Richard Alam
c41f91048e display slide properly when switching presentation 2012-02-05 11:53:37 -08:00
Richard Alam
4bb936cdfa calculate ftw viewport on loading presentation 2012-02-05 11:31:05 -08:00
Richard Alam
410e350a78 - zoom fit to page works but still don't know why I need to multiply x,y coordinates by 2 to
calculate properly bounds detection
2012-02-05 10:54:40 -08:00
Richard Alam
fa9ca80ce4 - figuring out why bounds detection not wprking properly 2012-02-05 10:01:58 -08:00
Richard Alam
138b5caf1b fit to page bounds detection...lower-right isn't working properly 2012-02-04 20:10:30 -08:00
Richard Alam
881dd7a4f2 - hide thumbnails on switching presenters 2012-02-03 17:36:47 +00:00
Richard Alam
66d1de8131 - prevent presentation names from being duplicated when switching presenters 2012-02-03 17:23:50 +00:00
Richard Alam
0957bbb158 - change mute/unmute icons 2012-02-03 17:17:12 +00:00
Richard Alam
5789475d1b - modify mute/unmute buttons and icons 2012-02-02 23:47:46 +00:00
Richard Alam
2740061e09 - change muted/unmuted icons 2012-02-02 19:44:22 +00:00
Richard Alam
e242d1f367 - if the user refreshes the browser, the logout url is gone...so we need to use the logout url
returned from the server
2012-02-02 16:10:29 +00:00
Richard Alam
8fc0414f75 - first look if the user already has a logout url in the client...use that... 2012-02-01 23:11:23 +00:00
Richard Alam
742fd24b2d - redirect to landing page when user refresh the browser and there is no session 2012-02-01 22:11:36 +00:00
Richard Alam
7ba60b2dad fit to page zoom 2012-01-28 22:54:48 -08:00
Richard Alam
1582b779fd fit to page bounds detection 2012-01-28 16:27:33 -08:00
Richard Alam
3705baab17 maintain aspect ration when zooming fit-to-page 2012-01-28 13:20:12 -08:00
Richard Alam
18131c8df9 - ftp edge detection working 2012-02-03 23:05:33 +00:00
Richard Alam
43cf07bce2 - fit-to-page left and top edge detection 2012-02-03 23:01:17 +00:00
Richard Alam
0581cf49c7 - zooming for fit-to-page 2012-02-03 22:43:32 +00:00
Richard Alam
8209eec897 Merge branch 'master' into implement-fit-to-width
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
2012-02-03 17:38:52 +00:00
Richard Alam
2f63d3fda7 - trying to fix ftp zoom 2012-02-02 22:22:39 +00:00
Richard Alam
624929d8cb - zoom presentation...fit-to-page doesn't zoom properly 2012-02-02 19:27:21 +00:00
Richard Alam
4696e80325 - ftw now resizing fine 2012-02-02 18:17:34 +00:00
Richard Alam
9b548c2ad1 Merge branch 'master' into fit-to-width-investigation 2012-02-02 16:44:58 +00:00
Richard Alam
d5fd443584 Merge branch 'master' into fit-to-width-investigation 2012-02-02 14:55:30 +00:00
Richard Alam
9a3ec66b98 - fit to width resizes ok 2012-02-01 16:43:26 +00:00
Richard Alam
2dca7ab0c0 - move working but problem when ftw resize window is smaller than doc 2012-02-01 14:15:29 +00:00
Richard Alam
cb89f6c0e2 move ftw somewhat working 2012-01-31 21:25:54 +00:00
Richard Alam
5865a5deb5 - chackpoint before making big change 2012-01-31 17:52:28 +00:00
Richard Alam
23c44bb3a2 - resizing works for both presenter and viewer 2012-01-29 21:10:55 +00:00
Richard Alam
cdfc374cf2 sync display 2012-01-29 20:13:46 +00:00
Richard Alam
8d8441ad94 FTW viewed region calculated correctly 2012-01-29 16:34:09 +00:00
Richard Alam
36272b497b - resizing fit-to-page works 2012-01-29 15:41:55 +00:00
Richard Alam
1c0973b818 - change how to calculate viewports 2012-01-28 16:30:28 +00:00
Richard Alam
b6f3c6e901 - try to figure out fit to width 2012-01-27 18:18:15 +00:00
Richard Alam
8084bae31d - display portrait doc 2012-01-27 15:24:32 +00:00
Richard Alam
145956b92a - Fit to page works... 2012-01-27 14:17:59 +00:00
Richard Alam
48322b6c22 - properly positioned when reset zoom is pressed 2012-01-26 22:37:32 +00:00
Richard Alam
b75f826c6b - fit to page works except the x-location when resetting zoom 2012-01-26 22:19:00 +00:00
Richard Alam
7ad722e180 - fit to page, fit to width 2012-01-26 20:56:56 +00:00
Richard Alam
70b52bd20b - cleanup 2012-01-26 19:45:02 +00:00
Richard Alam
3b9dedd0cc cleanup 2012-01-26 19:34:32 +00:00
Richard Alam
dcbf3d7419 - allow maximize presentation window...but sync is broken 2012-01-25 23:23:21 +00:00
Richard Alam
3d8722d504 - allow to configure to show presentation window controls or not 2012-01-25 22:05:50 +00:00
Richard Alam
427f827ba6 - allow users with no mic to listen to audio stream 2012-01-24 21:53:52 +00:00
Markos Calderon
6e4eaaba04 remove unused import 2012-01-24 07:40:15 -08:00
Markos Calderon
cb6ef43d76 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-whiteboard-remaining-shape 2012-01-23 13:07:46 -08: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
2c6adc1076 - check if there is no mic on autojoin...skip check if there is no mic 2012-01-20 20:11:10 +00:00
Richard Alam
c318f03b5a - set data to null to force garbage collection. Someone reported that the chat messages causes
overflow exception crashing flash in certain environment. Setting data to null prevents this
   from happening.
2012-01-20 19:04:16 +00:00
Richard Alam
c22e41a1aa - fix tooltip for deskshare view 2012-01-20 18:52:40 +00:00
Richard Alam
50123b81ba - new deskshare jar with sending message to stop sharing 2012-01-19 17:41:28 +00:00
Richard Alam
ce49090bd0 - make deskshare port configurable 2012-01-18 16:04:53 +00:00
Richard Alam
ecc979e274 - generate internal userid to be able to match users across subsytems 2012-01-18 15:46:29 +00:00
Richard Alam
dc38119957 - don't send start module when switching locales
Fix http://code.google.com/p/bigbluebutton/issues/detail?id=1117
2012-01-16 22:05:10 +00:00
Richard Alam
e2a22f21a6 - update locales with latest from mygengo 2012-01-16 21:31:05 +00:00
Fred Dixon
6aa2fe652b Enable auto join audio by default 2012-01-15 14:26:16 -05:00
Richard Alam
484054424e - cleanup log 2012-01-12 18:23:27 +00:00
Richard Alam
a66484a023 - don't blink the tab browser for the user that sent the chat message 2012-01-12 18:22:21 +00:00
Richard Alam
f51ff77feb - try loading the config.xml as early as possible 2012-01-12 01:16:27 +00:00
Richard Alam
afc634dba8 - make sure the config.xml and locale.swf has been loaded before starting all the modules 2012-01-12 00:02:58 +00:00
Richard Alam
a4e5561ea9 - wait for the version from the config.xml and from the locale file before checking if
the locale versions are the same. Sometimes, the locale swf file takes a long time to dowwnload
than the config.xml. When the check is performed, the version from the locale swf file is null.
2012-01-11 21:49:01 +00:00
Richard Alam
bacb88c280 - adding more logs to trace why some times we get the old locale error 2012-01-11 17:00:43 +00:00
Richard Alam
426364c3e1 - fix confusing log when using english locale and it says it failed to load the locale 2012-01-10 20:38:55 +00:00
Richard Alam
92ba8d547f - remove the maximize override as it was not handling the maximize properly... 2012-01-10 19:02:59 +00:00
gugat
b69d521bae Trim presentation name before it is sent to the web server. 2012-01-10 10:35:29 -05: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
3ae110e40b - cleanup logs 2012-01-09 16:45:11 +00: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
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
Richard Alam
34a57089a4 update locale strings to latest from mygengo 2011-12-20 15:49:45 +00: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
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
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
aa2246a639 fixed issue 1081 2011-11-28 14:35:16 -08:00
Markos Calderon
8d120abf44 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-22 14:55:39 -08:00
Markos Calderon
5e03b75150 fix for issue 1080 2011-11-22 14:54:46 -08:00
Richard Alam
140d9a566c provide way to add window on bottom-3rd-lower-right 2011-11-22 13:25:41 -05:00
Richard Alam
aa923319a7 Merge branch 'master' into refactor-chat-client 2011-11-22 15:36:25 +00:00
Richard Alam
53e14101e2 add new layout 2011-11-22 04:06:42 +00:00
Richard Alam
3393fc5b62 add new locales 2011-11-21 15:24:55 -05: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
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
4619dee0c4 Merge branch 'master' into testing-with-red5-trunk 2011-11-16 21:29:20 +00:00
Richard Alam
2f421059bb add option to not show close button for camera view window 2011-11-15 18:23:56 -05: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
Markos Calderon
9476e3b175 added expire time to bbb landing page 2011-11-14 11:26:29 -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
c4949f245d check if we have deskshare window open before closing 2011-11-09 10:07:06 -05: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
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
7abb58d6ce - add onBWDone and onBWCheck for video, voice, and deskshare connections 2011-11-04 14:01:10 +00:00
Richard Alam
2b91c3be7c - implement onBWCheck and onBWDone for connection 2011-11-04 12:53:57 +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
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
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
Richard Alam
542fb60c34 more cleanup and make conference accessible only from manager 2011-10-26 14:55:05 -04:00
Richard Alam
5c6356d381 do cleanup to short circuit some method calls in the client 2011-10-26 14:35:59 -04:00
Richard Alam
def087be2d cleanup as we only use mx components 2011-10-26 10:41:27 -04:00
Richard Alam
431d1cc902 Push some properties as private so that eventually we'll be able to create consistent interfaces
to access and modify users and conference attributes
2011-10-26 10:21:35 -04:00
Richard Alam
00bd22c0d2 some formatting cleanup 2011-10-25 17:45:36 -04:00
Richard Alam
5f0ceeee7a Merge branch 'master' into create-core-of-bbb-client 2011-10-25 17:07:07 -04:00
Richard Alam
b2d56280d6 - strip the userid from the callername and store the callername properly 2011-10-25 17:01:21 -04:00
Richard Alam
a453d6b2c7 remove old UserManager from core 2011-10-25 16:17:30 -04:00
Richard Alam
920a627af9 move UserManager into core 2011-10-25 16:17:04 -04:00
Richard Alam
719d6b5ee0 - fix problem where listners window will display wrong name as data gets cached in listenerItem. When a user leaves and joins
the old value of that listener item gets displayed
2011-10-25 15:51:04 -04:00
Richard Alam
774c6632a5 handle case when user is locked. When clicking the talk button should have no effect. 2011-10-25 10:07:32 -04:00
Felipe Cecagno
08e5dbec7d extracted the strings from publish window to the language file 2011-10-24 22:10:52 -02:00
Felipe Cecagno
0650ae2a14 little enhancement related to the flash privacy box when the user opens the publish window 2011-10-23 23:12:35 -02:00
Richard Alam
4069e5631f Merge branch 'mod-layout' 2011-10-22 17:00:07 -04:00
Richard Alam
e80228aeb1 - allow user to mute/umute herself. ** Locale doesn't work yet. Need to fix ** 2011-10-22 16:58:50 -04:00
Richard Alam
e07efebabc initialize config.xml position for chat and video dock 2011-10-22 14:30:45 -04:00
Richard Alam
90b4f3be8e rename positio constants so we can pass it later using config.xml 2011-10-22 14:30:05 -04:00
Richard Alam
58c9656286 Merge branch 'master' into mod-layout 2011-10-22 14:15:11 -04:00
Richard Alam
e225f8f520 layout video dock and chat windows 2011-10-22 12:07:37 -04:00
Felipe Cecagno
feb57b6e8e start showing some hints to the user about the camera, such as errors when the camera could not be opened, if there is no camera connected, among other things; if it is OK, it will be needed to extract the strings to the localization file 2011-10-21 20:46:07 -02:00
Felipe Cecagno
69f7ca7aa4 start using a timer to listen for any activity from the camera before enabling the start publishing button 2011-10-20 22:55:11 -02:00
Felipe Cecagno
c715e4849e avoiding an unnecessary stop broadcast event when the user open the publish window and then close it before start publishing 2011-10-20 22:53:49 -02:00
Felipe Cecagno
4f86f0308c fixing typo 2011-10-20 22:47:57 -02:00
Richard Alam
83f5895453 Merge branch 'hangout-style' 2011-10-19 16:05:44 -04:00
Richard Alam
8ea135d9ee Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-10-19 09:37:03 -04:00
Felipe Cecagno
9c0126c592 centering the priority window in the available space for it - better distribution of the unused space 2011-10-18 21:16:42 -02:00
Felipe Cecagno
c90a930f37 the layout is working much better with a single click instead of a double click 2011-10-18 20:30:42 -02:00
Localization Server
d09141d0be Updating locale 2011-10-18 17:20:02 +00:00
Felipe Cecagno
8d7285835e quick fix when there is only one window docked 2011-10-17 23:10:57 -02:00
Felipe Cecagno
a99d7aabcf start implementing a layout inside the video dock where a window is prioritized and the others are not. a double-click on the window will make it the bigger than the others 2011-10-17 23:02:25 -02:00
Richard Alam
6cd4b502e7 make enabling acoustic echo cancel configurable 2011-10-17 13:59:48 -07:00
Localization Server
07e6d4570e Updating locale 2011-10-17 00:20:01 +00:00
Localization Server
31993cc824 Updating locale 2011-10-17 00:00:02 +00:00
Localization Server
f3f95bc9ef Updating locale 2011-10-16 23:40:02 +00:00
Richard Alam
f524cfda17 - change locale version 0.8-beta2 2011-10-02 13:53:24 -07:00
Richard Alam
04b87923bf add extra line on end of file so that myenggo doesn't complain when uploading file 2011-10-02 13:35:27 -07:00
Richard Alam
3d37cb3599 Merge branch 'master' into video-preview 2011-10-14 15:54:28 -04:00
Felipe Cecagno
59771566e3 implementing the video preview when the user clicks on the camera icon 2011-10-11 13:53:53 -03:00
Localization Server
31353d9579 Updating locale 2011-10-08 09:00:02 +00:00
Localization Server
89753d85bd Updating locale 2011-10-08 07:20:01 +00:00
Fred Dixon
c3f52dfd69 Reducing the height of the desktop share applet in the iframe from 400 to 1 2011-10-07 14:07:48 -07:00
Fred Dixon
743dd51f5c Reduced height of deskshare applet iframe from 400 to 1 2011-10-07 13:39:38 -07:00
Localization Server
4cf34b1ab7 Updating locale 2011-10-07 20:00:02 +00:00
Richard Alam
51bd29b094 allow embedding of runtime shared lib (RSL) by passing -DSTATIC_RSL=true in ant
ie. ant -DSTATIC_RSL=true
2011-10-06 22:16:40 -04:00
Richard Alam
5d6d4cf87b Merge branch 'set-option-for-voice' 2011-10-06 01:57:07 -04:00
Fred Dixon
3b3764cd34 Set defaults in config.xml for showDebugWindow=false, showVideoLayout=false, showResetLayout=true 2011-10-06 13:25:14 -07:00
Richard Alam
d9eabb813a make checking of audio configurable 2011-10-06 01:56:10 -04:00
Richard Alam
227111e311 add preferene manager 2011-10-06 00:46:17 -04:00
Richard Alam
14ec18fceb minor renaming of how to get config for each module 2011-10-05 23:47:24 -04:00
Richard Alam
cb32d63e49 cleanup debug logs 2011-10-05 18:58:06 -04:00
Richard Alam
42cd903342 missing showHelpButton on template 2011-10-05 18:37:50 -04:00
Richard Alam
10ca54c3ed last one did not work...how about now? 2011-10-05 18:27:04 -04:00
Richard Alam
ce22683508 track down why options is working on local vm but not on remote packaged vm 2011-10-05 18:09:46 -04:00
Richard Alam
e5c03f6a6d init layout from config 2011-10-05 17:43:29 -04:00
Richard Alam
9926a5c83b set default values to true for layout options 2011-10-05 01:26:36 -04:00
Localization Server
fef170ae3e Revert "Updating locale"
This reverts commit 9d528b34e7.
2011-10-05 20:31:08 +00:00
Localization Server
9d528b34e7 Updating locale 2011-10-05 20:20:02 +00:00
Richard Alam
b58908aafc - apply config values to layout when it has been loaded 2011-10-04 23:36:22 -04:00
Richard Alam
bfa964c821 Enable videodock module 2011-10-04 21:45:13 -04:00
Richard Alam
9a88390e11 Use acoustic echo cancellation when user has at least FP 10.3 2011-10-04 19:17:26 -04:00
Richard Alam
7d512f0f5d embed audio file for voice checking 2011-10-04 18:30:23 -04:00
Richard Alam
ef7cf758a5 Change layout options after config.xml has been loaded 2011-10-04 18:02:42 -04:00
Richard Alam
22e540c365 remove hardcoded background colors to make it easier to skin 2011-10-02 22:41:37 -04:00
Richard Alam
f3f7c47110 - add option to hide help button 2011-10-02 20:50:18 -04:00
Richard Alam
7d2bb63c80 show and enable whiteboard for presenter when there is a pre-uploaded presentation 2011-10-02 18:46:05 -04:00
Richard Alam
4b7c6645c9 - set default quality to 50 2011-09-29 23:35:38 -07:00
Felipe Cecagno
a231df2750 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-10-13 13:52:52 -03:00
Felipe Cecagno
46172d2f2e improvements on video dock related to display video windows with aspect ratio different from 4/3 2011-10-13 13:52:27 -03:00
Localization Server
76838e0937 Updating locale 2011-10-13 15:20:01 +00:00
Localization Server
c69aa35826 Updating locale 2011-10-13 14:20:01 +00:00
Richard Alam
e495b1fe31 - enable mic when skipCheck is true. Right now it's false, so it doesn't init mic properly 2011-10-10 22:46:39 -04:00
Localization Server
eac09c4ffa Updating locale 2011-10-11 10:00:02 +00:00
Richard Alam
43c487c5cd Add parameter to maximize video dock window. If publish window is not visible, don't
dock it.
2011-09-28 19:37:52 -04:00
Richard Alam
99d80a97a9 Merge branch 'master' into make-presenter-cam-larger 2011-09-28 14:45:16 -04:00
Richard Alam
79947b1554 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-09-28 14:44:58 -04:00
Richard Alam
7bab790a0c - Allow to configure not to dock presenter webcam.
- Provide ability to configure window dim for video docking
 - Allow to configure to show present window
 - Presenter docking does not handle switch present well.
2011-09-28 14:40:55 -04:00
Fred Dixon
d2bbede932 Turned autoJoin to false to trigger the audio pre-flight checklist 2011-09-27 13:40:38 -07:00
Richard Alam
9c6f1e6988 make presenter's webcam larger than viewers 2011-09-27 15:19:31 -04:00
Richard Alam
a46ffbaf33 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-09-27 11:48:18 -04:00
Localization Server
9a63450aed Updating locale 2011-09-27 05:20:01 +00:00
Localization Server
cdc78b8e7f Updating locale 2011-09-27 01:00:01 +00:00
Richard Alam
6edc2a1241 determine if webcam sharer is presenter 2011-09-26 15:21:20 -04:00
Localization Server
ee05ade531 Updating locale 2011-09-26 19:20:02 +00:00
Localization Server
a74a682a63 Updating locale 2011-09-26 18:00:02 +00:00
Richard Alam
51f8fa0c04 add the expressIinstall.swf file to trigger installing/upgrading of Flash Player if it doesn't meet
minimum requirement
2011-09-26 10:52:11 -04:00
Fred Dixon
f0de2ff7a7 Changed default resolution to 320x240 2011-09-23 20:22:08 -07:00
Fred Dixon
742fba3f01 Fixed typo 2011-09-23 18:20:05 -07:00
Fred Dixon
550c434c35 Edited audio file to play sound immediately 2011-09-23 17:59:44 -07:00
Richard Alam
89d36af226 re-arrange present module dir 2011-09-23 10:45:23 -04:00
Richard Alam
e70784cb14 Removing Persian locale as it is a duplicate for Farsi 2011-09-23 08:56:00 -04:00
Richard Alam
375a37acf6 Fix Issue 1006 (http://code.google.com/p/bigbluebutton/issues/detail?id=1006) 2011-09-23 08:50:53 -04:00
Richard Alam
08a2b38696 add v=VERSION to prevent caching 2011-09-22 17:08:26 -04:00
Richard Alam
e0657cecc8 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-09-22 16:56:26 -04:00
Richard Alam
5ae3ec24d7 modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
Markos Calderon
c5be02158a fixed red5 tunneling 2011-09-22 15:42:40 -05:00
Localization Server
762f2a941b Updating locale 2011-09-22 01:00:02 +00:00
Localization Server
78720adc0f Updating locale 2011-09-21 23:20:02 +00:00
Richard Alam
e6aae4aa80 don't delete locales when running "ant clean" 2011-09-21 16:50:23 -04:00
Richard Alam
3cdeeee709 don't show scrollbars when video is resized 2011-09-21 16:22:49 -04:00
Richard Alam
322a89609f remove options bar at the bottom of publish window 2011-09-21 13:46:56 -04:00
Richard Alam
674916748b Merge branch 'master' into pulling-video-dock 2011-09-21 12:20:48 -04:00
Richard Alam
a30f100ec8 Fix http://code.google.com/p/bigbluebutton/issues/detail?id=1009 2011-09-21 12:16:05 -04:00
Richard Alam
cb115c7f51 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into pulling-video-dock 2011-09-21 10:14:10 -04:00
Richard Alam
345c37ae1b add more comments on build 2011-09-21 10:11:20 -04:00
Localization Server
293ba451e6 Updating locale 2011-09-21 04:20:01 +00:00
Richard Alam
709f1c25cd look into locale directory on what locales to build instead of relying on hardcoded locale string 2011-09-20 18:28:22 -04:00
Richard Alam
faf6520e74 separate building of locales as it takes a long time for the client to build. The steps now are
ant
   ant localization
 Also, fix bundle problem when building locates by adding the required resources. Otherwise, Flash will
 choke when the bundled resource (e.g. effects) hasn't been compiled when loading the locale SWF file.
2011-09-20 14:50:41 -04:00
Richard Alam
163ad1ea54 Merge branch 'master' into pulling-video-dock 2011-09-20 10:14:36 -04:00
Richard Alam
08f1f66b6f center popup windows 2011-09-20 10:12:47 -04:00
Richard Alam
f2253e4878 compile all locales 2011-09-20 09:41:39 -04:00
Richard Alam
a58cbf0973 change size of Help text 2011-09-19 18:03:42 -04:00
Richard Alam
99ffcb9690 add paddings to mic settings window 2011-09-19 17:51:58 -04:00
Richard Alam
11e08ebde2 Merge video docking module from mconf. There are minor bugs which may be due
to using Flex 4.5
2011-09-19 16:40:18 -04:00
Localization Server
47e33e1bd9 Updating locale 2011-09-19 18:00:22 +00:00
Richard Alam
6a5a8c45c5 modify mic setting checklist 2011-09-19 13:32:33 -04:00
Localization Server
5412c44e65 Updating locale 2011-09-19 12:00:02 +00:00
Localization Server
2ca45d038f Updating locale 2011-09-19 11:00:02 +00:00
Localization Server
cea6d536d1 Updating locale 2011-09-18 13:20:02 +00:00
Localization Server
b58b6146b6 Updating locale 2011-09-18 12:00:02 +00:00
Richard Alam
09ceff681d - missed one file in last commit 2011-09-14 07:39:24 -04:00
Richard Alam
1164bb3e8f - setup logout url when user enters instead of when user leaves because when the user clicks on the OK button
on the logout window after one minute, the meeting is gone from bbb-web memory.
2011-09-13 14:34:36 -04:00