Commit 4b0452d1 authored 5 years ago by Anton Georgiev

Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into...

Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master

parents 424b0410 4e26af52

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp2x.scala 8 additions, 0 deletions

.../scala/org/bigbluebutton/core/apps/voice/VoiceApp2x.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceConfCallStateEvtMsgHdlr.scala 42 additions, 0 deletions

...button/core/apps/voice/VoiceConfCallStateEvtMsgHdlr.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/running/MeetingActor.scala 1 addition, 0 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala 2 additions, 0 deletions

...c/main/scala/org/bigbluebutton/core2/AnalyticsActor.scala
akka-bbb-fsesl/project/Dependencies.scala 16 additions, 2 deletions

akka-bbb-fsesl/project/Dependencies.scala
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java 19 additions, 0 deletions

...n/freeswitch/voice/FreeswitchConferenceEventListener.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/IVoiceConferenceService.java 17 additions, 0 deletions

...gbluebutton/freeswitch/voice/IVoiceConferenceService.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/events/FreeswitchHeartbeatEvent.java 13 additions, 0 deletions

...ton/freeswitch/voice/events/FreeswitchHeartbeatEvent.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/events/FreeswitchStatusReplyEvent.java 19 additions, 0 deletions

...n/freeswitch/voice/events/FreeswitchStatusReplyEvent.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/events/VoiceCallStateEvent.java 30 additions, 0 deletions

...uebutton/freeswitch/voice/events/VoiceCallStateEvent.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java 15 additions, 4 deletions

...button/freeswitch/voice/freeswitch/ConnectionManager.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java 220 additions, 7 deletions

...ebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java 41 additions, 37 deletions

...on/freeswitch/voice/freeswitch/FreeswitchApplication.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/CheckFreeswitchStatusCommand.java 9 additions, 2 deletions

...oice/freeswitch/actions/CheckFreeswitchStatusCommand.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetUsersStatusCommand.java 9 additions, 0 deletions

...witch/voice/freeswitch/actions/GetUsersStatusCommand.java
akka-bbb-fsesl/src/main/resources/application.conf 39 additions, 37 deletions

akka-bbb-fsesl/src/main/resources/application.conf
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/ApiService.scala 43 additions, 0 deletions

...b-fsesl/src/main/scala/org/bigbluebutton/ApiService.scala
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala 17 additions, 3 deletions

akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/SystemConfiguration.scala 5 additions, 0 deletions

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala

with 567 additions and 92 deletions

Please register or to comment