BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0c6e5a0632
bigbluebutton-Github/bigbluebutton-client
History
Chad Pilkey 0c6e5a0632 Merge remote branch 'origin/master' into poll-access 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/managers/UserManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	record-and-playback/presentation/playback/presentation/acornmediaplayer/acornmediaplayer.base.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/jquery.acornmediaplayer.js
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-captions.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/access-volume.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/acorn.access.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/button-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-dark.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/access/controls-background-light.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/barebones/acorn.barebones.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/acorn.darkglass.css
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-caption.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-exit-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-fullscreen.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-pause.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-play.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-transcript.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume-full.png
	record-and-playback/presentation/playback/presentation/acornmediaplayer/themes/darkglass/darkglass-volume.png
	record-and-playback/presentation/playback/presentation/css/bbb.playback.css
	record-and-playback/presentation/playback/presentation/playback.html
2012-10-29 16:03: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
bin separate building of locales as it takes a long time for the client to build. The steps now are 2011-09-20 14:50:41 -04:00
build/lib - modify build.xml to use an external locale.xml for supported locales 2010-06-09 17:41:30 -04:00
config - forgot to add /fcs/ handler 2012-09-14 19:32:50 +00:00
html-templateBackup Backup before opening red5 up to dev. Still has Line tool. 2012-06-21 23:06:24 -04:00
libs hooked up presentation text 2012-07-24 20:36:29 +00:00
locale Merge remote branch 'origin/master' into poll-access 2012-10-29 16:03:09 -04:00
resources - add require.js lib 2012-10-24 22:15:51 +00:00
src Merge remote branch 'origin/master' into poll-access 2012-10-29 16:03:09 -04:00
.actionScriptProperties - make it compile 2012-07-16 19:03:12 +00:00
.actionScriptProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.flexProperties Finished text tool 'options'. 2012-07-09 16:43:03 -04:00
.flexProperties.orig merged some files 2010-07-16 17:16:42 +00:00
.gitignore Merge remote branch 'upstream/master' 2012-08-07 19:56:23 +00:00
.project Added updating tooltip and chat history navigation to Chat Module; keybind is temporary 2012-07-17 19:35:05 +00:00
build.xml Merge remote branch 'origin/master' into poll-access 2012-09-24 15:16:02 +00:00
LICENSE.txt move into trunk to use as development 2008-11-05 14:52:33 +00:00
README Undoing test change 2012-07-03 20:16:55 +00: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

README 

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

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