BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
324ed1b9ab
bigbluebutton-Github/bigbluebutton-client/resources/prod
History
Pedro Beschorner Marin 324ed1b9ab Merge branch 'auto-reconnect' into mconf-live0.6.4 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
2015-07-03 14:35:08 +00:00
..
lib Merge branch 'mconf-live0.6.4' into base-for-0.6.4 2015-06-22 17:18:26 -03:00
swfobject modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
3rd-party.html - add JS API to querly list of presentations, display a presentation, and delete a presentation 2013-06-11 18:19:35 +00:00
avatar.png - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
background.jpg replaced logo and background image 2014-10-05 15:53:50 -03:00
bbb-deskshare-applet-0.9.0.jar Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.6.4 2015-06-19 15:11:13 -03:00
bbb-deskshare-applet-unsigned-0.9.0.jar Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.6.4 2015-06-19 15:11:13 -03:00
bbb.gif new deskshare applet signed by RNP, with Mconf logo 2015-06-19 14:50:30 -03:00
BigBlueButtonTest.html - play around with melomel 2011-07-21 17:22:25 +00:00
DeskshareStandalone.html - update deskshare standlone html 2012-04-24 22:20:12 +00:00
EmbedBigBlueButton.html - add sample embed html 2012-08-05 22:14:01 +00:00
example-info-data.xml - missed one file 2010-07-04 11:37:05 -04:00
expressInstall.swf modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00
layout.xml updated default layouts definition 2015-05-24 20:07:18 -03:00
locales.xml show Welsh in the client interface 2013-10-09 20:29:50 +00:00
logo.png replaced logo and background image 2014-10-05 15:53:50 -03:00
MconfLive.html Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release 2015-05-17 19:25:26 -03:00
mconftec.png refactored the autoreconnect capability 2015-05-08 12:43:25 -03:00
profiles.xml simplified the default profiles 2015-01-28 22:53:56 -02:00