Mateus Dalepiane cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/BigBlueButton.mxml bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml		2014-08-26 17:20:00 -03:00
..
check	- try checking for desktop sharing port	2013-04-19 21:30:54 +00:00
js	- add require.js lib	2012-10-24 22:15:51 +00:00
lib	- stop sharing from server side instead of destroing the applet from the client side	2014-08-24 12:12:29 -07: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
bbb-deskshare-applet-0.9.0.jar	- initiate closing of applet from server side	2014-08-24 13:04:08 -07:00
bbb-deskshare-applet-unsigned-0.9.0.jar	- initiate closing of applet from server side	2014-08-24 13:04:08 -07:00
bbb.gif	- move resource files needed for production the prod folder	2010-07-04 11:28:42 -04:00
BigBlueButton.html	changed a jssip filename to sipjs	2014-08-09 12:46:53 -07: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	removed the speed indicator from mxml, styled the layout selector, changed the default layout from 'Default' to 'Default Layout'	2014-08-10 20:22:23 -07:00
locales.xml	show Welsh in the client interface	2013-10-09 20:29:50 +00:00
profiles.xml	Implementation done during the 2nd BigBlueButton Hackfest on April 2013; implemented the concept of video profiles - the sysadmin can specify in a XML file the video profiles that the users will use to broadcast video; it includes width, height, key interval, fps, enableH264 among other parameters; a hack was done to enable the user subscribe to a different profile than the one that is being broadcasted - on the server-side there will be a transcoder component that will handle this kind of subscription	2013-04-28 18:18:17 -04:00