Go to file
Felipe Cecagno 7390c477f8 Merge branch 'sharedNotes' into sharedNotes-updated
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/prod/BigBlueButton.html
2011-09-19 15:56:04 -03:00
bbb-api-examples/PHP Updated to use curl if it is enabled, and if not uses the default. Added createMeetingURL and updated createandgetjoinurl, create meeting to use the function. 2010-09-24 11:00:00 -04:00
bbb-common-message - add license headers to bbb-common 2010-11-06 10:24:21 -04:00
bbb-video few corrections in order to make the shared notes module working; it is needed to run in the backend both live notes server and redis server 2011-09-19 15:02:52 +00:00
bbb-voice Merge branch 'sharedNotes' into sharedNotes-updated 2011-09-19 15:56:04 -03:00
bbb-voice-conference/config - don't resize deskshare preview window when region is smaller than preview window 2010-11-08 16:42:25 -05:00
bigbluebutton-apps Merge branch 'sharedNotes' into sharedNotes-updated 2011-09-19 15:56:04 -03:00
bigbluebutton-client Merge branch 'sharedNotes' into sharedNotes-updated 2011-09-19 15:56:04 -03:00
bigbluebutton-config Fixed #671: Prevent users from entering the demo meeting with empty username 2011-03-16 15:57:42 -04:00
bigbluebutton-web Merge branch 'sharedNotes' into sharedNotes-updated 2011-09-19 15:56:04 -03:00
deskshare - change diconnected display text 2010-11-26 13:29:14 -05:00
esl-client-bbb - deleting and ignoring IDE specific files 2010-07-21 11:24:42 -04:00
labs/stress-testing - Added a labs area for creating test scripts; added bbb-test, a utility to launch multiple BigBlueButton clients within firefox for testing see (http://code.google.com/p/bigbluebutton/wiki/Testing) 2011-01-23 03:53:51 +00:00
record-and-playback Fix for a participant being able to join the voice conference multiple times 2010-09-28 05:21:45 +00:00
.gitignore Added optional warning suppresion for locale version check 2011-01-29 01:33:59 -05:00
README add README 2010-05-25 22:28:50 -04:00

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