Go to file
Richard Alam 9c6b27fb5f Merge branch 'master' into record-and-playback-feature
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
2011-03-18 15:43:39 -04: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 - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
bbb-video - add streams directory for video and deskshare apps where we store recordings 2011-03-15 15:30:29 -04:00
bbb-voice - add check for logging 2011-03-02 01:34:15 +00: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 - move the tests into proper directory so that gradle can find it 2011-03-18 15:33:16 -04:00
bigbluebutton-client Merge branch 'master' into record-and-playback-feature 2011-03-18 15:43:39 -04:00
bigbluebutton-config Merge branch 'master' into record-and-playback-feature 2011-03-18 15:43:39 -04:00
bigbluebutton-web some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
deskshare - record deskshare 2011-03-18 15:35:10 -04:00
esl-client-bbb - handle start-recording and stop-recording events from freesiwtch 2011-01-26 12:21:02 -05: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 - add nokogiri gem 2011-02-28 16:25:01 -05:00
.gitignore Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-01-03 19:15:11 +00:00
README add README 2010-05-25 22:28:50 -04:00

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