BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
019cfa6cfb
bigbluebutton-Github/bigbluebutton-client/resources/prod/lib
History
Felipe Cecagno 019cfa6cfb Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
2016-01-04 15:14:27 -02:00
..
3rd-party.js - Added new EmojiGrid component. 2015-08-27 21:31:46 +01:00
bbb_api_bridge.js Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 2015-11-25 15:58:36 +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 Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge 2015-11-25 15:58:36 +00:00
bbb_deskshare.js Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf 2016-01-04 15:14:27 -02:00
bbb_localization.js modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
bbb_webrtc_bridge_sip.js Merge remote-tracking branch 'bigbluebutton/master' into mconf 2015-12-30 18:35:13 -02: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
jsnlog.min.js - Added JSNLogTarget for jsnlog library. ( still experimental because too slow ). 2015-07-21 05:39:36 +01:00
shared_notes.js Merge branch 'master' into sharedNotes0.8 2012-02-17 14:04:31 -02:00
sip.js fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0 2015-11-30 01:06:38 -02:00
weburl_regex.js improved the chat url regex 2015-03-27 14:32:27 -07:00