bigbluebutton-Github/bigbluebutton-client/resources/prod/lib
Pedro Beschorner Marin 2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
2017-07-11 20:41:38 +00:00
..
3rd-party.js adjust ExternalApiCalls for multiple recovered cams 2017-03-01 13:56:10 -05:00
adapter.js Squashed commits for displaying WebRTC stats inside the Flex client. 2017-04-10 11:16:46 +01:00
bbb_api_bridge.js Merge tag 'v1.1.0' into 1.1-transcode 2017-06-13 17:44:12 +00: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 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
bbb_localization.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
bbb_screenshare.js - screenshare client 2016-02-10 19:43:38 +00:00
bbb_webrtc_bridge_sip.js Merge tag 'v1.1.0' into 1.1-transcode 2017-06-13 17:44:12 +00:00
bbblogger.js remove disclaimer from bbblogger.js 2015-02-24 11:36:41 -08:00
bigbluebutton.js removed unused functions from JS 2016-02-08 13:07:08 -08:00
diff_match_patch_uncompressed.js Merge branch 'master' into sharedNotes0.8 2012-02-17 14:04:31 -02:00
getStats.js Squashed commits for displaying WebRTC stats inside the Flex client. 2017-04-10 11:16:46 +01:00
jquery-1.5.1.min.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
jquery-2.1.1.min.js add the rest of the req'd libs 2015-07-15 15:23:27 +00:00
jquery.cookie.js add the rest of the req'd libs 2015-07-15 15:23:27 +00:00
jquery.dataTables.min.js add the rest of the req'd libs 2015-07-15 15:23:27 +00:00
jquery.json-2.4.min.js add the rest of the req'd libs 2015-07-15 15:23:27 +00:00
jquery.mobile.min.js add the rest of the req'd libs 2015-07-15 15:23:27 +00:00
jsnlog.min.js - Added JSNLogTarget for jsnlog library. ( still experimental because too slow ). 2015-07-21 05:39:36 +01:00
kurento-extension.js Fixed ending methods for kurento-extension 2017-07-10 20:51:37 +00:00
kurento-utils.min.js Added first prototype of Kurento WebRTC screenshare client module 2017-06-13 20:18:21 +00:00
shared_notes.js Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
sip.js Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
verto_extension.js Hangup and reconnect safely 2017-07-07 17:27:28 -04:00
verto-min.js Overwrites popup function 2017-05-15 12:16:30 -04:00
webrtc_stats_bridge.js Update webrtc stats bridge for modern Chrome/Firefox APIs 2017-05-05 11:22:38 -04:00
weburl_regex.js improved the chat url regex 2015-03-27 14:32:27 -07:00