Commit 957213f4 authored 7 years ago by Richard Alam Committed by GitHub 7 years ago

Merge pull request #4019 from ritzalam/add-new-users-collection-instead-of-in-conference

Modified client to consolidate where we store meeting state

parents 480438b3 e7ffcbfb

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala 0 additions, 448 deletions

...src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/deskshare/DeskshareApp2x.scala 14 additions, 0 deletions

...rg/bigbluebutton/core/apps/deskshare/DeskshareApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/deskshare/EjectUserFromMeetingHdlr.scala 28 additions, 0 deletions

...button/core/apps/deskshare/EjectUserFromMeetingHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/EjectUserFromMeetingHdlr.scala 34 additions, 0 deletions

...ton/core/apps/presentation/EjectUserFromMeetingHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationApp2x.scala 13 additions, 0 deletions

...bluebutton/core/apps/presentation/PresentationApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/poll/EjectUserFromMeetingHdlr.scala 14 additions, 0 deletions

...ore/apps/presentation/poll/EjectUserFromMeetingHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/poll/PollApp2x.scala 13 additions, 0 deletions

...bigbluebutton/core/apps/presentation/poll/PollApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleHdlr.scala 18 additions, 0 deletions

...rg/bigbluebutton/core/apps/users/ChangeUserRoleHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/EjectUserFromMeetingHdlr.scala 32 additions, 0 deletions

...bluebutton/core/apps/users/EjectUserFromMeetingHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp2x.scala 15 additions, 0 deletions

.../scala/org/bigbluebutton/core/apps/users/UsersApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala 75 additions, 15 deletions

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/UsersState.scala 0 additions, 3 deletions

...main/scala/org/bigbluebutton/core/models/UsersState.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/VoiceUsers.scala 65 additions, 16 deletions

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

...scala/org/bigbluebutton/core/models/VoiceUsersState.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala 3 additions, 14 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgDeserializer.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 23 additions, 13 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala 1 addition, 3 deletions

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

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala 1 addition, 2 deletions

...scala/org/bigbluebutton/core/running/RunningMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/util/Model1x2xConverter.scala 36 additions, 0 deletions

...cala/org/bigbluebutton/core/util/Model1x2xConverter.scala

with 428 additions and 541 deletions

Please register or to comment