Commit Graph

2313 Commits

Author SHA1 Message Date
Richard Alam
7d4f4b849c - show example on how to use webcam standalone apps 2012-12-14 21:02:05 +00:00
Richard Alam
1cd749290b - clear video holder when presenter stops sharing video 2012-12-14 21:01:17 +00:00
Richard Alam
2294c6300e - view presenter webcam stream in standalone app 2012-12-14 20:24:52 +00:00
Richard Alam
f6ecdcf775 - preview webcam in standalone app 2012-12-14 20:03:30 +00:00
Chad Pilkey
bfb6126395 fixing another unreported error that made a viewers slide viewport's width distorted 2012-12-14 12:03:23 -05:00
Richard Alam
06bc130895 - implement view webcam standalone 2012-12-14 16:47:30 +00:00
Richard Alam
30911ef181 Merge branch 'master' into view-publish-webcam-stanalone
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/EventConstants.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/maps/ExternalApiEventMap.mxml
2012-12-14 16:17:32 +00:00
Richard Alam
2a8f3b7e55 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-12-14 15:32:51 +00:00
Richard Alam
1c2908911f Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-12-14 15:32:32 +00:00
Richard Alam
25d46134bb - add example API to query if user is presenter 2012-12-14 15:32:08 +00:00
Richard Alam
46b54043c1 - add API to query if user is presenter 2012-12-14 15:31:21 +00:00
Richard Alam
5ca219523e - add webcam view standalone app 2012-12-13 21:02:44 +00:00
Richard Alam
c271c6507d - cleanup 2012-12-13 20:10:25 +00:00
Richard Alam
5d26986064 - cleanup 2012-12-13 19:52:00 +00:00
Richard Alam
32e387ed1d - display webcam preview 2012-12-13 19:50:44 +00:00
Chad Pilkey
0b076b4f13 fix presentation panning issue when presentation is higher then wide and the PresentationWindow is too small to fit the slide 2012-12-13 13:13:09 -05:00
Richard Alam
36af827f9b Merge branch 'master' into view-publish-webcam-stanalone 2012-12-13 17:15:47 +00:00
Richard Alam
52a5c6cc46 Merge branch 'network-stats' into merge-bw-stats
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2012-12-12 21:26:31 +00:00
Richard Alam
0b4527ab2b Merge branch 'network-stats' into merge-bw-stats
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2012-12-12 20:41:13 +00:00
Richard Alam
129c4f1aff - fix compile problem 2012-12-12 20:20:42 +00:00
Richard Alam
9d2277d214 Merge branch 'master' into view-publish-webcam-stanalone
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
2012-12-12 20:06:55 +00:00
Richard Alam
9967668158 - add apis to switch presenter, stop webcam, and leave voice conf 2012-12-12 19:33:33 +00:00
Richard Alam
73906c0acd - add sample api calls for switch presenter, stop sharing cam, and leave voice conf 2012-12-12 19:21:09 +00:00
Richard Alam
b3b03ba9ab - add JS API to preview and view camera 2012-12-11 21:54:51 +00:00
Richard Alam
c95e8470d4 - add api call when user is sharing webcam 2012-12-11 21:32:31 +00:00
Richard Alam
710901a745 - add query cam settings API 2012-12-11 19:55:05 +00:00
Richard Alam
565fe826c1 - provide API to query if presenter or not 2012-12-10 22:32:43 +00:00
Felipe Cecagno
1523774a1c the NetworkStatsWindow is already presenting the measured bandwidth up/down between client and server; still need to figure out a better way to present the window into the screen 2012-12-08 18:45:00 -02:00
Felipe Cecagno
b4f36b894c Merge branch 'add-some-bandwidth-monitoring' of git://github.com/bigbluebutton/bigbluebutton into network-stats
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2012-12-08 14:36:10 -02:00
Felipe Cecagno
bc9457bba2 created the model NetworkStatsData to hold all the network data, and made the display window to retrieve the data from this model 2012-12-08 13:55:52 -02:00
Felipe Cecagno
b5ae953c1e reverted some unwanted changes done during the merge; fixed the total bytes counter 2012-12-07 17:35:14 -02:00
Richard Alam
bb4caf1d5b - try adding some bw monitoring 2012-12-07 19:20:55 +00:00
Felipe Cecagno
4bed1f8fb6 Merge branch 'master' into network-stats
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2012-12-07 14:32:47 -02:00
Richard Alam
8c20098ae9 - import red5's BW detection sample 2012-12-06 23:17:37 +00:00
Richard Alam
c89944fb0a - fix error on toolbar 2012-12-06 21:58:57 +00:00
Richard Alam
1bc06e96df - allow user to set Flash to remember choice when asking permission to access the mic 2012-12-06 21:42:24 +00:00
Richard Alam
8ae85e9dd4 - try to display webcam preview in standalone app 2012-12-06 21:29:41 +00:00
Chad Pilkey
12ddd20b5f security settings now allows you to save your choice 2012-12-06 16:22:48 -05:00
Richard Alam
1fd4504613 - build a webcam preview standalone app 2012-12-06 20:23:03 +00:00
Richard Alam
3284adb4f4 - Change how chat messages are displayed 2012-12-06 16:46:48 +00:00
Richard Alam
86c45f8051 - fix problem where user is seen as talking when muted 2012-12-06 15:47:59 +00:00
Richard Alam
1754feea5d - try positioning the control buttons properly on startup 2012-12-04 19:49:29 +00:00
Richard Alam
3604c95601 Merge branch 'master' into display-avatar-when-cam-is-not-on 2012-12-04 19:16:53 +00:00
Richard Alam
50aa8dfd24 - add option to enable displaying of avatar 2012-12-04 19:09:45 +00:00
Richard Alam
4398ddf2c4 - clean up 2012-12-04 19:01:23 +00:00
Richard Alam
0430b30c8e - stop publishing when requested from the toolbar button 2012-12-03 22:15:06 +00:00
Richard Alam
f4ff05856a - add JS api to share webcam 2012-12-03 21:23:29 +00:00
Richard Alam
d6377fe89e - create stanalone app to publish or view presenter's webcam 2012-12-03 21:22:57 +00:00
Richard Alam
ae63f3779e - stop publishing if presenter only options is enabled and the user has become viewer 2012-12-03 19:18:01 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Richard Alam
12992be997 - get avatar window to maintain aspect ratio 2012-11-29 21:54:40 +00:00
Richard Alam
ec5263f0ef - fix problem where avatar window for another is being closed 2012-11-29 21:38:16 +00:00
Richard Alam
31180430ff - don't remove all windows when trying to figure out if the window needs to be removed or not 2012-11-29 18:50:38 +00:00
Richard Alam
ab3d940811 - fix some exceptions when user is joining 2012-11-29 18:28:31 +00:00
Richard Alam
91435ed304 - view webcam when clicking on webcam icon in viewer's window 2012-11-28 22:28:58 +00:00
Richard Alam
c12d5e2582 - don't send stop webcam several times 2012-11-28 20:49:50 +00:00
Richard Alam
7f5befa9bc - view user's webcam 2012-11-28 20:42:24 +00:00
Richard Alam
dcebccf54c - move things around 2012-11-28 19:31:02 +00:00
Richard Alam
217d923e2a - stop publishing when closing webcam...the camera now turns off. 2012-11-28 18:19:35 +00:00
Richard Alam
8edcce38c1 - figure out why we can't close windows properly 2012-11-27 22:19:35 +00:00
Richard Alam
9a645910be - display publish window with correct aspect ratio 2012-11-27 18:42:19 +00:00
Richard Alam
1b3e3e5332 - display publish window 2012-11-27 18:25:44 +00:00
Richard Alam
56cd5f78ec - display webcam preview in modal dialog 2012-11-27 16:57:18 +00:00
Richard Alam
59527aa5e8 - close publish window and open avatar window 2012-11-26 22:12:14 +00:00
Richard Alam
3386b744f6 - remove avatar when publishing 2012-11-26 21:51:03 +00:00
Richard Alam
779a44d07b - open avatar, publish, view windows 2012-11-26 21:10:31 +00:00
Richard Alam
b519750e24 - adding more logs to mute/unmute events 2012-11-26 17:24:19 +00:00
Richard Alam
ecb1f45141 - open view window 2012-11-26 16:30:43 +00:00
Richard Alam
23f3157315 - open avatar window 2012-11-23 22:06:19 +00:00
Richard Alam
4d4cbeee79 - start video module when video dock is ready 2012-11-23 21:37:20 +00:00
Richard Alam
7485de0c74 - remove building unneeded modules 2012-11-23 21:25:22 +00:00
Richard Alam
d0bba49293 - enable debugging 2012-11-23 21:20:15 +00:00
Richard Alam
e03cbdf17c - override measure on List class to see if it can calculate the height of the list properly 2012-11-22 14:47:11 +00:00
Richard Alam
0425dae9da - try to fix scrollbar on chat 2012-11-21 21:24:48 +00:00
Richard Alam
5ca6267e69 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-11-21 19:12:22 +00:00
Richard Alam
4f0d516fe0 - send user mute, locked, and join/leave events 2012-11-21 19:11:27 +00:00
Richard Alam
65c835a761 - add listener for voice mute, join/leave, and locked 2012-11-21 19:10:46 +00:00
Richard Alam
082e5ec057 - dispatch event on mute and unmute listener 2012-11-20 20:29:53 +00:00
Richard Alam
c63b312d55 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-11-20 20:22:32 +00:00
Richard Alam
200d770b4f - add JS api to query user id 2012-11-20 20:20:12 +00:00
Richard Alam
16a528ad57 - store meetingID and meeting name 2012-11-20 20:17:41 +00:00
Richard Alam
e67465afc7 - add JS api to query user's id 2012-11-20 19:58:47 +00:00
Richard Alam
787e1de310 - pass external meeting id to the client and provide JS api to query it 2012-11-20 19:30:08 +00:00
Richard Alam
fa35d4bfca - add sample to query meeting id 2012-11-20 19:27:23 +00:00
Richard Alam
763573319c - remove ability to drag webcam window from inside video dock 2012-11-13 18:45:53 +00:00
Richard Alam
1921fc96db - add avatar icon 2012-11-13 18:45:25 +00:00
Richard Alam
e63bbfc449 - pass defaultLayout in join api call 2012-11-12 21:05:23 +00:00
Richard Alam
6adf6b516e Merge branch 'master' into send-receive-chat-from-js-api 2012-11-07 16:13:35 +00:00
Richard Alam
f3df5b1a7c Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-05 22:30:05 +00:00
Richard Alam
817ceac330 - sample layout with window hidden 2012-11-05 22:29:27 +00:00
Richard Alam
28ae96961d - hide window marked hidden in layout 2012-11-05 22:29:03 +00:00
Fred Dixon
e2b446c0e0 Fixed include in BigBlueButton.html to point to correct file: bbb_api_bridge.js 2012-11-05 13:41:14 -05:00
Richard Alam
177ff0a753 - add switch presentation button 2012-11-02 17:09:34 +00:00
Richard Alam
b1800200fa - add present layout 2012-11-01 21:08:00 +00:00
Richard Alam
2af0b5cb22 - add tooltips for control buttons 2012-11-01 20:33:31 +00:00
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