BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8702b42def
bigbluebutton-Github/bigbluebutton-client/resources/prod/lib
History
Chad Pilkey 8702b42def Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2013-02-19 13:45:50 -05:00
..
3rd-party.js - add sample on how to query the presenter user id 2013-02-13 17:05:05 +00:00
bbb_api_bridge.js - add JS API to query for presenter user id 2013-02-13 17:05:59 +00:00
bbb_api_cam_preview.js - preview webcam in standalone app 2012-12-14 20:03:30 +00:00
bbb_api_cam_view.js - preview webcam in standalone app 2012-12-14 20:03:30 +00:00
bbb_blinker.js Pulled in upstream changes; now there's a crazy focus bug. Trying to figure that out. 2013-02-04 18:43:27 +00:00
bbb_deskshare.js updating deskshare applet 2013-01-28 14:01:29 -05:00
bbb_localization.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
bigbluebutton.js Better descriptions for rest of whiteboard buttons. Added button to focus into the flash content. 2012-11-28 11:04:26 -05:00
deployJava.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
jquery-1.5.1.min.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00