Commit Graph

5221 Commits

Author SHA1 Message Date
Richard Alam
e215dfa34d - fix problem where drawing scribbles doesn't store history 2012-11-01 19:38:22 +00:00
Richard Alam
bb20a2a7f9 Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-01 19:38:11 +00:00
Richard Alam
7f8d4f5df5 - add a way to lock unlock layout from JS API 2012-11-01 19:37:34 +00:00
Richard Alam
6bb0920988 Merge branch 'send-receive-chat-from-js-api' of git://github.com/bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-01 18:46:30 +00:00
Richard Alam
3265e6c2a1 - add example in 3rd party html to lock unlock layout 2012-11-01 18:45:51 +00:00
Richard Alam
c85ae5b760 - add options in config.xml to display the webcam controls 2012-11-01 17:46:43 +00:00
Richard Alam
69a9e980e4 - show control buttons for presenter only 2012-10-31 20:50:32 +00:00
Fred Dixon
4035b4a732 The command now counts the number of slides using either the raw or presentation dir 2012-10-30 21:19:10 -04:00
Fred Dixon
b5abbd803a Added check to to check for mismatch salt in bbb-lti 2012-10-30 21:10:48 -04:00
Richard Alam
647ffdc602 Merge branch 'master' into send-receive-chat-from-js-api 2012-10-30 18:24:54 +00:00
Richard Alam
72e71e9664 - change chat icon 2012-10-30 17:44:11 +00:00
Richard Alam
085b7c35cb - use event to start private chat 2012-10-30 17:30:08 +00:00
Richard Alam
cfcaed82f1 - add a way to start private chat from webcam window 2012-10-30 17:12:54 +00:00
Richard Alam
e583c3d603 - embed scala lib 2012-10-30 16:27:19 +00:00
Richard Alam
aae0fa1d33 - glow when user if talking 2012-10-30 16:14:59 +00:00
Gustavo Salazar
99ef5f4875 Increase z-index of cursor in playback 2012-10-30 10:56:38 -05:00
Richard Alam
00f4cefca1 - inject conn invoker 2012-10-30 14:08:26 +00:00
Richard Alam
9c57e83796 - try to consolidate apps 2012-10-30 14:08:05 +00:00
Richard Alam
d3f1c22e46 - try to consolidate apps 2012-10-30 14:07:43 +00:00
Richard Alam
2d6d1f83c5 - cleanup 2012-10-29 19:52:37 +00:00
Richard Alam
4b2bbb0cf8 - cleanup chat 2012-10-29 19:40:56 +00:00
Fred Dixon
07c03f487b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-10-29 15:01:37 -04:00
Fred Dixon
5e7ff61630 Update lti.properties so the correct defaults can be set by the bbb-lti package 2012-10-29 15:01:32 -04:00
Fred Dixon
83db16c293 Added support in bbb-conf to change hostname for LTI integration 2012-10-29 14:53:37 -04:00
Richard Alam
b74f778287 Merge branch 'master' into add-more-controls-to-webcam-window 2012-10-29 18:52:56 +00:00
Richard Alam
24fab2c5d9 - fix problem where previous whiteboard shape gets deleted 2012-10-29 18:52:03 +00:00
Richard Alam
6bfcb151a9 - add talking icon on viewer's cam window 2012-10-29 16:26:34 +00:00
Richard Alam
488565ce32 - add talking indicator in webcam video 2012-10-29 15:57:34 +00:00
Richard Alam
8fc5de26f5 - allow ejecting of user from webcam controls 2012-10-29 15:19:14 +00:00
Richard Alam
e199c0993c - allow manage of publishere from webcam window 2012-10-29 14:51:50 +00:00
Fred Dixon
453ad13864 Added nginx configuration for LTI 2012-10-28 21:54:15 -04:00
Fred Dixon
db02664be3 bbb-conf --check now checks for bbb-lti package 2012-10-28 21:51:26 -04:00
Fred Dixon
f93c605149 Updated bbb-conf to detect if LTI package (bbb-lti) is installed and output configuration values with 'bbb-conf --lti' 2012-10-28 17:58:34 -04:00
Fred Dixon
be2ee5cf6b modified lti.properties to have default values 2012-10-28 17:34:38 -04:00
Richard Alam
f5550549ce - hook events to webcam 2012-10-28 21:04:35 +00:00
Fred Dixon
3bf5d931ed Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-10-28 16:31:58 -04:00
Richard Alam
eb3e1cbc5b - switch presenter from webcam window 2012-10-28 19:56:34 +00:00
Fred Dixon
02af99a3d8 Updates to build.xml to get lti to build under script 2012-10-28 15:25:17 -04:00
Richard Alam
223802cd29 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-10-28 18:35:24 +00:00
Fred Dixon
79cc2379d5 bbb-apps-vide now records video by default 2012-10-28 13:11:53 -04:00
Richard Alam
028db2282e Merge branch 'master' into send-receive-chat-from-js-api 2012-10-28 16:55:59 +00:00
Richard Alam
d5b14ccb39 - cleanup 2012-10-28 15:56:03 +00:00
Richard Alam
4b22fbbd3b - display users 2012-10-28 15:41:08 +00:00
Richard Alam
2b92bf0dd6 - still can't get users to display...to be continued. 2012-10-26 23:01:55 +00:00
Richard Alam
a894397999 - still trying to display users 2012-10-26 22:22:59 +00:00
Richard Alam
3f64313fff - try to display users when new user join...still trying to figure why it won't 2012-10-26 20:22:19 +00:00
Gustavo Salazar
93a1f2f2a1 Increase height of text box in playback 2012-10-26 14:15:11 -05:00
Gustavo Salazar
66e8fbbdbb Draw squares properly in the playback 2012-10-26 13:44:06 -05:00
Richard Alam
b8e8a2d069 - display flash client between users and chat 2012-10-26 18:07:43 +00:00
Richard Alam
cb722385ac - display flash client inside html 2012-10-26 15:11:06 +00:00