Skip to content
Snippets Groups Projects
Commit 5aaafa82 authored by Gabriel Carvalho de Campes's avatar Gabriel Carvalho de Campes
Browse files

Merge remote-tracking branch 'upstream/master' into refactor-poll-api

* upstream/master: (26 commits)
  - fix check for breakout room  - insert breakout metadata into events.xml  - delete breakout metadata from redis
  Rename meteor method on the client
  Remove left over debug
  Fix chat being always inserted when the server start
  Add debug message when handler is completed with errors
  Fix bug on the clearChats and addChat modifiers
  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
  ...
parents 43d9d12e e26e9fd0
No related branches found
No related tags found
No related merge requests found
Showing
with 205 additions and 203 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment