BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12f7aacf4b
bigbluebutton-Github/bigbluebutton-client/resources/prod/lib
History
Felipe Cecagno 12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
2014-12-09 16:52:43 -02: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 improved the client check so now it uses sip.js and bbb_webrtc_bridge_sip.js from the bigbluebutton-client, so it's going to be easier to maintain; included some new callbacks on bigbluebutton-client related to the websockets; just after the webrtc test, the connection is closed 2014-11-16 19:53:37 -02: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 Merge branch 'mconf-branding-0.81' into 090-mconf-branding 2014-10-05 19:36:43 -03:00
bbb_deskshare.js - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1830 2014-12-02 10:54:21 -08:00
bbb_localization.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
bbb_webrtc_bridge_sip.js improved the client check so now it uses sip.js and bbb_webrtc_bridge_sip.js from the bigbluebutton-client, so it's going to be easier to maintain; included some new callbacks on bigbluebutton-client related to the websockets; just after the webrtc test, the connection is closed 2014-11-16 19:53:37 -02: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
diff_match_patch_uncompressed.js Merge branch 'master' into sharedNotes0.8 2012-02-17 14:04:31 -02: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
shared_notes.js Merge branch 'master' into sharedNotes0.8 2012-02-17 14:04:31 -02:00
sip.js added a SDP hack for Firefox to replace the 0.0.0.0 in the c line 2014-11-11 03:52:11 -08:00