BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
00dedc4396
bigbluebutton-Github/bigbluebutton-client/resources/prod
History
Felipe Cecagno 2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	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/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2015-01-21 18:11:56 -02:00
..
lib Merge branch '090-encrypted-recording' into mconf-live0.6.2 2015-01-21 18:11:56 -02: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 - new signed applet valid until oct 30, 2015 2014-10-23 19:55:43 +00:00
bbb-deskshare-applet-unsigned-0.9.0.jar - new signed applet valid until oct 30, 2015 2014-10-23 19:55:43 +00:00
bbb.gif - move resource files needed for production the prod folder 2010-07-04 11:28:42 -04: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 Merge branch '090-multinotes' into mconf-live0.6.1 2014-12-02 20:04:23 -02: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 '090-multinotes' into mconf-live0.6.1 2014-12-02 20:04:23 -02: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