Commit cfec9de6 authored 7 years ago by Richard Alam

Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20

parents 154d3d60 1abba939

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/users/UserConnectedToGlobalAudioMsgHdlr.scala 1 addition, 0 deletions

...n/core/apps/users/UserConnectedToGlobalAudioMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala 2 additions, 1 deletion

...utton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.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
bigbluebutton-client/branding/default/style/css/V2Theme.css 38 additions, 9 deletions

bigbluebutton-client/branding/default/style/css/V2Theme.css
bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ButtonSkin.as 0 additions, 18 deletions

...g/default/style/css/org/bigbluebutton/skins/ButtonSkin.as
bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/NumericStepperDownSkin.as 166 additions, 0 deletions

...yle/css/org/bigbluebutton/skins/NumericStepperDownSkin.as
bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/NumericStepperUpSkin.as 165 additions, 0 deletions

...style/css/org/bigbluebutton/skins/NumericStepperUpSkin.as
bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/TabSkin.as 1 addition, 12 deletions

...ding/default/style/css/org/bigbluebutton/skins/TabSkin.as
bigbluebutton-client/locale/en_US/bbbResources.properties 4 additions, 0 deletions

bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/prod/lib/bbb_blinker.js 2 additions, 4 deletions

bigbluebutton-client/resources/prod/lib/bbb_blinker.js
bigbluebutton-client/src/org/bigbluebutton/common/IKeyboardClose.as 26 additions, 0 deletions

...ton-client/src/org/bigbluebutton/common/IKeyboardClose.as
bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as 73 additions, 59 deletions

bigbluebutton-client/src/org/bigbluebutton/core/PopUpUtil.as
bigbluebutton-client/src/org/bigbluebutton/main/api/JSAPI.as 0 additions, 6 deletions

bigbluebutton-client/src/org/bigbluebutton/main/api/JSAPI.as
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml 10 additions, 12 deletions

...rc/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/BBBSettings.mxml 3 additions, 0 deletions

...-client/src/org/bigbluebutton/main/views/BBBSettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml 2 additions, 4 deletions

...c/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/ClientStatusWindow.mxml 4 additions, 2 deletions

.../src/org/bigbluebutton/main/views/ClientStatusWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml 2 additions, 4 deletions

...nt/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/GuestWindow.mxml 0 additions, 1 deletion

...-client/src/org/bigbluebutton/main/views/GuestWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LockSettings.mxml 3 additions, 4 deletions

...client/src/org/bigbluebutton/main/views/LockSettings.mxml

with 502 additions and 140 deletions

Please register or to comment