BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,982 Commits 13 Branches 260 Tags 1.1 GiB
36af827f9b
Commit Graph

4982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fred Dixon
c77586d993 Merge pull request #79 from capilkey/update-popcorn 
updated popcorn.js to 1.3
 2012-12-08 08:18:57 -08:00
Chad Pilkey
9df127d339 updated popcorn.js to 1.3 2012-12-08 11:14:38 -05: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
Richard Alam
689e684093 Merge pull request #76 from capilkey/remember-security-settings 
security settings now allows you to save your choice
 2012-12-06 13:27:25 -08: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
7ea06bd512 - add defaultAvatarURL property 2012-12-04 19:09:03 +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
Gustavo Salazar
821e8c823d fix 'clear page' action in playback 2012-11-28 11:42:25 -05:00
Gustavo Salazar
8f973cd1f4 fix playback of whiteboard for slides in 'portrait' mode 2012-11-27 17:41:14 -05:00
Richard Alam
8edcce38c1 - figure out why we can't close windows properly 2012-11-27 22:19:35 +00:00