* upstream/master: (22 commits)
- create only one netConnection to bbb-apps. Not re-create one when reconnecting.
- log client out when user is ejected from meeting.
- reset connectAttemptTimeout as we don't want to fail connection on reconnects.
- fix rtmpt
- add more logging to track issues
Update Gemfile.lock for 1.1-dev
- log locale version
- remove user join log
improve logs for webrtc events
- improve client side logging.
add EN string to ClientStatusEvent
Updated restart of libreoffice for systemd
- add log to indicate successful connection to bbb-apss
bbb-web: Escaped strings used in freemarker template for thumbnails
record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation
Fix import in stunturn reply handler
Fix handleStunTurnReply function name
Clean up before PR
Rever wrong changes on chat handler parameters
Revert wrong changes on chat handler name
...
* 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
...
* 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.
...
* rewrite-queue-handler:
Remove left over debug
Fix chat being always inserted when the server start
Add debug message when handler is completed with errors
