bigbluebutton-Github/bbb-api-demo
Richard Alam a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
..
src/main/webapp Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 2018-06-06 08:23:13 -07: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