Commit 7885023e authored 7 years ago by Richard Alam

Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into antobinary-pods_vol4

parents a683dca0 14691b2b

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/resources/application.conf 8 additions, 0 deletions

akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala 3 additions, 0 deletions

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/ChatModel.scala 0 additions, 2 deletions

...rc/main/scala/org/bigbluebutton/core/apps/ChatModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala 2 additions, 30 deletions

...utton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserLeftVoiceConfEvtMsgHdlr.scala 1 addition, 25 deletions

...ebutton/core/apps/voice/UserLeftVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala 38 additions, 0 deletions

...in/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceConfRunningEvtMsgHdlr.scala 15 additions, 1 deletion

...uebutton/core/apps/voice/VoiceConfRunningEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/DirectChat.scala 0 additions, 61 deletions

...main/scala/org/bigbluebutton/core/models/DirectChat.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/GroupChats.scala 1 addition, 0 deletions

...main/scala/org/bigbluebutton/core/models/GroupChats.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/PublicChat.scala 0 additions, 60 deletions

...main/scala/org/bigbluebutton/core/models/PublicChat.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsers.scala 0 additions, 4 deletions

...main/scala/org/bigbluebutton/core/models/VoiceUsers.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/MeetingMessageToJsonConverter.scala 0 additions, 1 deletion

...n/core/pubsub/senders/MeetingMessageToJsonConverter.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 2 additions, 0 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/UsersMessageToJsonConverter.scala 0 additions, 2 deletions

...ton/core/pubsub/senders/UsersMessageToJsonConverter.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/AddShapeWhiteboardRecordEvent.scala 0 additions, 2 deletions

...on/core/record/events/AddShapeWhiteboardRecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/RecordChapterBreakRecordEvent.scala 10 additions, 0 deletions

...on/core/record/events/RecordChapterBreakRecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/record/events/RecordEvent.scala 12 additions, 0 deletions

...la/org/bigbluebutton/core/record/events/RecordEvent.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala 0 additions, 1 deletion

...in/scala/org/bigbluebutton/core/running/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 26 additions, 7 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala 4 additions, 0 deletions

...la/org/bigbluebutton/core/running/MeetingActorAudit.scala

with 122 additions and 196 deletions

Please register or to comment