4205 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Richard Alam	bd368125d3	Merge branch 'master' into implement-fit-to-width	2012-02-28 17:25:05 +00:00
Fred Dixon	16ffb35595	bbb-conf and bbb-record now print the current BigBlueButton version defined in /etc/bigbluebutton/bigbluebutton-release	2012-02-28 10:06:29 -05:00
Richard Alam	b9fca184f0	- change how to do ftw and zooming	2012-02-28 13:01:22 +00:00
Fred Dixon	6e507f89f0	Minor edits	2012-02-27 19:10:18 -05:00
Fred Dixon	d9b3c8281f	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton	2012-02-27 18:41:24 -05:00
Fred Dixon	96777c07ec	Added icons for fit-to-page and fit-to-width	2012-02-27 18:41:15 -05:00
Fred Dixon	d2a8499719	Merge pull request #25 from gugat/issue1143 ... Convert timestamp to float so when dividing the result will contain	2012-02-27 10:44:25 -08:00
Fred Dixon	b534994eec	Merge pull request #27 from gugat/issue1163 ... Create Matterhorn logs in their own directory.	2012-02-27 10:43:28 -08:00
Gustavo Salazar	940f080d60	Create Matterhorn logs in their own directory.	2012-02-27 13:33:22 -05:00
Fred Dixon	520ed6ba82	Merge pull request #26 from gugat/issue1162 ... Delete just one recording using bbb-record.	2012-02-27 09:33:54 -08:00
Gustavo Salazar	d07efdc0fa	Delete just one recording using bbb-record.	2012-02-27 11:40:35 -05:00
Fred Dixon	31a8332eb2	Added --check and --debug to bbb-record	2012-02-26 15:00:37 -05:00
Fred Dixon	f55f62d23b	More updates to setting up the development environemnt. Now works on any user account on BigBlueButon server. Account must have sudo priviledges	2012-02-25 20:35:58 -05:00
Fred Dixon	2889856d77	Removed code to use default .pdf file for examples as BigBlueButton now has a server-wide default pdf file	2012-02-25 20:35:13 -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
Markos Calderon	d7a08aced2	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton	2012-02-23 16:19:07 -08:00
Markos Calderon	cd584ba6ef	fix for end meeting	2012-02-23 16:18:40 -08: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
Fred Dixon	1f2ded16f7	Modifications to bbb-conf to setup development environment for client on any account.	2012-02-23 13:52:13 -05: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	742df4e50a	testing updates to steps to simplify setting up the development environment	2012-02-22 17:33:22 -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
Fred Dixon	fe61d3e7d5	Saving of desktop sharing video defaults to false (not needed for built-in slides)	2012-02-19 15:20:52 -05:00
Fred Dixon	cef4401df5	Updated error checking in bbb-record and error messages in bbb-conf	2012-02-19 12:34:21 -05:00
Fred Dixon	60675c5ca1	reformatted XML so <beans ...> is on a single line. This enables bbb-playback-matterhorn to enable recording using xmlstarlet	2012-02-18 16:32:47 -05:00
Fred Dixon	b566041eb7	Turn off recording of desktop and webcams by default	2012-02-18 14:14:08 -05:00
Gustavo Salazar	6c85a36005	Convert timestamp to float so when dividing the result will contain ... decimals	2012-02-17 13:02:52 -05:00