Commit b2c42442 authored 4 years ago by Anton Georgiev

Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into...

Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.3-alpha5-with-split-meteor-roles-10349

parents 970d91ae 8933ca2d

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/debian/DEBIAN/postinst 8 additions, 0 deletions

akka-bbb-apps/src/debian/DEBIAN/postinst
akka-bbb-apps/src/debian/DEBIAN/preinst 10 additions, 0 deletions

akka-bbb-apps/src/debian/DEBIAN/preinst
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/EndBreakoutRoomInternalMsgHdlr.scala 1 addition, 1 deletion

...n/core/apps/breakout/EndBreakoutRoomInternalMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala 3 additions, 3 deletions

...bluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala 1 addition, 1 deletion

...utton/core/apps/users/LogoutAndEndMeetingCmdMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala 7 additions, 7 deletions

...scala/org/bigbluebutton/core/running/HandlerHelpers.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 2 additions, 1 deletion

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingExpiryTrackerHelper.scala 1 addition, 1 deletion

...gbluebutton/core/running/MeetingExpiryTrackerHelper.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/EndMeetingSysCmdMsgHdlr.scala 1 addition, 1 deletion

...e2/message/handlers/meeting/EndMeetingSysCmdMsgHdlr.scala
akka-bbb-apps/src/templates/systemloader/systemd/start-template 26 additions, 0 deletions

...bb-apps/src/templates/systemloader/systemd/start-template
akka-bbb-fsesl/src/templates/systemloader/systemd/start-template 26 additions, 0 deletions

...b-fsesl/src/templates/systemloader/systemd/start-template
bigbluebutton-config/bin/bbb-conf 44 additions, 4 deletions

bigbluebutton-config/bin/bbb-conf
bigbluebutton-html5/client/main.jsx 20 additions, 9 deletions

bigbluebutton-html5/client/main.jsx
bigbluebutton-html5/imports/api/breakouts/server/methods/createBreakout.js 1 addition, 1 deletion

...l5/imports/api/breakouts/server/methods/createBreakout.js
bigbluebutton-html5/imports/api/group-chat-msg/server/modifiers/clearGroupChatMsg.js 2 additions, 0 deletions

.../api/group-chat-msg/server/modifiers/clearGroupChatMsg.js
bigbluebutton-html5/imports/api/group-chat-msg/server/publishers.js 3 additions, 2 deletions

...ton-html5/imports/api/group-chat-msg/server/publishers.js
bigbluebutton-html5/imports/api/guest-users/server/modifiers/clearGuestUsers.js 26 additions, 0 deletions

...ports/api/guest-users/server/modifiers/clearGuestUsers.js
bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingTimeRemaining.js 26 additions, 0 deletions

...pi/meetings/server/modifiers/clearMeetingTimeRemaining.js
bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js 8 additions, 0 deletions

.../imports/api/meetings/server/modifiers/meetingHasEnded.js
bigbluebutton-html5/imports/api/screenshare/server/modifiers/clearScreenshare.js 2 additions, 0 deletions

...orts/api/screenshare/server/modifiers/clearScreenshare.js

with 218 additions and 31 deletions

Please register or to comment