bigbluebutton-Github/bbb-api-demo
Felipe Cecagno e4da408c08 Merge branch 'mconf' into bigbluebutton/bigbluebutton@master
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
	bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
	record-and-playback/presentation/playback/presentation/0.9.0/playback.html
	record-and-playback/presentation/scripts/publish/presentation.rb
2016-03-02 01:19:09 -03:00
..
src/main/webapp Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 2016-03-02 01:19:09 -03:00
.gitignore fixed problem with demo10 2011-11-17 10:32:15 -08:00
build.gradle After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
demo.nginx Add configuration for nginx for breaking out API demos into their own package 2011-07-03 12:17:58 -07:00
pom.xml After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
README Remove target folder 2011-06-17 18:12:31 +00:00

Steps:

gradle resolveDeps

gradle build

sudo rm -rf /var/lib/tomcat6/webapps/demo*

sudo cp build/libs/demo.war /var/lib/tomcat6/webapps/

sudo service tomcat6 restart