Oswaldo Acauan e1421566be Merge branch 'master' into refactor-meetings-api ... * master: (22 commits) - fix check for breakout room - insert breakout metadata into events.xml - delete breakout metadata from redis Rename meteor method on the client HTML5 - fixed linebreak with lint HTML5 - fixes fullscreen toggle to un-fullscreen Monitoring for number of user is not triggered for breakout rooms. Updated bbb-record rules to detect recording directories. Added new property redirectOnJoin to CreateBreakoutRoomsRequest. Added redirect property to RequestBreakoutJoinURL. Fix handler for 'get_whiteboard_shapes_reply' not calling the cb Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info" Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room. Re-enable recording option for breakout rooms. Store breakout room externalMeetingID to be used for generating join URL. Store breakout room sequence in akka-apps and bbb-web. Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller. Deleted unused imports from bigbluebutton-apps and bigbluebutton-web Replace the deprecated shaHex DigestUtils by sha1Hex. Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms. Breakout rooms are now sorted by their sequence number. Added sequence property breakout room. ...		2016-10-24 11:14:14 +00:00
..
server	Merge branch 'master' into refactor-meetings-api	2016-10-24 11:14:14 +00:00
index.js	Moves to api/collection/index	2016-05-16 09:14:02 -05:00