9 Commits

Author	SHA1	Message	Date
Richard Alam	7fe44355d4	Merging breakout rooms with the master branch ... Merge breakout rooms feature with master branch. This also includes closed captioning feature. Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-web/.classpath bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java	2016-03-21 17:52:23 +00:00
Richard Alam	40ba49113e	- fix issue 2812 by setting end time when last user leaves	2016-02-04 22:40:06 +00:00
Ghazi Triki	b3951dc4af	Added bin folder to bigbluebutton-web/.gitignore	2015-11-03 21:49:21 +01:00
Marco Calderon	5bbb607c5d	Added redis pool, pubsub, and maven3 support to bbb-web	2011-05-17 11:04:40 +00:00
Leif Jackson	8528b2d287	Merge commit 'bbb/master'	2010-07-14 02:53:29 +00:00
Richard Alam	8968fb3593	- ignore bbb_conf_api.jsp	2010-07-12 16:21:06 -04:00
Leif Jackson	9decad03c6	Inital import of freeswitch intergration	2010-06-29 04:51:31 +00:00
BigBlueButton	e4fd72681a	- adding .gitignore	2010-05-30 03:55:46 +00:00
Richard Alam	56ee75fcc2	- urlEncode meetingID to calculate checksum properly	2010-05-27 14:56:56 -04:00