bigbluebutton-Github/bigbluebutton-client
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 Added support for logo branding in the lower right corner of the client 2010-12-13 20:20:27 +00:00
build/lib - modify build.xml to use an external locale.xml for supported locales 2010-06-09 17:41:30 -04:00
config - add new directive in nginx conf to expire BigBlueButton.html every minute to prevent caching. 2010-06-14 14:20:09 -04:00
html-template - merge in changes from HEAD 2011-04-04 11:10:10 -04:00
libs Cleanup and refactoring in bbb-client Main app 2010-08-06 13:45:36 +00:00
locale update zn_TW locale 2011-03-23 15:42:08 +00:00
resources Changed javascript file initialization so they work better in sandbox mode 2011-03-27 21:45:29 -04:00
src Merge branch 'master' into record-and-playback-feature 2011-04-04 11:15:09 -04:00
.actionScriptProperties - merge in changes from HEAD 2011-04-04 11:10:10 -04:00
.actionScriptProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.flexProperties - merge in changes from HEAD 2011-04-04 11:10:10 -04:00
.flexProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.gitignore Ant task for generating ASDoc documentation for the client. Docs generated under bigbluebutton-client/asdoc. Added that directory to client's .gitignore 2011-02-11 22:41:38 +00:00
.project Branding for bbb-client. Initial Commit 2010-08-24 19:36:29 +00:00
build.xml Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-27 21:45:55 +00:00
LICENSE.txt move into trunk to use as development 2008-11-05 14:52:33 +00:00
README - renamed config.xml to config.xml.dev. The config.xml is changed by each developer and sometimes gets checked-in 2010-06-10 16:05:37 -04:00
vm-build.sh add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in 2010-05-07 21:53:52 +00:00

see http://code.google.com/p/bigbluebutton

Developing the client
1. Copy src/conf/config.xml.dev to src/cong/config.xml