bigbluebutton-Github/bigbluebutton-web
Jorge Nunez 5b1d62f5d2 Merge remote branch 'upstream/master' into html5-bridge
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2013-07-31 17:27:33 -07:00
..
.settings
agi/scripts
grails-app Merge remote branch 'upstream/master' into html5-bridge 2013-07-31 17:27:33 -07:00
lib - have upgrade to grails 1.3.9 work 2013-06-06 12:49:18 -07:00
plugins - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
scripts
src Merge remote branch 'upstream/master' into html5-bridge 2013-07-31 17:27:33 -07:00
test added extract text from presentations 2012-07-12 15:49:33 -07:00
web-app try to upgrade to grails 1.3.9 - Not starting properly though 2013-06-06 12:17:52 -07:00
.classpath added config file for jedispool 2011-12-12 15:18:52 -08:00
.gitignore - merge some new stuff 2012-07-29 16:06:39 +00:00
application.properties - have upgrade to grails 1.3.9 work 2013-06-06 12:49:18 -07:00
bigbluebutton.launch
bigbluebutton.tmproj
build.gradle added config file for jedispool 2011-12-12 15:18:52 -08:00
build.xml
COPYING.LESSER
INSTALL
ivy.xml - have upgrade to grails 1.3.9 work 2013-06-06 12:49:18 -07:00
ivysettings.xml
pom.xml Added redis pool, pubsub, and maven3 support to bbb-web 2011-05-17 11:04:40 +00:00
README - add README 2011-05-26 14:24:03 -04: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

Testing:
How to run the presentation conversion unit tests.
	grails test-app org.bigbluebutton.presentation.imp.*