bigbluebutton-Github/bigbluebutton-client/resources/prod/lib
Felipe Cecagno c79be37591 Merge branch 'mconf-live0.6.4' into base-for-0.6.4
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
2015-06-22 17:18:26 -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 make client check compatible with v0.9.0-release 2015-05-26 17:03:33 -03: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-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release 2015-05-17 19:25:26 -03:00
bbb_deskshare.js Merge branch 'mconf-live0.6.4' into base-for-0.6.4 2015-06-22 17:18:26 -03:00
bbb_localization.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
bbb_webrtc_bridge_sip.js Merge branch 'mconf-live0.6.4' into base-for-0.6.4 2015-06-22 17:18:26 -03:00
bbblogger.js remove disclaimer from bbblogger.js 2015-02-24 11:36:41 -08: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 cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code 2015-05-17 23:08:41 -03: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
shared_notes.js Merge branch 'master' into sharedNotes0.8 2012-02-17 14:04:31 -02:00
sip.js Added a timer to control ICE gathering process 2015-04-24 14:11:17 -03:00
weburl_regex.js improved the chat url regex 2015-03-27 14:32:27 -07:00