Fixed conflict with master

app/controllers/application_controller.rb

@@ -47,8 +47,13 @@ class ApplicationController < ActionController::Base
   end
   helper_method :user_name_limit
 
-  def qrcode_generation_enabled
+  def bigbluebutton_endpoint_default?
+    Rails.configuration.bigbluebutton_endpoint_default == Rails.configuration.bigbluebutton_endpoint
+  end
+  helper_method :bigbluebutton_endpoint_default?
+
+  def qrcode_generation_enabled?
     Rails.configuration.enable_qrcode_generation
   end
-  helper_method :qrcode_generation_enabled
+  helper_method :qrcode_generation_enabled?
 end

app/controllers/landing_controller.rb

@@ -17,8 +17,6 @@
 class LandingController < ApplicationController
   include BbbApi
 
-  helper_method :admin?
-
   def index
     # If guest access is disabled, redirect the user to the guest landing and force login.
     redirect_to guest_path if Rails.configuration.disable_guest_access
@@ -77,6 +75,7 @@ class LandingController < ApplicationController
   def admin?
     @user && @user == current_user
   end
+  helper_method :admin?
 
   def preferences
     @user = current_user

app/lib/bbb_api.rb

@@ -28,7 +28,7 @@ module BbbApi
   end
 
   def bbb
-    @bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8", true)
+    @bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8")
   end
 
   def bbb_meeting_id(id)

app/views/shared/_center_panel.html.erb

@@ -18,6 +18,9 @@
     <div class="center-block center-panel-size col-xs-12">
       <div class="panel panel-default">
         <div class="panel-body">
+          <% if bigbluebutton_endpoint_default? %>
+          <div class="panel-alert alert alert-danger"><%= t('warning_bigbluebutton_endpoint_default') %></div>
+          <% end %>
           <h3 class="title-wrapper text-center">
             <%= yield :title %>
           </h3>

app/views/shared/_meeting_url.html.erb

@@ -44,7 +44,7 @@
       <%= icon('envelope-o') %>
     </button>
 
-    <% if qrcode_generation_enabled %>
+    <% if qrcode_generation_enabled? %>
     <button type="button" class="btn btn-default meeting-url-qrcode has-tooltip"
       title="<%= t('qrcode.explanation') %>"
       data-qrcode-generated-hint="<%= t('qrcode.generated') %>"

config/application.rb

@@ -37,9 +37,12 @@ module Greenlight
     config.i18n.fallbacks = {'en' => 'en-US'}
 
     # BigBlueButton
-    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']  || 'http://test-install.blindsidenetworks.com/bigbluebutton/'
+    config.bigbluebutton_endpoint_default = 'http://test-install.blindsidenetworks.com/bigbluebutton/'
-    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET'] || '8cd8ef52e8e101574e400365b55e11a6'
+    config.bigbluebutton_secret_default = '8cd8ef52e8e101574e400365b55e11a6'
+    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']  || config.bigbluebutton_endpoint_default
+    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET'] || config.bigbluebutton_secret_default
 
+    # Greelight specific
     config.use_webhooks = ENV['GREENLIGHT_USE_WEBHOOKS'] && ENV['GREENLIGHT_USE_WEBHOOKS'] == "true"
     config.mail_notifications = ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] && ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] == "true"
     config.disable_guest_access = ENV['DISABLE_GUEST_ACCESS'] && ENV['DISABLE_GUEST_ACCESS'] == "true"

config/locales/en-us.yml

@@ -192,6 +192,7 @@ en-US:
   wait_for_mod_explanation: You will automatically join when the meeting starts
   watch: Watch
   'yes': 'Yes'
+  warning_bigbluebutton_endpoint_default: This deployment of Greenlight is making use of the BigBlueButton testing server that comes pre-configured by default. It should be replaced.
   welcome_to_greenlight: Welcome to GreenLight!
   youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
   youtube_footer: this will upload all webcam and audio data