Commit Graph

1758 Commits

Author SHA1 Message Date
Felipe Cecagno
f31a26bcf3 fixing the default layout - when the screen is big, the default position of the videodock is just below the chat window; also the three window position on the left has been improved
there are some modifications related specifically to the shared notes module, but the core of the implementation is generic and could be patched to upstream
2012-03-13 16:33:07 -03:00
firstuser
ff493885c9 Merge branch 'master' into sharedNotes0.8 2012-03-12 12:26:54 -03: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
Felipe Cecagno
334ed6db81 Merge branch 'master' into sharedNotes0.8
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/html-template/index.template.html
	bigbluebutton-client/html-template/sharednotes/diff_match_patch_uncompressed.js
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
2012-02-17 14:04:31 -02: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