BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,249 Commits 13 Branches 260 Tags 1.1 GiB
d1e80464d8
Commit Graph

5249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
d43b7488ce Merge branch 'master' into view-publish-webcam-stanalone 2012-12-14 21:04:06 +00:00
Richard Alam
1dca7b19bf Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-12-14 21:02:53 +00:00
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
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
Felipe Cecagno
4ad891293c now you can specify &t=0h0m0s on the playback url so the presentation will start from there just like on youtube; also fixed the generation of thumbnails, that was not working properly 2012-12-06 21:31:48 -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