bigbluebutton-Github/bigbluebutton-web
Richard Alam 19694d87e0 Merge branch 'master' into record-and-playback-feature
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
2011-04-04 11:15:09 -04:00
..
.settings - refactor presentation classes from groovy to java...java has better tool support for eclipse 2009-12-22 21:06:23 +00:00
agi/scripts - bringing bigbluebutton-web into trunk 2009-04-01 16:53:45 +00:00
grails-app Merge branch 'master' into record-and-playback-feature 2011-04-04 11:15:09 -04:00
lib - fix logging when deployed to tomcat 2010-01-07 17:29:12 +00:00
plugins - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
scripts Web service update for Additional filetype support 2009-11-11 00:43:39 +00:00
src some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
test fixes issue #473 2010-05-12 18:44:22 +00:00
web-app some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
.classpath some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
.gitignore Merge commit 'bbb/master' 2010-07-14 02:53:29 +00:00
application.properties Changed bigbluebutton-apps/build.gradle to reference an Env. Var. for local dir 2011-01-31 18:43:52 +00:00
bigbluebutton.launch - upgrade to grails 1.1.1 2009-09-20 19:19:50 +00:00
bigbluebutton.tmproj - bringing bigbluebutton-web into trunk 2009-04-01 16:53:45 +00:00
build.gradle - add eclipse plugin 2011-02-15 11:43:17 -05:00
build.xml For developting bbb-web using the VM, changing run-war to run-app so the developer can get debug messages to the console 2010-01-22 23:53:40 +00:00
COPYING.LESSER - put in license file 2009-06-12 15:28:59 +00:00
INSTALL - refer install instructions to wiki 2010-04-02 14:56:39 +00:00
ivy.xml have prototype of end-to-end JMS messaging for conference events with spring integration 2009-09-28 21:31:23 +00:00
ivysettings.xml - upgrade to grails 1.1.1 2009-09-20 19:19:50 +00:00
vm-build-debug.sh - rename copyToLib to resolveDeps to be consistent with bbb-apps 2011-02-15 11:00:56 -05:00
vm-build.sh - rename copyToLib to resolveDeps to be consistent with bbb-apps 2011-02-15 11:00:56 -05:00