Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

fairblue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

73d00517

Commit 73d00517 authored 9 years ago by Richard Alam

Downloads
- Plain Diff

Merge branch 'pedrobmarin-reconnect-fixes'

parents 008d59c8 e58b527c

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

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

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

...c/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java 1 addition, 0 deletions

...java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java 22 additions, 5 deletions

...utton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as 22 additions, 14 deletions

...bigbluebutton/modules/phone/managers/ConnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as 9 additions, 0 deletions

.../bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml 5 additions, 0 deletions

...g/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml

with 114 additions and 34 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net