Commit 126312ca authored 8 years ago by Anton Georgiev

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into nginx-logging3

parents e5b79107 9600c843

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as 18 additions, 2 deletions

bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as 7 additions, 19 deletions

...rc/org/bigbluebutton/core/managers/ReconnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/core/model/VideoProfile.as 7 additions, 4 deletions

...n-client/src/org/bigbluebutton/core/model/VideoProfile.as
bigbluebutton-client/src/org/bigbluebutton/main/model/PortTest.as 265 additions, 3 deletions

...utton-client/src/org/bigbluebutton/main/model/PortTest.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/EnterApiService.as 11 additions, 3 deletions

...c/org/bigbluebutton/main/model/modules/EnterApiService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as 2 additions, 22 deletions

...org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesProxy.as 8 additions, 2 deletions

.../src/org/bigbluebutton/main/model/modules/ModulesProxy.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as 1 addition, 1 deletion

...ient/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as 59 additions, 47 deletions

...ent/src/org/bigbluebutton/main/model/users/JoinService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as 32 additions, 25 deletions

...g/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml 24 additions, 10 deletions

...nt/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml 15 additions, 7 deletions

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml 2 additions, 2 deletions

...-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml 7 additions, 11 deletions

...ient/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as 15 additions, 12 deletions

...rg/bigbluebutton/modules/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as 7 additions, 6 deletions

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

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

...bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/business/FileUploadService.as 13 additions, 6 deletions

...gbluebutton/modules/present/business/FileUploadService.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml 8 additions, 3 deletions

...bluebutton/modules/present/ui/views/FileUploadWindow.mxml

with 514 additions and 208 deletions

Please register or to comment