-
- Downloads
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into recording-message
# Conflicts: # bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml
Showing
- akka-bbb-apps/scala/BreakoutRoom.sc 11 additions, 11 deletionsakka-bbb-apps/scala/BreakoutRoom.sc
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutApp2x.scala 3 additions, 2 deletions.../org/bigbluebutton/core/apps/breakout/BreakoutApp2x.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala 10 additions, 10 deletions...igbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/polls/RespondToPollReqMsgHdlr.scala 18 additions, 0 deletions...gbluebutton/core/apps/polls/RespondToPollReqMsgHdlr.scala
- bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala 2 additions, 2 deletions...n/scala/org/bigbluebutton/common2/msgs/BreakoutMsgs.scala
- bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala 4 additions, 0 deletions...main/scala/org/bigbluebutton/common2/msgs/PollsMsgs.scala
- bbb-video/deploy.sh 11 additions, 0 deletionsbbb-video/deploy.sh
- bbb-voice/deploy.sh 11 additions, 0 deletionsbbb-voice/deploy.sh
- bigbluebutton-client/branding/default/style/css/V2Theme.css 107 additions, 20 deletionsbigbluebutton-client/branding/default/style/css/V2Theme.css
- bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla 0 additions, 0 deletions...-client/branding/default/style/css/assets/swf/v2_skin.fla
- bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf 0 additions, 0 deletions...-client/branding/default/style/css/assets/swf/v2_skin.swf
- bigbluebutton-client/locale/en_US/bbbResources.properties 20 additions, 1 deletionbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/resources/config.xml.template 2 additions, 1 deletionbigbluebutton-client/resources/config.xml.template
- bigbluebutton-client/resources/prod/locales.xml 2 additions, 0 deletionsbigbluebutton-client/resources/prod/locales.xml
- bigbluebutton-client/src/BigBlueButton.mxml 10 additions, 1 deletionbigbluebutton-client/src/BigBlueButton.mxml
- bigbluebutton-client/src/BigBlueButtonMainContainer.mxml 5 additions, 2 deletionsbigbluebutton-client/src/BigBlueButtonMainContainer.mxml
- bigbluebutton-client/src/org/bigbluebutton/common/logging/DisplayWarningAction.as 47 additions, 0 deletions.../org/bigbluebutton/common/logging/DisplayWarningAction.as
- bigbluebutton-client/src/org/bigbluebutton/common/logging/GlobalExceptionHandler.as 54 additions, 0 deletions...rg/bigbluebutton/common/logging/GlobalExceptionHandler.as
- bigbluebutton-client/src/org/bigbluebutton/common/logging/GlobalExceptionHandlerAction.as 24 additions, 0 deletions...bluebutton/common/logging/GlobalExceptionHandlerAction.as
- bigbluebutton-client/src/org/bigbluebutton/common/logging/LogHandlerAction.as 38 additions, 0 deletions.../src/org/bigbluebutton/common/logging/LogHandlerAction.as
Loading
Please register or sign in to comment