-
- Downloads
Merge remote-tracking branch 'bigbluebutton/master' into mconf
Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
Showing
- akka-bbb-apps/src/main/java/org/bigbluebutton/core/recorders/VoiceEventRecorder.java 0 additions, 147 deletions.../org/bigbluebutton/core/recorders/VoiceEventRecorder.java
- akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala 1 addition, 3 deletionsakka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 3 additions, 20 deletions...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 2 additions, 3 deletions...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala 29 additions, 1 deletion...src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
- bbb-api-demo/src/main/webapp/create.jsp 4 additions, 2 deletionsbbb-api-demo/src/main/webapp/create.jsp
- bbb-webhooks/hook.coffee 1 addition, 1 deletionbbb-webhooks/hook.coffee
- bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java 63 additions, 9 deletions...utton/red5/client/messaging/ConnectionInvokerService.java
- bigbluebutton-client/branding/default/style/css/BBBDefault.css 2 additions, 6 deletions...uebutton-client/branding/default/style/css/BBBDefault.css
- bigbluebutton-client/locale/am_ET/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/am_ET/bbbResources.properties
- bigbluebutton-client/locale/ar_EG/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/ar_EG/bbbResources.properties
- bigbluebutton-client/locale/ar_SA/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/ar_SA/bbbResources.properties
- bigbluebutton-client/locale/az_AZ/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/az_AZ/bbbResources.properties
- bigbluebutton-client/locale/be_BY/bbbResources.properties 54 additions, 88 deletionsbigbluebutton-client/locale/be_BY/bbbResources.properties
- bigbluebutton-client/locale/bg_BG/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/bg_BG/bbbResources.properties
- bigbluebutton-client/locale/bn_IN/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/bn_IN/bbbResources.properties
- bigbluebutton-client/locale/bs_BA/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/bs_BA/bbbResources.properties
- bigbluebutton-client/locale/ca_ES/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/ca_ES/bbbResources.properties
- bigbluebutton-client/locale/cs_CZ/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/cs_CZ/bbbResources.properties
- bigbluebutton-client/locale/cy_GB/bbbResources.properties 1 addition, 0 deletionsbigbluebutton-client/locale/cy_GB/bbbResources.properties
Loading
Please register or sign in to comment