bigbluebutton-Github/bigbluebutton-client/resources/prod/lib
Mateus Dalepiane 6bf36d2d86 Merge branch '081-java-detection' into 090-java-detection
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java
2014-09-08 15:06:50 -03:00
..
3rd-party.js - add JS API to querly list of presentations, display a presentation, and delete a presentation 2013-06-11 18:19:35 +00:00
bbb_api_bridge.js sipjs connects to the echo test and stops correctly 2014-08-09 09:38:48 -07:00
bbb_api_cam_preview.js - start putting avatar into webcam standalone apps 2013-05-25 15:55:13 +00:00
bbb_api_cam_view.js - start putting avatar into webcam standalone apps 2013-05-25 15:55:13 +00:00
bbb_blinker.js upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications 2014-07-11 13:32:04 -07:00
bbb_deskshare.js Merge branch '081-java-detection' into 090-java-detection 2014-09-08 15:06:50 -03:00
bbb_localization.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
bbb_webrtc_bridge_sip.js Add stun server to get FF to work behind firewall 2014-08-16 13:36:46 -04:00
bbblogger.js - trye to figure out why voice toolbar button gets stuck in Chrome 2014-08-27 09:16:43 -07:00
bigbluebutton.js swapped jssip for sipjs, cleaned up the webrtc events, changed instances of Rtc to RTC 2014-08-08 13:19:38 -07:00
deployJava.js modified deployJava to embed tags inside a hidden div; also, only embed the test plugin when the user tries to share his desktop 2014-05-19 14:51:34 -03:00
jquery-1.5.1.min.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
jssip-0.3.7.js reverted jssip back to 0.3.7 and fixed chrome webrtc 2014-07-21 10:25:08 -07:00
sip-0.6.1.js swapped jssip for sipjs, cleaned up the webrtc events, changed instances of Rtc to RTC 2014-08-08 13:19:38 -07:00