From 7828c152866ff7f7341c7208593c7671243ba5a7 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 8 Jul 2019 09:02:34 -0400
Subject: [PATCH 01/17] GRN2-166: Fixed issue with language fallback not
 working (Fixed #593) (#602)

* Fixed issue with language fallback not working

* Rubocop fixes
---
 app/views/rooms/show.html.erb                    | 3 ++-
 app/views/shared/components/_room_block.html.erb | 6 +++++-
 config/application.rb                            | 4 ----
 config/environments/production.rb                | 4 ----
 config/initializers/languages.rb                 | 7 +++++++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb
index e9b76d47..83aa968d 100644
--- a/app/views/rooms/show.html.erb
+++ b/app/views/rooms/show.html.erb
@@ -18,10 +18,11 @@
     <div class="row pt-9">
       <div class="col-lg-8 col-sm-12">
         <div id="room-title" class="display-3 form-inline <%= 'edit_hover_class' if current_user.main_room != @room %>">
-          <h1 contenteditable=false id="user-text" class="display-3 text-left mb-3 font-weight-400"><%= @room.name %></h1>
           <% if current_user.main_room == @room %>
+            <h1 contenteditable=false id="user-text" class="display-3 text-left mb-3 font-weight-400"><%= t("home_room") %></h1>
             <a class="disable-click"><i class="fas fa-home align-top home-indicator ml-2"></i></a>
           <% else %>
+            <h1 contenteditable=false id="user-text" class="display-3 text-left mb-3 font-weight-400"><%= @room.name %></h1>
             <a><i id="edit-room" class="fa fa-edit align-top home-indicator ml-2" data-edit-room="<%= @room.uid %>"></i></a>
           <% end %>
         </div>
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb
index 167f3fb0..9e8c6fc4 100644
--- a/app/views/shared/components/_room_block.html.erb
+++ b/app/views/shared/components/_room_block.html.erb
@@ -28,7 +28,11 @@
         </td>
         <td>
           <div id="room-name">
-            <h4 contenteditable="false" class="m-0 force-text-normal" ><%= room.name %></h4>
+            <% if room == current_user.main_room %>
+              <h4 contenteditable="false" class="m-0 force-text-normal" ><%= t("home_room") %></h4>
+            <% else %>
+              <h4 contenteditable="false" class="m-0 force-text-normal" ><%= room.name %></h4>
+            <% end %>
           </div>
           <div id="room-name-editable" style="display: none">
             <input id="room-name-editable-input" class="form-control input-sm w-100 h-4" value="<%= room.name %>">
diff --git a/config/application.rb b/config/application.rb
index b3feffb1..06cd5765 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -37,10 +37,6 @@ module Greenlight
     config.i18n.available_locales = [:en]
     config.i18n.default_locale = :en
 
-    config.i18n.available_locales.each do |locale|
-      config.i18n.fallbacks[locale] = [locale, :en]
-    end
-
     # Check if a loadbalancer is configured.
     config.loadbalanced_configuration = ENV["LOADBALANCER_ENDPOINT"].present? && ENV["LOADBALANCER_SECRET"].present?
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index c83f56eb..a34cc596 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -84,10 +84,6 @@ Rails.application.configure do
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation cannot be found).
-  config.i18n.fallbacks = true
-
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index cdf65790..a4b5817f 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -10,3 +10,10 @@ locales.each do |loc|
 end
 
 Rails.configuration.i18n.available_locales = configured_languages
+
+# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+# the I18n.default_locale when a translation cannot be found).
+Rails.configuration.i18n.fallbacks = {}
+Rails.configuration.i18n.available_locales.each do |locale|
+  Rails.configuration.i18n.fallbacks[locale] = :en
+end

From 0fc85636f10ea38fcaccfd7876e6e60d61b78ac0 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 8 Jul 2019 09:04:24 -0400
Subject: [PATCH 02/17] Removed duplicate keys in en.yml file (#603)

---
 app/views/user_mailer/invite_email.html.erb | 2 +-
 app/views/user_mailer/invite_email.text.erb | 2 +-
 config/locales/en.yml                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/user_mailer/invite_email.html.erb b/app/views/user_mailer/invite_email.html.erb
index d9921528..6f7c6505 100644
--- a/app/views/user_mailer/invite_email.html.erb
+++ b/app/views/user_mailer/invite_email.html.erb
@@ -33,7 +33,7 @@
       </p>
 
       <p style="margin-bottom:35px;">
-        <%= t('mailer.user.invite.signup') %>
+        <%= t('mailer.user.invite.signup_info') %>
       </p>
 
       <a style="background: <%= @color %>;color: #ffffff; padding: 10px 15px; box-shadow: 0 2px 4px 0 rgba(0,0,0,.25);border: 1px solid transparent;text-decoration:none;" href="<%= @url %>">
diff --git a/app/views/user_mailer/invite_email.text.erb b/app/views/user_mailer/invite_email.text.erb
index 991ec71d..0cef70c2 100644
--- a/app/views/user_mailer/invite_email.text.erb
+++ b/app/views/user_mailer/invite_email.text.erb
@@ -22,6 +22,6 @@
 
 <%= t('mailer.user.invite.username', email: @email) %>
 
-<%= t('mailer.user.invite.signup') %>
+<%= t('mailer.user.invite.signup_info') %>
 
 <%= @url %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a38ef1f..6ef81da9 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -202,7 +202,7 @@ en:
         subtitle: Administrator Rights Rescinded
       invite:
         info: You have been invited to your own personal space by %{name}
-        signup: To signup using your email, click the button below and follow the steps.
+        signup_info: To signup using your email, click the button below and follow the steps.
         signup_link: Sign Up
         signup:
           info: A user that was invited has signed up to use Greenlight.

From cb2587a6c695e8b6e0beaf918d8981ac36e79026 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 8 Jul 2019 09:07:24 -0400
Subject: [PATCH 03/17] Added the missing model attribute strings (#604)

---
 config/locales/en.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6ef81da9..f0eb5539 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -21,6 +21,14 @@ en:
     attributes:
       user:
         accepted_terms: "Terms and Conditions"
+        email: Email
+        name: Name
+        password: Password
+        password_confirmation: Password Confirmation
+    errors:
+      models:
+        user:
+          confirmation: doesn't match Password
   administrator:
     site_settings:
       authentication:
@@ -68,6 +76,8 @@ en:
       edit:
         title: Edit User Details
       settings:
+        approve: Approve
+        decline: Decline
         ban: Ban User
         delete: Delete
         demote: Demote to User

From f6bd959c4cca11ba6ef0b225d340393d81726dc9 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 8 Jul 2019 09:08:39 -0400
Subject: [PATCH 04/17] GRN2-135:  Limit Jquery version in Gemfile  (#610)

* Limit Jquery version in Gemfile

* Fixed issue with lock file
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9c89ebf4..1dfe1cd1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'coffee-rails', '~> 4.2'
 gem 'mini_racer', platforms: :ruby
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 4.3.3'
 
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 322fc1cf..71ccf81e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -334,7 +334,7 @@ DEPENDENCIES
   health_check
   http_accept_language
   jbuilder (~> 2.5)
-  jquery-rails
+  jquery-rails (~> 4.3.3)
   listen (~> 3.0.5)
   mini_racer
   omniauth

From 315bb1af1cf69491c876d543a39fdee2701bb8d9 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 8 Jul 2019 09:12:46 -0400
Subject: [PATCH 05/17] Added a max-width to the email column in the manage
 users table (#611)

---
 app/assets/stylesheets/admins.scss              | 4 ++++
 app/views/shared/admin_settings/_users.html.erb | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/admins.scss b/app/assets/stylesheets/admins.scss
index 56dbb86f..0a5542ff 100644
--- a/app/assets/stylesheets/admins.scss
+++ b/app/assets/stylesheets/admins.scss
@@ -18,6 +18,10 @@
   .user-role {
     color: white !important;
   }
+
+  .user-email {
+    max-width: 250px;
+  }
 }
 
 #clear-search {
diff --git a/app/views/shared/admin_settings/_users.html.erb b/app/views/shared/admin_settings/_users.html.erb
index f0ce668c..df8422fa 100644
--- a/app/views/shared/admin_settings/_users.html.erb
+++ b/app/views/shared/admin_settings/_users.html.erb
@@ -21,7 +21,7 @@
   <div class="row">
     <div class="col-12">
       <div class="table-responsive">
-        <table class="table table-hover table-outline table-vcenter text-nowrap card-table">
+        <table class="table table-hover table-outline table-vcenter card-table">
           <thead>
             <tr>
               <th data-header="name" data-order="<%= @order_column == "name" ? @order_direction : "none" %>">
@@ -69,7 +69,7 @@
                       <div><%= user.name %></div>
                       <div class="small text-muted"><%= [t("administrator.users.table.created"), ": ", user.created_at].join %></div>
                     </td>
-                    <td><%= user.email && user.email != "" ? user.email : user.username%></td>
+                    <td class="user-email"><%= user.email && user.email != "" ? user.email : user.username%></td>
                     <td><%= user.provider %></td>
                     <td class="text-center">
                       <% roles = user.roles().pluck(:name) %>

From 4f2b190239d3fcfbf3eaa71392f7e452baa1b507 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Mon, 8 Jul 2019 13:23:20 -0400
Subject: [PATCH 06/17] Small updates to ReadMe to better match the current
 state of Greenlight (#612)

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 16fa6b1d..8a5ce130 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,9 @@
 !Status](https://coveralls.io/repos/github/bigbluebutton/greenlight/badge.svg?branch=master)
 ![Docker Pulls](https://img.shields.io/docker/pulls/bigbluebutton/greenlight.svg)
 
-> Greenlight is currently on version 2.0. If you are still running Greenlight 1.0 we suggest [upgrading to 2.0](http://docs.bigbluebutton.org/greenlight/gl-install.html#upgrading-from-greenlight-10).
-
 Greenlight is a simple front-end interface for your BigBlueButton server. At it's heart, Greenlight provides a minimalistic web-based application that allows users to:
 
-  * Signup/Login with Twitter, Google, or through the application itself.
+  * Signup/Login with Google, Office365, or through the application itself.
   * Manage your account settings and user preferences.
   * Create and manage your own personal rooms ([BigBlueButton](https://github.com/bigbluebutton/bigbluebutton) sessions).
   * Invite others to your room using a simple URL.

From e4f50026f1b0292b2b75dcd33214c59defb9be21 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Tue, 9 Jul 2019 10:56:06 -0400
Subject: [PATCH 07/17] Added setting for admin to limit the number of rooms
 for the user (#607)

---
 app/assets/stylesheets/admins.scss            |  9 +++
 app/controllers/admins_controller.rb          |  8 ++-
 app/controllers/rooms_controller.rb           | 12 ++++
 app/helpers/admins_helper.rb                  |  4 ++
 app/helpers/rooms_helper.rb                   | 22 +++++++
 app/models/setting.rb                         |  2 +
 app/views/rooms/show.html.erb                 | 64 +++++++++++--------
 .../admin_settings/_site_settings.html.erb    | 36 ++++++++++-
 config/application.rb                         |  3 +
 config/locales/en.yml                         |  5 ++
 config/routes.rb                              |  1 +
 spec/controllers/admins_controller_spec.rb    | 18 ++++++
 spec/controllers/rooms_controller_spec.rb     | 17 ++++-
 13 files changed, 171 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/admins.scss b/app/assets/stylesheets/admins.scss
index 0a5542ff..ee882a5d 100644
--- a/app/assets/stylesheets/admins.scss
+++ b/app/assets/stylesheets/admins.scss
@@ -45,4 +45,13 @@
 
 .authentication-required{
   padding-top: 2px;
+}
+
+#site_settings {
+  .colorinput-color {
+    text-align: center;
+    padding-top: 4px;
+    height: 2rem;
+    width: 2rem;
+  }
 }
\ No newline at end of file
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
index 8f87171e..00ab91bc 100644
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@@ -23,7 +23,7 @@ class AdminsController < ApplicationController
 
   manage_users = [:edit_user, :promote, :demote, :ban_user, :unban_user, :approve]
   site_settings = [:branding, :coloring, :coloring_lighten, :coloring_darken,
-                   :registration_method, :room_authentication]
+                   :registration_method, :room_authentication, :room_limit]
 
   authorize_resource class: false
   before_action :find_user, only: manage_users
@@ -153,6 +153,12 @@ class AdminsController < ApplicationController
     end
   end
 
+  # POST /admins/room_limit
+  def room_limit
+    @settings.update_value("Room Limit", params[:limit])
+    redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
+  end
+
   private
 
   def find_user
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index b96166da..fde621b1 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -33,6 +33,8 @@ class RoomsController < ApplicationController
   def create
     redirect_to(root_path) && return unless current_user
 
+    return redirect_to current_user.main_room, flash: { alert: I18n.t("room.room_limit") } if room_limit_exceeded
+
     @room = Room.new(name: room_params[:name])
     @room.owner = current_user
     @room.room_settings = create_room_settings_string(room_params[:mute_on_join], room_params[:client])
@@ -279,4 +281,14 @@ class RoomsController < ApplicationController
     Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Authentication") == "true" &&
       current_user.nil?
   end
+
+  def room_limit_exceeded
+    limit = Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
+
+    # Does not apply to admin
+    # 15+ option is used as unlimited
+    return false if current_user&.has_role?(:admin) || limit == 15
+
+    current_user.rooms.count >= limit
+  end
 end
diff --git a/app/helpers/admins_helper.rb b/app/helpers/admins_helper.rb
index ab430e71..af23f731 100644
--- a/app/helpers/admins_helper.rb
+++ b/app/helpers/admins_helper.rb
@@ -53,4 +53,8 @@ module AdminsHelper
         I18n.t("administrator.site_settings.registration.methods.approval")
       end
   end
+
+  def room_limit_number
+    Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
+  end
 end
diff --git a/app/helpers/rooms_helper.rb b/app/helpers/rooms_helper.rb
index e355a8e5..cf0f3dd7 100644
--- a/app/helpers/rooms_helper.rb
+++ b/app/helpers/rooms_helper.rb
@@ -27,4 +27,26 @@ module RoomsHelper
     Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Authentication") == "true" &&
       current_user.nil?
   end
+
+  def number_of_rooms_allowed
+    Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
+  end
+
+  def room_limit_exceeded
+    limit = Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
+
+    # Does not apply to admin or users that aren't signed in
+    # 15+ option is used as unlimited
+    return false if !current_user || current_user&.has_role?(:admin) || limit == 15
+
+    current_user.rooms.length >= limit
+  end
+
+  def current_room_exceeds_limit(room)
+    # Get how many rooms need to be deleted to reach allowed room number
+    limit = Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
+    @diff = current_user.rooms.count - limit
+
+    @diff.positive? && current_user.rooms.pluck(:id).index(room.id) + 1 > limit
+  end
 end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index b4f07ff0..82f395f5 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -41,6 +41,8 @@ class Setting < ApplicationRecord
         Rails.configuration.registration_method_default
       when "Room Authentication"
         false
+      when "Room Limit"
+        Rails.configuration.number_of_rooms_default
       end
     end
   end
diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb
index 83aa968d..d527be81 100644
--- a/app/views/rooms/show.html.erb
+++ b/app/views/rooms/show.html.erb
@@ -13,6 +13,12 @@
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
 
+<% exceeds_limit = current_room_exceeds_limit(@room)%>
+<% if exceeds_limit%>
+  <div class="alert alert-danger alert-dismissible text-center mb-0">
+    <%= t("room.room_limit_exceeded", difference: @diff) %>
+  </div>
+<% end %>
 <div class="background pb-1">
   <div class="container">
     <div class="row pt-9">
@@ -27,41 +33,45 @@
           <% end %>
         </div>
         <h4 class="text-left mb-6"><%= @room.sessions %> <%= t("room.sessions") %> | <%= @recordings.length %> <%= t("room.recordings") %></h4>
-        <label class="form-label"><%= t("room.invite_participants") %></label>
-        <div class="row">
-          <div class="col-lg-5 col-md-12 mt-2 pr-0">
-            <div class="input-icon invite-link-input">
-              <span class="input-icon-addon">
-                <i class="fas fa-link"></i>
-              </span>
-              <input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly="">
-            </div>
-          </div>
-          <div class="col-lg-7 col-md-12 pr-0">
-            <div class="row">
-              <div class="col-sm-6">
-                <a href="#" id="copy" class="btn btn-primary btn-block mt-2">
-                  <i class="fas fa-copy"></i>
-                  <%= t("copy") %>
-                </a>
+        <% unless exceeds_limit %>
+          <label class="form-label"><%= t("room.invite_participants") %></label>
+          <div class="row">
+            <div class="col-lg-5 col-md-12 mt-2 pr-0">
+              <div class="input-icon invite-link-input">
+                <span class="input-icon-addon">
+                  <i class="fas fa-link"></i>
+                </span>
+                <input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly="">
               </div>
-              <div class="col-sm-6 pl-0">
-                <% if Rails.configuration.enable_google_calendar_button %>
-                  <a href="<%= google_calendar_path %>" target="__blank" id="schedule" class="btn btn-primary btn-block mt-2">
-                    <i class="fas fa-calendar-plus"></i>
-                    <%= t("add_to_google_calendar") %>
+            </div>
+            <div class="col-lg-7 col-md-12 pr-0">
+              <div class="row">
+                <div class="col-sm-6">
+                  <a href="#" id="copy" class="btn btn-primary btn-block mt-2">
+                    <i class="fas fa-copy"></i>
+                    <%= t("copy") %>
                   </a>
-                <% end %>
+                </div>
+                <div class="col-sm-6 pl-0">
+                  <% if Rails.configuration.enable_google_calendar_button %>
+                    <a href="<%= google_calendar_path %>" target="__blank" id="schedule" class="btn btn-primary btn-block mt-2">
+                      <i class="fas fa-calendar-plus"></i>
+                      <%= t("add_to_google_calendar") %>
+                    </a>
+                  <% end %>
+                </div>
               </div>
             </div>
           </div>
-        </div>
+        <% end %>
       </div>
       <div class="offset-lg-1 col-lg-3 col-sm-12 force-bottom mt-5 pr-0">
         <% if @is_running %>
           <%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %>
         <% else %>
-          <%= button_to t("room.start"), start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %>
+          <% unless exceeds_limit %>
+            <%= button_to t("room.start"), start_room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %>
+          <% end %>
         <% end %>
       </div>
     </div>
@@ -82,7 +92,9 @@
           <%= render "shared/modals/delete_room_modal", room: room %>
         <% end %>
       <% end %>
-      <%= render "shared/components/create_room_block"%>
+      <% unless room_limit_exceeded %>
+        <%= render "shared/components/create_room_block"%>
+      <% end %>
     </div>
   </div>
 </div>
diff --git a/app/views/shared/admin_settings/_site_settings.html.erb b/app/views/shared/admin_settings/_site_settings.html.erb
index 62d124f1..e9721d84 100644
--- a/app/views/shared/admin_settings/_site_settings.html.erb
+++ b/app/views/shared/admin_settings/_site_settings.html.erb
@@ -78,7 +78,7 @@
       </div>
     </div>
   </div>
-  <div class="row">
+  <div class="mb-6 row">
     <div class="col-12">
       <div class="form-group">
         <label class="form-label"><%= t("administrator.site_settings.authentication.title") %></label>
@@ -99,4 +99,38 @@
       </div>
     </div>
   </div>
+  <div class="row">
+    <div class="col-12">
+      <div class="form-group">
+        <label class="form-label"><%= t("administrator.site_settings.rooms.title") %></label>
+        <label class="form-label text-muted"><%= t("administrator.site_settings.rooms.info") %></label>
+        <div class="row gutters-xs">
+          <div class="col-auto">
+            <label class="colorinput">
+              <%= button_to admin_room_limit_path(limit: 1), class: "colorinput-input" do %><% end %>
+              <span class="colorinput-color <%= room_limit_number == 1 ? "btn-primary" : "btn-outline-primary" %>">1</span>
+            </label>
+          </div>
+          <div class="col-auto">
+            <label class="colorinput">
+              <%= button_to admin_room_limit_path(limit: 5), class: "colorinput-input" do %><% end %>
+              <span class="colorinput-color <%= room_limit_number == 5 ? "btn-primary" : "btn-outline-primary" %>">5</span>
+            </label>
+          </div>
+          <div class="col-auto">
+            <label class="colorinput">
+              <%= button_to admin_room_limit_path(limit: 10), class: "colorinput-input" do %><% end %>
+              <span class="colorinput-color <%= room_limit_number == 10 ? "btn-primary" : "btn-outline-primary" %>">10</span>
+            </label>
+          </div>
+          <div class="col-auto">
+            <label class="colorinput">
+              <%= button_to admin_room_limit_path(limit: 15), class: "colorinput-input" do %><% end %>
+              <span class="colorinput-color <%= room_limit_number == 15 ? "btn-primary" : "btn-outline-primary" %>">15+</span>
+            </label>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/config/application.rb b/config/application.rb
index 06cd5765..7e6f8915 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -130,6 +130,9 @@ module Greenlight
     # Default registration method if the user does not specify one
     config.registration_method_default = config.registration_methods[:open]
 
+    # Default limit on number of rooms users can create
+    config.number_of_rooms_default = 15
+
     # Default admin password
     config.admin_password_default = ENV['ADMIN_PASSWORD'] || 'administrator'
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f0eb5539..1e444d3c 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -55,6 +55,9 @@ en:
           approval: Approve/Decline
           invite: Join by Invitation
           open: Open Registration
+      rooms:
+        info: Limits the number of rooms that a user can have (including Home Room). This setting does not apply to administrators.
+        title: Number of Rooms per User
       subtitle: Customize Greenlight
       title: Site Settings
     flash:
@@ -353,6 +356,8 @@ en:
     owner: Owner
     no_sessions: This room has no sessions, yet!
     recordings: Room Recordings
+    room_limit: You have reached the maximum number of rooms allowed
+    room_limit_exceeded: You have exceeded the number of rooms allowed. Please delete %{difference} room(s) to access this room.
     sessions: Sessions
     settings: Room Settings
     start: Start
diff --git a/config/routes.rb b/config/routes.rb
index f2a39a23..a99d62cb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -51,6 +51,7 @@ Rails.application.routes.draw do
     post '/invite', to: 'admins#invite', as: :invite_user
     post '/registration_method/:method', to: 'admins#registration_method', as: :admin_change_registration
     post '/approve/:user_uid', to: 'admins#approve', as: :admin_approve
+    post '/room_limit', to: 'admins#room_limit', as: :admin_room_limit
   end
 
   scope '/themes' do
diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb
index 4bdc4aa3..3f55a2c0 100644
--- a/spec/controllers/admins_controller_spec.rb
+++ b/spec/controllers/admins_controller_spec.rb
@@ -247,7 +247,9 @@ describe AdminsController, type: :controller do
         expect(response).to redirect_to(admins_path)
       end
     end
+  end
 
+  describe "Site Settings" do
     context "POST #registration_method" do
       it "changes the registration method for the given context" do
         allow(Rails.configuration).to receive(:enable_email_verification).and_return(true)
@@ -294,5 +296,21 @@ describe AdminsController, type: :controller do
         expect(response).to redirect_to(admins_path)
       end
     end
+
+    context "POST #room_limit" do
+      it "changes the room limit setting" do
+        allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
+        allow_any_instance_of(User).to receive(:greenlight_account?).and_return(true)
+
+        @request.session[:user_id] = @admin.id
+
+        post :room_limit, params: { limit: 5 }
+
+        feature = Setting.find_by(provider: "provider1").features.find_by(name: "Room Limit")
+
+        expect(feature[:value]).to eq("5")
+        expect(response).to redirect_to(admins_path)
+      end
+    end
   end
 end
diff --git a/spec/controllers/rooms_controller_spec.rb b/spec/controllers/rooms_controller_spec.rb
index 1492e84c..b9899079 100644
--- a/spec/controllers/rooms_controller_spec.rb
+++ b/spec/controllers/rooms_controller_spec.rb
@@ -129,7 +129,7 @@ describe RoomsController, type: :controller do
       expect(response).to redirect_to(r)
     end
 
-    it "it should redirect to root if not logged in" do
+    it "should redirect to root if not logged in" do
       expect do
         name = Faker::Games::Pokemon.name
         post :create, params: { room: { name: name } }
@@ -138,7 +138,7 @@ describe RoomsController, type: :controller do
       expect(response).to redirect_to(root_path)
     end
 
-    it "it should redirect back to main room with error if it fails" do
+    it "should redirect back to main room with error if it fails" do
       @request.session[:user_id] = @owner.id
 
       room_params = { name: "", "client": "html5", "mute_on_join": "1" }
@@ -148,6 +148,19 @@ describe RoomsController, type: :controller do
       expect(flash[:alert]).to be_present
       expect(response).to redirect_to(@owner.main_room)
     end
+
+    it "redirects to main room if room limit is reached" do
+      allow_any_instance_of(Setting).to receive(:get_value).and_return(1)
+
+      @request.session[:user_id] = @owner.id
+
+      room_params = { name: Faker::Games::Pokemon.name, "client": "html5", "mute_on_join": "1" }
+
+      post :create, params: { room: room_params }
+
+      expect(flash[:alert]).to be_present
+      expect(response).to redirect_to(@owner.main_room)
+    end
   end
 
   describe "POST #join" do

From 5d4bd1b8514808d8e6afcc2330445d1ed2060fa8 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Tue, 9 Jul 2019 11:00:33 -0400
Subject: [PATCH 08/17] GRN2-174: Added 404 if user does not exist (#609)

* Added 404 if user does not exist

* Differentiated between 404 and 500

* Rspec fixes
---
 app/controllers/application_controller.rb     | 17 +++++++++--
 app/views/errors/not_found.html.erb           | 15 ++++++----
 config/locales/en.yml                         |  2 ++
 .../application_controller_spec.rb            | 28 +++++++++++++++++++
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 95bb979b..c8943667 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -131,10 +131,21 @@ class ApplicationController < ActionController::Base
   end
 
   def set_user_domain
-    @user_domain = if Rails.env.test? || !Rails.configuration.loadbalanced_configuration
-      "greenlight"
+    if Rails.env.test? || !Rails.configuration.loadbalanced_configuration
+      @user_domain = "greenlight"
     else
-      parse_user_domain(request.host)
+      @user_domain = parse_user_domain(request.host)
+
+      # Checks to see if the user exists
+      begin
+        retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials')
+      rescue => e
+        if e.message.eql? "No user with that id exists"
+          render "errors/not_found", locals: { user_not_found: true }
+        else
+          render "errors/internal_error"
+        end
+      end
     end
   end
   helper_method :set_user_domain
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
index 647e34c8..95bdcbbb 100644
--- a/app/views/errors/not_found.html.erb
+++ b/app/views/errors/not_found.html.erb
@@ -15,9 +15,14 @@
 
 <div class="container text-center pt-9">
   <div class="display-1 text-muted mb-5">404</div>
-  <h1 class="h2 mb-3"><%= t("errors.not_found.message") %></h1>
-  <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.help") %></p>
-  <a class="btn btn-primary" href="javascript:history.back()">
-    <i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
-  </a>
+  <% if defined?(user_not_found) %>
+    <h1 class="h2 mb-3"><%= t("errors.not_found.user_message") %></h1>
+    <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.user_help") %></p>
+  <% else %>
+    <h1 class="h2 mb-3"><%= t("errors.not_found.message") %></h1>
+    <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.help") %></p>
+    <a class="btn btn-primary" href="javascript:history.back()">
+      <i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
+    </a>
+  <% end %>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1e444d3c..375f164c 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -140,6 +140,8 @@ en:
     not_found:
       message: Whoops! Looks like we can't find that.
       help: Is it possible its been removed?
+      user_message: User Not Found.
+      user_help: Sorry, this user is not registered.
     title: Errors
     unauthorized:
       message: You do not have access to this application
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 0d5e9550..14bf1f65 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -31,6 +31,10 @@ describe ApplicationController do
     def error
       raise BigBlueButton::BigBlueButtonException
     end
+
+    def user_not_found
+      set_user_domain
+    end
   end
 
   context "roles" do
@@ -66,5 +70,29 @@ describe ApplicationController do
       get :error
       expect(response).to render_template("errors/bigbluebutton_error")
     end
+
+    it "renders a 404 error if user is not found" do
+      allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
+      allow(Rails.env).to receive(:test?).and_return(false)
+      allow_any_instance_of(SessionsHelper).to receive(:parse_user_domain).and_return("")
+      allow_any_instance_of(BbbApi).to receive(:retrieve_provider_info).and_raise("No user with that id exists")
+
+      routes.draw { get "user_not_found" => "anonymous#user_not_found" }
+
+      get :user_not_found
+      expect(response).to render_template("errors/not_found")
+    end
+
+    it "renders a 500 error if any other error is not found" do
+      allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
+      allow(Rails.env).to receive(:test?).and_return(false)
+      allow_any_instance_of(SessionsHelper).to receive(:parse_user_domain).and_return("")
+      allow_any_instance_of(BbbApi).to receive(:retrieve_provider_info).and_raise("Other error")
+
+      routes.draw { get "user_not_found" => "anonymous#user_not_found" }
+
+      get :user_not_found
+      expect(response).to render_template("errors/internal_error")
+    end
   end
 end

From a3158b5872acd389510a60c509e062bc90d6d240 Mon Sep 17 00:00:00 2001
From: Jesus Federico <jesus@123it.ca>
Date: Tue, 9 Jul 2019 12:24:30 -0400
Subject: [PATCH 09/17]  GRN2-178: Generalized use of language_name based on
 Mozilla Mapping (#613)

* GRN2-178: Generalized use of language_name based on Moxilla Mapping

* Fixed issues catched by rubocop

* MAke sure the file with data exists

* Removed language mapping from local code
---
 Gemfile                           |   2 +
 Gemfile.lock                      |   2 +
 app/helpers/application_helper.rb |   7 +-
 config/locales/ar.yml             |   1 -
 config/locales/de_DE.yml          |   9 +-
 config/locales/el.yml             |   1 -
 config/locales/en.yml             |   9 +-
 config/locales/es.yml             |   9 +-
 config/locales/es_MX.yml          |   9 +-
 config/locales/fa_IR.yml          |   9 +-
 config/locales/fr.yml             |   1 -
 config/locales/hi_IN.yml          |   1 -
 config/locales/hu_HU.yml          |   9 +-
 config/locales/it.yml             |  82 +++++++-
 config/locales/it_IT.yml          | 322 ------------------------------
 config/locales/pt.yml             |   1 -
 config/locales/pt_BR.yml          |   1 -
 config/locales/ru_RU.yml          |   1 -
 config/locales/vi_VN.yml          |   1 -
 config/locales/zh_CN.yml          |   9 +-
 20 files changed, 114 insertions(+), 372 deletions(-)
 delete mode 100644 config/locales/it_IT.yml

diff --git a/Gemfile b/Gemfile
index 1dfe1cd1..e32bf501 100644
--- a/Gemfile
+++ b/Gemfile
@@ -121,3 +121,5 @@ gem 'random_password'
 
 # Adds helpers for the Google reCAPTCHA API
 gem "recaptcha"
+
+gem 'i18n-language-mapping', '~> 0.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 71ccf81e..9fd50cf3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -101,6 +101,7 @@ GEM
     http_accept_language (2.1.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    i18n-language-mapping (0.1.0)
     jaro_winkler (1.5.2)
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
@@ -333,6 +334,7 @@ DEPENDENCIES
   faker
   health_check
   http_accept_language
+  i18n-language-mapping (~> 0.1.0)
   jbuilder (~> 2.5)
   jquery-rails (~> 4.3.3)
   listen (~> 3.0.5)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9ae09ecb..b4c77a83 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -17,10 +17,12 @@
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 require 'bbb_api'
+require 'i18n/language/mapping'
 
 module ApplicationHelper
   include MeetingsHelper
   include BbbApi
+  include I18n::Language::Mapping
 
   # Gets all configured omniauth providers.
   def configured_providers
@@ -54,9 +56,8 @@ module ApplicationHelper
     locales = I18n.available_locales
     language_opts = [['<<<< ' + t("language_default") + ' >>>>', "default"]]
     locales.each do |locale|
-      language_name = t("language_name", locale: locale)
-      language_name = locale.to_s if locale != :en && language_name == 'English'
-      language_opts.push([language_name, locale.to_s])
+      language_mapping = I18n::Language::Mapping.language_mapping_list[locale.to_s.gsub("_", "-")]
+      language_opts.push([language_mapping["nativeName"], locale.to_s])
     end
     language_opts.sort
   end
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index d204e24d..9907b61c 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -93,7 +93,6 @@ ar:
     video: شاهد برنامجنا التعليمي حول استخدام Greenlight
     upgrade: أرني كيفية الترقية إلى 2.0!
     version: لقد أصدرنا إصدارًا جديدًا من Greenlight ، لكن قاعدة البيانات غير متوافقة.
-  language_name: العربية
   language_default: الافتراضي (لغة المتصفح)
   ldap_error: غير قادر على الاتصال بخادم LDAP. يرجى التحقق من تكوين LDAP في ملف env والتأكد من تشغيل خادمك.
   login: الدخول
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index af9fc63b..c85614dd 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -175,7 +175,6 @@ de_DE:
     video: Schauen Sie sich unsere Anleitung zur Verwendung von Greenlight an
     upgrade: "Zeigen Sie mir, wie ich auf Version 2.0. update!"
     version: "Wir haben eine neue Version von Greenlight veröffentlicht, aber Ihre Datenbank ist damit nicht kompatibel."
-  language_name: Deutsch
   language_default: Voreinstellung (Browsersprache)
   ldap_error: "Verbindung zum LDAP Server konnte nicht hergestellt werden. Bitte überprüfen Sie die LDAP Konfiguration und stellen Sie sicher, dass der LDAP-Server läuft."
   login: Einloggen
@@ -190,7 +189,7 @@ de_DE:
           info: Ein neuer Nutzer hat sich bei Greenlight angemeldet.
           more-info: "Um diesem Nutzer Zugriff auf Greenlight zu geben, müssen Sie seinen Account in den Organisationseinstellungen genehmigen."
           admins_link: Organisationsseite besuchen
-          subject: Neue Greenlight Nutzerregistierung 
+          subject: Neue Greenlight Nutzerregistierung
           username: "Der Nutzer hat sich mit dem Namen %{name} und der Email %{email} registiert."
         subject: Account genehmigt
         username: "Ihr Nutzername ist %{email}."
@@ -206,7 +205,7 @@ de_DE:
         signup:
           info: Ein Nutzer hat Sie dazu eingeladen sich für die Nutzung von Greenlight zu registieren.
           admins_link: Organisationsseite besuchen
-          subject: Registierung neuer Greenlight-Nutzer 
+          subject: Registierung neuer Greenlight-Nutzer
           username: "Der Nutzer hat sich mit dem Namen %{name} und der Email %{email} registriert."
         subject: Einladung zur BigBlueButton-Teilnahme
         username: "Ihr Nutzername ist %{email}."
@@ -311,11 +310,11 @@ de_DE:
     format:
       presentation: Präsentation
   registration:
-    approval: 
+    approval:
       fail: "Ihr Account wurde noch nicht freigeschaltet. Falls Sie sich bereits vor mehreren Tagen registriert haben, kontaktieren Sie bitte Ihren Administrator."
       signup: Ihr Account wurde erfolgreich erzeugt. Er muss noch durch einen Administrator freigeschaltet werden.
     banned:
-      fail: "Sie haben keinen Zugriff auf dieses Applikation. Falls Sie denken, dass hier ein Fehler vorliegt, kontaktieren Sie bitte Ihren Administrator." 
+      fail: "Sie haben keinen Zugriff auf dieses Applikation. Falls Sie denken, dass hier ein Fehler vorliegt, kontaktieren Sie bitte Ihren Administrator."
     invite:
       fail: "Ihr Token ist entweder ungültig oder er ist abgelaufen. Falls Sie denken, dass hier ein Fehler vorliegt, kontaktieren Sie bitte Ihren Administrator."
       no_invite: "Sie sind nicht zu Teilnahme eingeladen. Bitte kontaktieren Sie Ihren Administrator, um eine Einladung zu erhalten."
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 7a567b0e..0ac909e9 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -69,7 +69,6 @@ el:
     video: Παρακολουθήστε το σεμινάριο μας σχετικά με τη χρήση του Greenlight
     upgrade: Δείξε μου πώς να αναβαθμίσω σε 2.0!
     version: "Έχουμε κυκλοφορήσει μια νέα έκδοση του Greenlight, αλλά η βάση δεδομένων σας δεν είναι συμβατή."
-  language_name: Ελληνικά
   ldap_error: Δεν είναι δυνατή η σύνδεση με το διακομιστή LDAP. Ελέγξτε τη διαμόρφωση του LDAP στο αρχείο env και βεβαιωθείτε ότι ο διακομιστής σας εκτελείται.
   login: Σύνδεση
   modal:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 375f164c..0a34b25b 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -191,7 +191,6 @@ en:
     video: Watch our tutorial on using Greenlight
     upgrade: Show me how to upgrade to 2.0!
     version: We've released a new version of Greenlight, but your database isn't compatible.
-  language_name: English
   language_default: Default (browser language)
   ldap_error: Unable to connect to the LDAP server. Please check your LDAP configuration in the env file and ensure your server is running.
   login: Sign in
@@ -206,7 +205,7 @@ en:
           info: A new user has signed up to use Greenlight.
           more-info: To allow this user to access Greenlight you must approve their account in organization settings.
           admins_link: Visit the Organization Page
-          subject: New Greenlight User Sign Up 
+          subject: New Greenlight User Sign Up
           username: The user signed up with the name %{name} and the email %{email}.
         subject: Account Approved
         username: Your username is %{email}.
@@ -222,7 +221,7 @@ en:
         signup:
           info: A user that was invited has signed up to use Greenlight.
           admins_link: Visit the Organization Page
-          subject: New Greenlight User Sign Up 
+          subject: New Greenlight User Sign Up
           username: The user signed up with the name %{name} and the email %{email}.
         subject: Invitation to join BigBlueButton
         username: Your username is %{email}.
@@ -327,11 +326,11 @@ en:
     format:
       presentation: Presentation
   registration:
-    approval: 
+    approval:
       fail: Your account has not been approved yet. If multiples days have passed since you signed up, please contact your administrator.
       signup: Your account was successfully created. It has been sent to an administrator for approval.
     banned:
-      fail: You do not have access to this application. If you believe this is a mistake, please contact your administrator. 
+      fail: You do not have access to this application. If you believe this is a mistake, please contact your administrator.
     invite:
       fail: Your token is either invalid or has expired. If you believe this is a mistake, please contact your administrator.
       no_invite: You do not have an invitation to join. Please contact your administrator to receive one.
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7599391a..e726de20 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -175,7 +175,6 @@ es:
     video: Ve nuestro tutorial de como utilizar Greenlight
     upgrade: Muestrame como actualizar a versión 2.0
     version: Hemos publicado una nueva version de Greenlight pero tu base de datos no es compatible.
-  language_name: Español
   language_default: Por omisión (idioma del navegador)
   ldap_error: No se puede conectar al servidor LDAP. Compruebe la configuración de LDAP en el archivo "env" y asegúrate de que tu servidor está ejecutándose.
   login: Ingresar
@@ -190,7 +189,7 @@ es:
           info: Se ha registrado un usuario nuevo.
           more-info: Para permitir el acceso de este usuario debes aprobar su cuenta de usuario a través de la configuración de la organización.
           admins_link: Ir a la página de la organización
-          subject: Registro de usuario nuevo 
+          subject: Registro de usuario nuevo
           username: "El usuario se ha registrado como %{name} con el email %{email}."
         subject: Cuenta de usuario autorizada
         username: "Tu nombre de usuario es %{email}"
@@ -206,7 +205,7 @@ es:
         signup:
           info: Un usuario que fue invitado a registrarse ha completado su registro.
           admins_link: Ir a la página de la organización
-          subject: Registro de usuario nuevo 
+          subject: Registro de usuario nuevo
           username: "El usuario se ha registrado como %{name} con el email %{email}."
         subject: Invitación a ingresar a BigBlueButton
         username: "Tu nombre de usuario es %{email}."
@@ -311,11 +310,11 @@ es:
     format:
       presentation: Presentación
   registration:
-    approval: 
+    approval:
       fail: "Tú cuenta de usuario todavía no ha sido autorizada. Si han pasado varios días desde tú registro, te sugerimos contactar al administrador."
       signup: Tú cuenta de usuario ha sido creada y se le ha enviado una notificación al administrador para su autorización.
     banned:
-      fail: "No tienes acceso a esta aplicación. Sí tu crees que este es un error, contacta al administrador del sistema." 
+      fail: "No tienes acceso a esta aplicación. Sí tu crees que este es un error, contacta al administrador del sistema."
     invite:
       fail: "Tu código ha expirado o es invalido. Sí tu crees que este es un error, contacta al administrador del sistema."
       no_invite: No tienes una invitación para ingresar. Contacta al administrador del sistema para obtener una.
diff --git a/config/locales/es_MX.yml b/config/locales/es_MX.yml
index e330203e..68254c69 100644
--- a/config/locales/es_MX.yml
+++ b/config/locales/es_MX.yml
@@ -175,7 +175,6 @@ es_MX:
     video: Ve nuestro tutorial de como utilizar Greenlight
     upgrade: Muestrame como actualizar a versión 2.0
     version: Hemos publicado una nueva version de Greenlight pero tu base de datos no es compatible.
-  language_name: Español (México)
   language_default: Por omisión (idioma del navegador)
   ldap_error: No se puede conectar al servidor LDAP. Compruebe la configuración de LDAP en el archivo "env" y asegúrate de que tu servidor está ejecutándose.
   login: Ingresar
@@ -190,7 +189,7 @@ es_MX:
           info: Se ha registrado un usuario nuevo.
           more-info: Para permitir el acceso de este usuario debes aprobar su cuenta de usuario a través de la configuración de la organización.
           admins_link: Ir a la página de la organización
-          subject: Registro de usuario nuevo 
+          subject: Registro de usuario nuevo
           username: "El usuario se ha registrado como %{name}con el email %{email}."
         subject: Cuenta de usuario autorizada
         username: "Tu nombre de usuario es %{email}."
@@ -206,7 +205,7 @@ es_MX:
         signup:
           info: Un usuario que fue invitado a registrarse ha completado su registro.
           admins_link: Ir a la página de la organización
-          subject: Registro de usuario nuevo 
+          subject: Registro de usuario nuevo
           username: "El usuario se ha registrado como%{name} con el email %{email}. "
         subject: Invitación a ingresar a BigBlueButton
         username: "Tu nombre de usuario es %{email}."
@@ -311,11 +310,11 @@ es_MX:
     format:
       presentation: Presentación
   registration:
-    approval: 
+    approval:
       fail: "Tú cuenta de usuario todavía no ha sido autorizada. Si han pasado varios días desde tú registro, te sugerimos contactar al administrador."
       signup: Tú cuenta de usuario ha sido creada y se le ha enviado una notificación al administrador para su autorización.
     banned:
-      fail: "No tienes acceso a esta aplicación. Sí tu crees que este es un error, contacta al administrador del sistema." 
+      fail: "No tienes acceso a esta aplicación. Sí tu crees que este es un error, contacta al administrador del sistema."
     invite:
       fail: "Tu código ha expirado o es invalido. Sí tu crees que este es un error, contacta al administrador del sistema."
       no_invite: No tienes una invitación para ingresar. Contacta al administrador del sistema para obtener una.
diff --git a/config/locales/fa_IR.yml b/config/locales/fa_IR.yml
index 201927e5..e0240819 100644
--- a/config/locales/fa_IR.yml
+++ b/config/locales/fa_IR.yml
@@ -175,7 +175,6 @@ fa_IR:
     video: ویدئوی آموزشی ما را در مورد استفاده از گرین لایت مشاهده کنید
     upgrade: به من نشان بده چگونه به نسخه 2.0 به روز رسانی کنم!
     version: ما یک نسخه جدید از گرین لایت را منتشر کرده ایم، اما پایگاه داده شما با آن سازگاری ندارد.
-  language_name: انگلیسی
   language_default: پیشفرض (زبان مرورگر)
   ldap_error: امکان دسترسی به سرور LDAP وجود ندارد. لطفا تنظیمات LDAP خود را در فایل env بررسی کرده و مطمئن شوید سرور در حال اجرا است.
   login: ورود
@@ -190,7 +189,7 @@ fa_IR:
           info: یک کاربر جدید در گرین لایت ثبت نامه کرده است
           more-info: برای داشتن مجوز دسترسی برای این کاربر به گرین لایت، شما می بایست حساب کاربری آن ها را در تنظیمات سازمان تایید کنید.
           admins_link: مشاهده صفحه سازمان
-          subject: ثبت نام کاربر جدید گرین لایت 
+          subject: ثبت نام کاربر جدید گرین لایت
           username: "کاربر با نام %{name} و ادرس ایمیل %{email} ثبت نام کرده است."
         subject: حساب کاربری تایید شد
         username: "نام کاربری شما %{email} است."
@@ -206,7 +205,7 @@ fa_IR:
         signup:
           info: کاربری که دعوت کرده بودید برای استفاده از گرین لایت ثبت نام کرده است.
           admins_link: صفحه سازمان را مشاهده کنید
-          subject: ثبت نام کاربر گرین لایت جدید 
+          subject: ثبت نام کاربر گرین لایت جدید
           username: "کاربر با نام %{name} و ادرس ایمیل %{email} ثبت نام کرده است."
         subject: دعوت نامه برای پیوستن به بیگ بلو باتن
         username: "نام کاربری شما %{email} است."
@@ -310,11 +309,11 @@ fa_IR:
     format:
       presentation: ارائه
   registration:
-    approval: 
+    approval:
       fail: حساب کاربری شما هنوز تایید نشده است. اگر چند روز از ثبت نام شما گذشته است، لطفا با مدیر خود تماس بگیرید.
       signup: حساب کاربری شما با موفقیت ایجاد شد و برای تایید به مدیر ارسال شد.
     banned:
-      fail: شما دسترسی به این برنامه ندارید. اگر فکر میکنید این اشتباه است، لطفا با مدیر سیستم خود تماس بگیرید 
+      fail: شما دسترسی به این برنامه ندارید. اگر فکر میکنید این اشتباه است، لطفا با مدیر سیستم خود تماس بگیرید
     invite:
       fail: توکن شما به اتمام رسیده یا اشتباه است. اگر فک میکنید این اشتباه است، لطفا با مدیر سیستم خود تماس بگیرید
       no_invite: شما دعوت نامه ای برای ورود ندارید، لطفا برای دریافت آن با مدیر تماس بگیرید.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 410c8eb6..0a67e652 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -93,7 +93,6 @@ fr:
     video: Regardez notre tutoriel sur l'utilisation de Greenlight
     upgrade: Montrez-moi comment passer à la version 2.0 !
     version: "Nous avons publié une nouvelle version de Greenlight, mais votre base de données n'est pas compatible."
-  language_name: Française
   language_default: Par défaut (langue du navigateur)
   ldap_error: Impossible de se connecter au serveur LDAP. Veuillez vérifier votre configuration LDAP dans le fichier env et vous assurer que votre serveur est en cours d'exécution.
   login: Connexion
diff --git a/config/locales/hi_IN.yml b/config/locales/hi_IN.yml
index e2b6ae22..3ff7299f 100644
--- a/config/locales/hi_IN.yml
+++ b/config/locales/hi_IN.yml
@@ -93,7 +93,6 @@ hi_IN:
     video: ग्रीनलाइट का उपयोग करने पर हमारा ट्यूटोरियल देखें
     upgrade: मुझे 2.0 में अपग्रेड करने का तरीका दिखाएं!
     version: "हमने ग्रीनलाइट का एक नया संस्करण जारी किया है, लेकिन आपका डेटाबेस संगत नहीं है !"
-  language_name: अंग्रेज़ी
   language_default: डिफ़ॉल्ट (ब्राउज़र भाषा)
   ldap_error: LDAP सर्वर से कनेक्ट करने में असमर्थ। कृपया env फ़ाइल में अपना LDAP कॉन्फ़िगरेशन जांचें और सुनिश्चित करें कि आपका सर्वर चल रहा है।
   login: प्रवेश करने देना
diff --git a/config/locales/hu_HU.yml b/config/locales/hu_HU.yml
index a687312b..28288ca6 100644
--- a/config/locales/hu_HU.yml
+++ b/config/locales/hu_HU.yml
@@ -175,7 +175,6 @@ hu_HU:
     video: Nézd meg az ismertetőnket a  Greenlight használatáról
     upgrade: "Mutasd, hogyan tudok frissíteni a 2.0-ás verzióra!"
     version: "A Greenlight új verziója jelent meg, de az adatbázisod nem kompatibilis."
-  language_name: Angol
   language_default: Alapértelmezett (a böngésző nyelve)
   ldap_error: "Nem sikerült csatlakozni az LDAP szerverhez. Kérjük, ellenőrizd a beállításokat a környezeti, env fájlban, illetve azt, hogy a szerver működik és elérhető."
   login: Bejelentkezés
@@ -190,7 +189,7 @@ hu_HU:
           info: "Egy új felhasználó regisztrált, hogy használhassa a Greenlight-ot."
           more-info: "Ahhoz, hogy ez a felhasználó elérhesse a Greenlight-ot, a szervezheti beállításokban hozzá kell rendelned."
           admins_link: A Szervezeti oldal megtekintése
-          subject: Új Greenlight felhasználó regisztrált 
+          subject: Új Greenlight felhasználó regisztrált
           username: "A felhasználó %{name} felhasználónévvel, %{email} e-mail címmel regisztrált."
         subject: Jóváhagyott fiók
         username: "A felhasználóneved %{email}."
@@ -206,7 +205,7 @@ hu_HU:
         signup:
           info: "Egy meghívott felhasználó regisztrált, hogy használhassa a Greenlight-ot."
           admins_link: A Szervezeti oldal megtekintése
-          subject: Új Greenlight felhasználó regisztrált 
+          subject: Új Greenlight felhasználó regisztrált
           username: "A felhasználó %{name} felhasználónévvel, %{email} e-mail címmel regisztrált."
         subject: Meghívás a BigBlueButton használatára
         username: "A felhasználóneved %{email}."
@@ -310,11 +309,11 @@ hu_HU:
     format:
       presentation: Prezentáció
   registration:
-    approval: 
+    approval:
       fail: "A fiókodat még nem hagyták jóvá. Ha már többi nap eltelt a regisztrációd óta, lépj kapcsolatba az üzemeltetőkkel."
       signup: "A fiókodat sikeresen létrehoztuk, várunk az üzemeltető jóváhagyására."
     banned:
-      fail: "Nincs hozzáférésed ehhez az alkalmazáshoz. Amennyiben úgy gondolod, hogy ez egy hiba, kérjük, jelezd az üzemeltetőnek." 
+      fail: "Nincs hozzáférésed ehhez az alkalmazáshoz. Amennyiben úgy gondolod, hogy ez egy hiba, kérjük, jelezd az üzemeltetőnek."
     invite:
       fail: "A tokened nem érvényes vagy lejárt. Amennyiben úgy gondolod, hogy ez egy hiba, kérjük, jelezd az üzemeltetőnek."
       no_invite: Neked nem küldtünk meghívót. Kérhetsz egyet az üzemeltetőktől.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index b041e2be..92a9519a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -23,26 +23,48 @@ it:
         accepted_terms: "Termini e condizioni"
   administrator:
     site_settings:
+      authentication:
+        disabled: Disabilitato
+        enabled: Abilitato
+        info: Permettere l'accesso solo ad utenti autenticati
+        title: Richiedi autenticazione per ogni stanza
+        user-info: Devi registrarti ad DENTAL LIVE Manager per accedere alla stanza
       branding:
         change: Cambia immagine
         info: Cambia il logo del brand che appare nell'angolo in alto a sinistra
         placeholder: Indirizzo immagine...
         title: Logo
       color:
-        info: Cambia il colore primario usato nel sito
+        info: "Cambiando il valore del colore di base, verranno cambiati sia la versione chiara che scura. Le due versioni possono essere modificate individualmente"
         title: Colore primario
+        regular: Colore di base
+        lighten: Chiaro
+        Darken: Scuro
+      registration:
+        info: Cambiare il modo in cui gli utenti si registrano al sito web
+        title: Metodo di registrazione
+        methods:
+          approval: Approva/Rifiuta
+          invite: Accesso tramite invito
+          open: Registrazione libera
       subtitle: Personalizza Greenlight
       title: Impostazioni Sito
     flash:
+      approved: L'utente è stato approvato con successo
       banned: L'utente è stato bannato.
       unbanned: E' stato tolto il blocco utente.
       delete: L'utente è stato eliminato con successo
       delete_fail: Errore nell'eliminazione utente
       demoted: L'utente è stato declassato
+      invite: "L'invito è stato inviato a %{email}"
+      invite_email_verification: ""
       promoted: L'utente è stato promosso
+      registration_method_updated: Il metodo di registrazione è stato aggiornato con successo
+      settings: Le impostazioni web sono state modificate con successo
       unauthorized: Non sei autorizzato ad effettuare modifiche sull'utente
     title: Impostazioni dell'organizzazione
     users:
+      invite: Invita utente
       edit:
         title: Modifica dettagli utente
       settings:
@@ -79,6 +101,10 @@ it:
   email_sent: "La tua email di %{email_type} è stata inviata! (Controlla nella cartella Spam della tua email se non la ricevi)"
   enter_your_name: Inserisci il tuo nome!
   errors:
+    bigbluebutton:
+      help: "Per favore, assicurarsi di aver completato tutti i passaggi. <a href=\"%{doc_link}\">Altre informazioni</a>"
+      message: "Impostazioni di collegamento, Endpoint e Secret, errati"
+      title: Errore del server
     internal:
       message: Diamine! Sembra che qualcosa non funzioni qui da noi.
       help: "L'errore è stato salvato, abbiamo inviato un gruppo di scimmie per risolvere il problema."
@@ -149,13 +175,40 @@ it:
     video: Guarda il tutorial sull'utilizzo di GreenLight
     upgrade: Mostrami come aggiornare alla versione 2.0!
     version: "E' stata rilasciata una nuova versione di GreenLight, ma il tuo database non è compatibile."
-  language_name: Inglese
   language_default: Predefinito (linguaggio del browser)
   ldap_error: Impossibile collegarsi al server LDAP. Controlla la configurazione LDAP nel file env e assicurati che il server sia attivo.
   login: Entra
   login_title: Entra nel tuo account
   mailer:
     user:
+      approve:
+        info: Il tuo account è stato approvato.
+        signin: "Per accedere alle stanze personali, clicca sul bottone in basso ed effettua il login"
+        signin_link: Entra
+        signup:
+          info: "Un nuovo utente si è registrato "
+          more-info: ""
+          admins_link: ""
+          subject: ""
+          username: ""
+        subject: ""
+        username: ""
+      demoted:
+        info: ""
+        more-info: ""
+        root_link: ""
+        subtitle: ""
+      invite:
+        info: ""
+        signup: To signup using your email, click the button below and follow the steps.
+        signup_link: ""
+        signup:
+          info: ""
+          admins_link: ""
+          subject: ""
+          username: ""
+        subject: ""
+        username: ""
       password_reset:
         title: 'Reimposta password'
         welcome: "Sembra che tu abbia dimenticato la password per %{bigbluebutton}"
@@ -163,6 +216,11 @@ it:
         reset_link: Reimposta Password
         expire: Questo link scadrà tra 2 ore.
         ignore: Se non hai richiesto tu di reimpostare la password puoi ignorare questa email.
+      promoted:
+        admins_link: ""
+        info: ""
+        more-info: ""
+        subtitle: ""
       verify_email:
         welcome: "Benvenuti nel vostro spazio personale, %{name}!"
         success: "Supporta %{bigbluebutton}, puoi creare le tue stanze e ospitare meeting per collaborare con altri utenti."
@@ -189,7 +247,13 @@ it:
       confirm: "Sicuro di voler eliminare %{room}?"
       delete: "Sono sicuro, elimina la stanza."
       keep: "Ripensandoci, penso che la terrò."
-      warning: "<b>Non</b> potrai recuperare questa stanza e le relative %{recordings_num} registrazioni salvate."
+      warning: ""
+      recording_warning: ""
+    invite_user:
+      email_placeholder: ""
+      footer: ""
+      send: ""
+      title: ""
     login:
       or: o
       with: "Entra con %{provider}"
@@ -245,6 +309,15 @@ it:
       unlisted: Non in elenco
     format:
       presentation: Presentazione
+  registration:
+    approval:
+      fail: ""
+      signup: ""
+    banned:
+      fail: ""
+    invite:
+      fail: ""
+      no_invite: ""
   rename: Rinomina
   reset_password:
     subtitle: Reimposta password
@@ -254,6 +327,7 @@ it:
   roles:
     administrator: Amministratore
     banned: Bloccato
+    pending: ""
     super_admin: Super Amministratore
     user: Utente
   room:
@@ -274,7 +348,7 @@ it:
     update_settings_error: Si è verificato un errore nell'aggiornamento dei dettagli della stanza
     update_settings_success: Impostazioni della stanza aggiornate correttamente
     wait:
-      message: Il meeting non è ancora cominciato.
+      message: ""
       auto: Verrai inserito nella stanza non appena il meeting avrà inizio.
   settings:
     account:
diff --git a/config/locales/it_IT.yml b/config/locales/it_IT.yml
deleted file mode 100644
index ab370733..00000000
--- a/config/locales/it_IT.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-#
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-#
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-
-# Locale.
-
-it_IT:
-  activerecord:
-    attributes:
-      user:
-        accepted_terms: "Termini e condizioni"
-  administrator:
-    site_settings:
-      branding:
-        change: Cambia immagine
-        info: Cambia il logo del brand che appare nell'angolo in alto a sinistra
-        placeholder: Indirizzo immagine...
-        title: Logo
-      color:
-        info: Cambia il colore primario usato nel sito
-        title: Colore primario
-      subtitle: Personalizza Greenlight
-      title: Impostazioni Sito
-    flash:
-      banned: L'utente è stato bannato.
-      unbanned: E' stato tolto il blocco utente.
-      delete: L'utente è stato eliminato con successo
-      delete_fail: Errore nell'eliminazione utente
-      demoted: L'utente è stato declassato
-      promoted: L'utente è stato promosso
-      unauthorized: Non sei autorizzato ad effettuare modifiche sull'utente
-    title: Impostazioni dell'organizzazione
-    users:
-      edit:
-        title: Modifica dettagli utente
-      settings:
-        ban: Blocca utente
-        delete: Elimina
-        demote: Declassa utente
-        edit: Modifica
-        promote: Rendi amministratore
-        unban: Sblocca utente
-      table:
-        authenticator: Gestore di autenticazione
-        created: Creato
-        name: Nome
-        not_found: Nessun utente corrisponde alla ricerca
-        no_users: Nessun utente trovato
-        role: Ruolo
-        uid: ID Utente
-        username: Nome utente
-      title: Gestisci utenti
-  add_to_google_calendar: "Aggiungi a Google Calendar"
-  bigbluebutton: GrandeBottoneBlu
-  bigbluebutton_exception: "Dannazione, c'è stato un errore nell'avvio del meeting!"
-  cancel: Annulla
-  cookies:
-    cookie_info: "I Cookies aiutano a fornire i servizi personalizzati. Usando i nostri servizi, accetti di usare i nostri Cookies."
-    cookie_button: Accetto
-  copied: Copiato
-  copy: Copia
-  default_admin: "Stai utilizzando la password di default per l'account. Clicca <a href=\"%{edit_link}\">qui</a> per cambiarla"
-  delete: Elimina
-  delivery_error: Si è verificato un'errore nella consegna della mail. Contatta un amministratore!
-  docs: Documentazione
-  email: Email
-  email_sent: "La tua email di %{email_type} è stata inviata! (Controlla nella cartella Spam della tua email se non la ricevi)"
-  enter_your_name: Inserisci il tuo nome!
-  errors:
-    internal:
-      message: Diamine! Sembra che qualcosa non funzioni qui da noi.
-      help: "L'errore è stato salvato, abbiamo inviato un gruppo di scimmie per risolvere il problema."
-    migration_error:
-      contact_admin: "Non sei un amministratore, dovresti contattarne uno serio."
-      continue: Voglio restare con la verisione 1.0.
-      notice: >
-        Si è verificato un errore nella migrazione del database di GreenLight. <br> Questo può essere perché non hai aggiornato alla versione 2.0.
-      upgrade: Mostrami come aggiornare alla versione 2.0!
-      version: Abbiamo rilasciato una nuova versione di GreenLight ma il tuo database non sembra essere compatibile.
-    messages:
-      blank: non può essere vuoto
-      too_short: è troppo corto
-      invalid: non è valido
-      taken: è stato già utilizzato
-      accepted: devono essere accettati
-      confirmation: "non corrisponde a %{attribute}"
-      inclusion: non è nella lista
-    not_found:
-      message: Maledizione! Non riusciamo a trovarlo.
-      help: "Possibile che sia stato rimosso?"
-    title: Errori
-    unauthorized:
-      message: Non hai accesso a questa applicazione
-      help: "Se credi che sia un errore, contatta il tuo amministratore."
-    unprocessable:
-      message: Cavolo! Non possiamo processare la richiesta.
-      help: Sfortunatamente non è una richiesta valida.
-  expired_reset_token: Il link per il reset della password è scaduto!
-  features:
-    title: Caratteristiche
-    rooms: Stanze personalizzate
-    recordings: Gestione delle registrazioni
-    designs: Grafiche personalizzate
-    authentication: Autenticazione Utente
-  footer:
-    powered_by: "Questo progetto utilizza %{href}."
-  forgot_password:
-    subtitle: Password dimenticata
-    email: Email
-    submit: Invia
-  go_back: Indietro
-  greenlight: LuceVerde
-  header:
-    all_recordings: Tutte le Registrazioni
-    dropdown:
-      account_settings: Organizzazione
-      help: "Ti serve aiuto?"
-      home: Principale
-      settings: Profilo
-      signout: Esci
-  home_room: Stanza principale
-  info_update_success: Le informazioni sono state aggiornate.
-  invalid_user: "Accesso fallito: utente non trovato. Sicuro che l'email sia corretta?"
-  invalid_credentials: "Accesso fallito: credenziali errate. Sicuro che le credenziali siano corrette?"
-  invalid_login_method: "Accesso fallito: account non corretto. Devi effettuare l'accesso con omniauth."
-  invite_message: "Per invitare qualcuno a partecipare, inviagli questo link: "
-  javascript:
-    room:
-      mailer:
-        subject: 'ti ha mandato un invito per visualizzare una registrazione.'
-        body: 'Per visualizzare la registrazione, clicca su questo link: '
-        autogenerated: 'Questa email è stata generata automaticamente da BigBlueButton.'
-        footer: 'BigBlueButton è un sistema di videoconferenza basato su software libero. Per maggiori informazioni su BigBlueButton, visita https://bigbluebutton.org/.'
-  landing:
-    about: "%{href} è una semplice interfaccia per il software di video-conferenza open source BigBlueButton. Puoi creare Stanze per ospitare i meeting, o partecipare ad altri meeting utilizzando collegamenti brevi."
-    welcome: Benvenuti su BigBlueButton.
-    video: Guarda il tutorial sull'utilizzo di GreenLight
-    upgrade: Mostrami come aggiornare alla versione 2.0!
-    version: "E' stata rilasciata una nuova versione di GreenLight, ma il tuo database non è compatibile."
-  language_name: Inglese
-  language_default: Predefinito (linguaggio del browser)
-  ldap_error: Impossibile collegarsi al server LDAP. Controlla la configurazione LDAP nel file env e assicurati che il server sia attivo.
-  login: Entra
-  login_title: Entra nel tuo account
-  mailer:
-    user:
-      password_reset:
-        title: 'Reimposta password'
-        welcome: "Sembra che tu abbia dimenticato la password per %{bigbluebutton}"
-        message: 'Se è così, clicca sul link seguente per reimpostare la tua password:'
-        reset_link: Reimposta Password
-        expire: Questo link scadrà tra 2 ore.
-        ignore: Se non hai richiesto tu di reimpostare la password puoi ignorare questa email.
-      verify_email:
-        welcome: "Benvenuti nel vostro spazio personale, %{name}!"
-        success: "Supporta %{bigbluebutton}, puoi creare le tue stanze e ospitare meeting per collaborare con altri utenti."
-        username: "Il tuo nome utente è %{email}."
-        verify: "Per verificare il tuo account, clicca sul link seguente."
-        verify_text: 'Per verificare il tuo account, visita questo indirizzo: %{url}'
-        verify_link: Verifica Account
-        thanks: "Grazie per aver participato, buona giornata!"
-  max_concurrent: E' stato raggiunto il massimo numero di sessioni contemporanee!
-  modal:
-    create_room:
-      auto_join: Aggiungimi automaticamente alla stanza
-      create: Crea Stanza
-      free_delete: Puoi eliminare la stanza in qualsiasi momento.
-      name_placeholder: Inserisci il nome della stanza...
-      not_blank: Il nome della stanza non può essere vuoto
-      title: Crea una nuova stanza
-    delete_account:
-      confirm: "Sicuro di voler eliminare questo account?"
-      delete: Sono sicuro. Elimina questo account.
-      keep: "mmmh no dai, NON eliminarlo."
-      warning: Questa è la tua ultima possibilità. <b>Non</b> sarai in grado di recuperare i dati associati.
-    delete_room:
-      confirm: "Sicuro di voler eliminare %{room}?"
-      delete: "Sono sicuro, elimina la stanza."
-      keep: "Ripensandoci, penso che la terrò."
-      warning: "<b>Non</b> potrai recuperare questa stanza e le relative %{recordings_num} registrazioni salvate."
-    login:
-      or: o
-      with: "Entra con %{provider}"
-      forgot_password: "Hai dimenticato la password?"
-    rename_recording:
-    room_settings:
-      title: Impostazioni della stanza
-      update: Aggiorna Stanza
-      client: Seleziona il tipo di interfaccia
-      mute: Silenzia utenti quando entrano nella stanza
-      default: Predefinito
-      html: HTML5
-      flash: Flash
-      footer_text: Le impostazioni della stanza possono essere cambiate in qualsiasi momento.
-    rename_room:
-      name_placeholder: Inserisci il nome della nuova stanza...
-  name_update_success: Il nome della stanza è stato cambiato con successo!
-  no_user_email_exists: Non esistono utenti con la email specificata. Controlla di averla inserita correttamente.
-  omniauth_error: Si è verificato un errore con l'autenticazione omniauth. Prova ancora o contatta un amministratore!
-  pagy:
-    nav:
-      prev: "&lsaquo; Precedente"
-      next: "Prossimo &rsaquo;"
-      gap: "&hellip;"
-  password: Password
-  password_empty_notice: La password non può essere vuota.
-  password_reset_success: La password è stata reimpostata.
-  password_different_notice: La conferma della password non coincide.
-  provider:
-    google: Google
-    microsoft_office365: Office 365
-    twitter: Twitter
-  recaptcha:
-    errors:
-      recaptcha_unreachable: "Accidenti, la verifica reCAPTCHA è fallita. Riprova."
-      verification_failed: "Accidenti, la verifica reCAPTCHA è fallita. Riprova."
-  recording:
-    all_recordings: Tutte le registrazioni
-    email: Registrazioni Email
-    no_recordings: "Questa stanza non ha %{inject} registrazioni."
-    no_user_recordings: Non ci sono registrazioni al momento.
-    no_matched_recordings: Nessuna registrazione corrisponde alla tua ricerca.
-    recorded_on: "Registrato il %{date}"
-    table:
-      name: Nome
-      thumbnails: Anteprima
-      length: Durata
-      users: Utenti
-      visibility: Visibilità
-      formats: Formati
-    visibility:
-      public: Pubblica
-      unlisted: Non in elenco
-    format:
-      presentation: Presentazione
-  rename: Rinomina
-  reset_password:
-    subtitle: Reimposta password
-    password: Nuova password
-    confirm: Conferma nuova password
-    update: Aggiorna password
-  roles:
-    administrator: Amministratore
-    banned: Bloccato
-    super_admin: Super Amministratore
-    user: Utente
-  room:
-    create_room: Crea una stanza
-    create_room_error: Si è verificato un errore nella creazione della stanza
-    create_room_success: La stanza è stata creata correttamente
-    invited: Hai ricevuto un invito per partecipare
-    invite_participants: Invita partecipanti
-    join: Partecipa
-    last_session: "Ultima sessione: %{session}"
-    owner: Proprietario
-    no_sessions: Questa stanza non ha ancora una sessione attiva!
-    recordings: Registrazioni della stanza
-    sessions: Sessioni
-    settings: Impostazioni Stanza
-    start: Avvia
-    unavailable: La stanza non è disponibile finché il proprietario non verifica il suo indirizzo email.
-    update_settings_error: Si è verificato un errore nell'aggiornamento dei dettagli della stanza
-    update_settings_success: Impostazioni della stanza aggiornate correttamente
-    wait:
-      message: Il meeting non è ancora cominciato.
-      auto: Verrai inserito nella stanza non appena il meeting avrà inizio.
-  settings:
-    account:
-      fullname: Nome completo
-      language: Lingua
-      provider: Fornitore
-      image: Immagine
-      image_url: Indirizzo immagine del profilo
-      subtitle: Aggiorna le informazioni del tuo account
-      title: Informazioni account
-    delete:
-      button: "Si, voglio eliminare il mio account."
-      disclaimer: "Se scegli di eliminare il tuo account, <b>NON</b> sarà possibile recuperarlo. Tutte le informazioni riguardo l'account, incluse impostazioni, stanze e registrazioni, verranno eliminate."
-      subtitle: Elimina definitivamente l'account
-      title: Elimina account
-    password:
-      confirmation: Conferma nuova Password
-      new: Nuova Password
-      old: Vecchia Password
-      subtitle: Cambia la password
-      title: Password
-    title: Profilo
-    search: Cerca
-  signup:
-    password_confirm: Conferma Password
-    subtitle: Crea un Account
-    title: Iscriviti
-    with: "Iscriviti con %{provider}"
-  terms:
-    accept: "Accetto %{href}"
-    accept_existing: Accetto i termini e le condizioni
-    title: Termini e Condizioni
-  test_install: >
-    Questa versione usa un server di test pre-configurato, dovresti rimpiazzarlo con il tuo. Per i dettagli, visita %{href}.
-  update: Aggiorna
-  verify:
-    accept: Verifica
-    activated: Account verificato!
-    already_verified: L'Account è già stato verificato
-    invalid: Link di verifica non valido
-    not_verified: Il tuo account non è ancora stato verificato.
-    resend: Rimanda email di verifica
-    signin: Effettua l'accesso al tuo account.
-    title: Verifica la tua email
-    verification: Verifica
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index dfd026ad..505327b7 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -93,7 +93,6 @@ pt:
     video: Assista ao nosso tutorial sobre como utilizar o Greenlight
     upgrade: Mostre-me como atualizar para o 2.0!
     version: "Lançamos uma nova versão do Greenlight, entretanto sua base de dados é incompatível."
-  language_name: Português
   language_default: Padrão (idioma do navegador)
   ldap_error: Não é possível conectar-se ao servidor LDAP. Verifique sua configuração LDAP no arquivo ENV e certifique-se de que seu servidor está funcionando.
   login: Login
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index d291085a..695c102f 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -93,7 +93,6 @@ pt_BR:
     video: Assista ao nosso tutorial sobre como utilizar o Greenlight
     upgrade: Mostre-me como atualizar para o 2.0!
     version: "Lançamos uma nova versão do Greenlight, entretanto sua base de dados é incompatível."
-  language_name: Português (Brasil)
   language_default: Padrão (idioma do navegador)
   ldap_error: Não é possível conectar ao servidor LDAP. Verifique sua configuração LDAP e certifique-se de que seu servidor está funcionando.
   login: Entrar
diff --git a/config/locales/ru_RU.yml b/config/locales/ru_RU.yml
index 3f997eb4..4c652616 100644
--- a/config/locales/ru_RU.yml
+++ b/config/locales/ru_RU.yml
@@ -85,7 +85,6 @@ ru_RU:
     video: Посмотрите наше руководство по использованию Greenlight
     upgrade: Показать мне как обновиться до версии 2.0!
     version: "Мы выпустили новую версию Greenlight, но Ваша база данных несовместима с ней."
-  language_name: Русский
   language_default: По умолчанию (язык браузера)
   ldap_error: Невозможно соединиться с сервером LDAP. Пожалуйста проверьте Вашу конфигурацию LDAP в env-файле и убедитесь в работоспособности Вашего LDAP-сервера.
   login: Войти
diff --git a/config/locales/vi_VN.yml b/config/locales/vi_VN.yml
index 70af3324..5762bc20 100644
--- a/config/locales/vi_VN.yml
+++ b/config/locales/vi_VN.yml
@@ -149,7 +149,6 @@ vi_VN:
     video: Xem thêm hướng dẫn sử dụng LiveRoom
     upgrade: Hãy chỉ cho tôi cách nâng cấp lên 2.0!
     version: "Chúng tôi đã phát hành phiên bản mới của Greenlight, nhưng cơ sở dữ liệu của bạn không tương thích."
-  language_name: Tiếng Anh
   language_default: Mặc định (ngôn ngữ từ trình duyệt)
   ldap_error: Không thể kết nối với máy chủ LDAP. Vui lòng kiểm tra cấu hình LDAP của bạn trong tệp env và đảm bảo máy chủ của bạn đang hoạt động.
   login: Đăng nhập
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index c30c7d51..a26fb655 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -175,7 +175,6 @@ zh_CN:
     video: 请看使用说明
     upgrade: 告诉我怎么升级到 2.0!
     version: 我们发布了新版Greenlight，但你的数据库不兼容。
-  language_name: 简体中文
   language_default: 默认（浏览器语言）
   ldap_error: 无法连接到LDAP服务器，请在env文件中检查LDAP配置，还要确保服务已经启动。
   login: 登录
@@ -190,7 +189,7 @@ zh_CN:
           info: 一个新用户已注册使用Greenlight。
           more-info: 若要允许此用户访问greenlight，您必须在“组织设置”中批准其帐户。
           admins_link: 访问组织页面
-          subject: 新Greenlight用户注册 
+          subject: 新Greenlight用户注册
           username: "用户注册了名称 %{name} 和电子邮箱 %{email}."
         subject: 帐户已批准
         username: "您的用户名是 %{email}."
@@ -206,7 +205,7 @@ zh_CN:
         signup:
           info: 被邀请的用户已注册使用greenlight。
           admins_link: 访问组织页面
-          subject: 新Greenlight用户注册 
+          subject: 新Greenlight用户注册
           username: "用户注册了名称%{name} 和电子邮箱 %{email}."
         subject: 邀请加入 BigBlueButton
         username: "您的用户名是 %{email}."
@@ -310,11 +309,11 @@ zh_CN:
     format:
       presentation: 演示
   registration:
-    approval: 
+    approval:
       fail: 您的帐户尚未批准。如果您注册后已过多天，请与管理员联系。
       signup: 您的帐户已成功创建。它已发送给管理员审批。
     banned:
-      fail: 您没有访问此应用程序的权限。如果您认为这是一个错误，请联系您的管理员。 
+      fail: 您没有访问此应用程序的权限。如果您认为这是一个错误，请联系您的管理员。
     invite:
       fail: 您的令牌无效或已过期。如果您认为这是一个错误，请联系您的管理员。
       no_invite: 您没有被邀请加入。请联系管理员申请邀请。

From 40b05b1626238596a01f936069783a95069a3b70 Mon Sep 17 00:00:00 2001
From: shawn-higgins1 <23224097+shawn-higgins1@users.noreply.github.com>
Date: Tue, 9 Jul 2019 13:06:07 -0400
Subject: [PATCH 10/17] GRN2-155: Begin preparing for removal of Twitter
 accounts (#615)

* Add twitter deprecation message

* Fix rspec test

* Extract room switch to its own method

* update method name
---
 app/controllers/sessions_controller.rb       |  14 ++
 app/controllers/users_controller.rb          |  12 +-
 app/helpers/application_helper.rb            |   6 +-
 app/helpers/sessions_helper.rb               |  22 +++
 app/views/shared/_flash_messages.html.erb    |   6 +-
 config/environments/test.rb                  |   2 +
 config/locales/en.yml                        |   6 +-
 spec/controllers/sessions_controller_spec.rb | 161 ++++++++++++++-----
 8 files changed, 180 insertions(+), 49 deletions(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 4f6abdd0..678ea8a0 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -51,6 +51,10 @@ class SessionsController < ApplicationController
       @auth = request.env['omniauth.auth']
       @user_exists = check_user_exists
 
+      if !@user_exists && @auth['provider'] == "twitter"
+        return redirect_to root_path, flash: { alert: I18n.t("registration.deprecated.twitter_signup") }
+      end
+
       # If using invitation registration method, make sure user is invited
       return redirect_to root_path, flash: { alert: I18n.t("registration.invite.no_invite") } unless passes_invite_reqs
 
@@ -70,6 +74,16 @@ class SessionsController < ApplicationController
                                              invite_registration && !@user_exists
 
       login(user)
+
+      if @auth['provider'] == "twitter"
+        flash[:alert] = if allow_user_signup? && allow_greenlight_accounts?
+                          I18n.t("registration.deprecated.twitter_signin",
+                            link: signup_path(old_twitter_user_id: user.id))
+                        else
+                          I18n.t("registration.deprecated.twitter_signin",
+                            link: signin_path(old_twitter_user_id: user.id))
+                        end
+      end
     rescue => e
         logger.error "Error authenticating via omniauth: #{e}"
         omniauth_fail
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4b2ba771..3883a584 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -62,6 +62,10 @@ class UsersController < ApplicationController
 
   # GET /signin
   def signin
+    unless params[:old_twitter_user_id].nil? && session[:old_twitter_user_id].nil?
+      flash[:alert] = I18n.t("registration.deprecated.new_signin")
+      session[:old_twitter_user_id] = params[:old_twitter_user_id] unless params[:old_twitter_user_id].nil?
+    end
   end
 
   # GET /signup
@@ -75,6 +79,12 @@ class UsersController < ApplicationController
       session[:invite_token] = params[:invite_token]
     end
 
+    unless params[:old_twitter_user_id].nil? && session[:old_twitter_user_id].nil?
+      logout
+      flash.now[:alert] = I18n.t("registration.deprecated.new_signin")
+      session[:old_twitter_user_id] = params[:old_twitter_user_id] unless params[:old_twitter_user_id].nil?
+    end
+
     @user = User.new
   end
 
@@ -175,7 +185,7 @@ class UsersController < ApplicationController
   end
 
   def ensure_unauthenticated
-    redirect_to current_user.main_room if current_user
+    redirect_to current_user.main_room if current_user && params[:old_twitter_user_id].nil?
   end
 
   def user_params
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b4c77a83..248ebbf8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -33,7 +33,11 @@ module ApplicationHelper
 
   # Determines which providers can show a login button in the login modal.
   def iconset_providers
-    configured_providers & [:google, :twitter, :microsoft_office365]
+    providers = configured_providers & [:google, :twitter, :microsoft_office365]
+
+    providers.delete(:twitter) if session[:old_twitter_user_id]
+
+    providers
   end
 
   # Generates the login URL for a specific provider.
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index dd4263cf..df1fa19d 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -19,6 +19,8 @@
 module SessionsHelper
   # Logs a user into GreenLight.
   def login(user)
+    migrate_twitter_user(user)
+
     session[:user_id] = user.id
 
     # If there are not terms, or the user has accepted them, check for email verification
@@ -97,4 +99,24 @@ module SessionsHelper
         hd_opts
       end
   end
+
+  def migrate_twitter_user(user)
+    if !session["old_twitter_user_id"].nil? && user.provider != "twitter"
+      old_user = User.find(session["old_twitter_user_id"])
+
+      old_user.rooms.each do |room|
+        room.owner = user
+
+        room.name = "Old " + room.name if room.id == old_user.main_room.id
+
+        room.save!
+      end
+
+      # Query for the old user again so the migrated rooms don't get deleted
+      old_user.reload
+      old_user.destroy!
+
+      session["old_twitter_user_id"] = nil
+    end
+  end
 end
diff --git a/app/views/shared/_flash_messages.html.erb b/app/views/shared/_flash_messages.html.erb
index 6d410e0c..6e863608 100644
--- a/app/views/shared/_flash_messages.html.erb
+++ b/app/views/shared/_flash_messages.html.erb
@@ -17,17 +17,17 @@
   <% if key.eql? "success" %>
     <div class="alert alert-success alert-dismissible text-center mb-0">
       <button type="button" class="close" data-dismiss="alert">&times</button>
-      <%= value %>
+      <%= value.html_safe %>
     </div>
   <% elsif key.eql? "alert" %>
     <div class="alert alert-danger alert-dismissible text-center mb-0">
       <button type="button" class="close" data-dismiss="alert">&times</button>
-      <%= value %>
+      <%= value.html_safe %>
     </div>
   <% elsif key.eql? "info" %>
     <div class="alert alert-info alert-dismissible text-center mb-0">
       <button type="button" class="close" data-dismiss="alert">&times</button>
-      <%= value %>
+      <%= value.html_safe %>
     </div>
   <% end %>
 <% end %>
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 5f68c35b..f4dd5186 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -49,4 +49,6 @@ Rails.application.configure do
   # Use standalone BigBlueButton server.
   config.bigbluebutton_endpoint = config.bigbluebutton_endpoint_default
   config.bigbluebutton_secret = config.bigbluebutton_secret_default
+
+  config.loadbalanced_configuration = false
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0a34b25b..a933429c 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -330,7 +330,11 @@ en:
       fail: Your account has not been approved yet. If multiples days have passed since you signed up, please contact your administrator.
       signup: Your account was successfully created. It has been sent to an administrator for approval.
     banned:
-      fail: You do not have access to this application. If you believe this is a mistake, please contact your administrator.
+      fail: You do not have access to this application. If you believe this is a mistake, please contact your administrator. 
+    deprecated:
+      new_signin: Select a new login method for you account. All your rooms from your old account will be migrated to the new account
+      twitter_signin: Signing in via Twitter has been deprecated and will be removed in the next release. Click <a href="%{link}"> here </a> to move your account to a new authentication method
+      twitter_signup: Sign up via Twitter has been deprecated. Please use a different sign up method
     invite:
       fail: Your token is either invalid or has expired. If you believe this is a mistake, please contact your administrator.
       no_invite: You do not have an invitation to join. Please contact your administrator to receive one.
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index f85e1ac2..3ea499c5 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -156,6 +156,29 @@ describe SessionsController, type: :controller do
       expect(@request.session[:user_id]).to eql(user.id)
       expect(response).to redirect_to(admins_path)
     end
+
+    it "should migrate old rooms from the twitter account to the new user" do
+      twitter_user = User.create(name: "Twitter User", email: "user@twitter.com", image: "example.png",
+        username: "twitteruser", email_verified: true, provider: 'twitter', social_uid: "twitter-user")
+
+      room = Room.new(name: "Test")
+      room.owner = twitter_user
+      room.save!
+
+      post :create, params: {
+        session: {
+          email: @user1.email,
+          password: 'example',
+        },
+      }, session: {
+        old_twitter_user_id: twitter_user.id
+      }
+
+      @user1.reload
+      expect(@user1.rooms.count).to eq(3)
+      expect(@user1.rooms.find { |r| r.name == "Old Home Room" }).to_not be_nil
+      expect(@user1.rooms.find { |r| r.name == "Test" }).to_not be_nil
+    end
   end
 
   describe "GET/POST #omniauth" do
@@ -173,6 +196,18 @@ describe SessionsController, type: :controller do
         },
       )
 
+      OmniAuth.config.mock_auth[:google] = OmniAuth::AuthHash.new(
+        provider: "google",
+        uid: "google-user",
+        info: {
+          email: "user@google.com",
+          name: "Google User",
+          nickname: "googleuser",
+          image: "touch.png",
+          customer: 'customer1',
+        }
+      )
+
       OmniAuth.config.mock_auth[:bn_launcher] = OmniAuth::AuthHash.new(
         provider: "bn_launcher",
         uid: "bn-launcher-user",
@@ -190,68 +225,108 @@ describe SessionsController, type: :controller do
       }
     end
 
-    unless Rails.configuration.omniauth_bn_launcher
-      it "should create and login user with omniauth twitter" do
+    it "should create and login user with omniauth google" do
+      request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:google]
+      get :omniauth, params: { provider: :google }
+
+      u = User.last
+      expect(u.provider).to eql("google")
+      expect(u.email).to eql("user@google.com")
+      expect(@request.session[:user_id]).to eql(u.id)
+    end
+
+    it "should create and login user with omniauth bn launcher" do
+      request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
+      get :omniauth, params: { provider: 'bn_launcher' }
+
+      u = User.last
+      expect(u.provider).to eql("customer1")
+      expect(u.email).to eql("user@google.com")
+      expect(@request.session[:user_id]).to eql(u.id)
+    end
+
+    it "should redirect to root on invalid omniauth login" do
+      request.env["omniauth.auth"] = :invalid_credentials
+      get :omniauth, params: { provider: :google }
+
+      expect(response).to redirect_to(root_path)
+    end
+
+    it "should not create session without omniauth env set for google" do
+      get :omniauth, params: { provider: 'google' }
+
+      expect(response).to redirect_to(root_path)
+    end
+
+    context 'twitter deprecation' do
+      it "should not allow new user sign up with omniauth twitter" do
         request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:twitter]
         get :omniauth, params: { provider: :twitter }
 
-        u = User.last
-        expect(u.provider).to eql("twitter")
-        expect(u.email).to eql("user@twitter.com")
-        expect(@request.session[:user_id]).to eql(u.id)
+        expect(response).to redirect_to(root_path)
+        expect(flash[:alert]).to eq(I18n.t("registration.deprecated.twitter_signup"))
       end
 
-      it "should create and login user with omniauth bn launcher" do
-        request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
-        get :omniauth, params: { provider: 'bn_launcher' }
+      it "should notify twitter users that twitter is deprecated" do
+        allow(Rails.configuration).to receive(:allow_user_signup).and_return(true)
+        twitter_user = User.create(name: "Twitter User", email: "user@twitter.com", image: "example.png",
+          username: "twitteruser", email_verified: true, provider: 'twitter', social_uid: "twitter-user")
 
-        u = User.last
-        expect(u.provider).to eql("customer1")
-        expect(u.email).to eql("user@google.com")
-        expect(@request.session[:user_id]).to eql(u.id)
-      end
-
-      it "should redirect to root on invalid omniauth login" do
-        request.env["omniauth.auth"] = :invalid_credentials
+        request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:twitter]
         get :omniauth, params: { provider: :twitter }
 
-        expect(response).to redirect_to(root_path)
+        expect(flash[:alert]).to eq(I18n.t("registration.deprecated.twitter_signin",
+          link: signup_path(old_twitter_user_id: twitter_user.id)))
       end
 
-      it "should not create session without omniauth env set for google" do
-        get :omniauth, params: { provider: 'google' }
+      it "should migrate rooms from the twitter account to the google account" do
+        twitter_user = User.create(name: "Twitter User", email: "user@twitter.com", image: "example.png",
+          username: "twitteruser", email_verified: true, provider: 'twitter', social_uid: "twitter-user")
 
-        expect(response).to redirect_to(root_path)
+        room = Room.new(name: "Test")
+        room.owner = twitter_user
+        room.save!
+
+        request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:google]
+        get :omniauth, params: { provider: :google }, session: { old_twitter_user_id: twitter_user.id }
+
+        u = User.last
+        expect(u.provider).to eql("google")
+        expect(u.email).to eql("user@google.com")
+        expect(@request.session[:user_id]).to eql(u.id)
+        expect(u.rooms.count).to eq(3)
+        expect(u.rooms.find { |r| r.name == "Old Home Room" }).to_not be_nil
+        expect(u.rooms.find { |r| r.name == "Test" }).to_not be_nil
+      end
+    end
+
+    context 'registration notification emails' do
+      before do
+        allow(Rails.configuration).to receive(:enable_email_verification).and_return(true)
+        @user = create(:user, provider: "greenlight")
+        @admin = create(:user, provider: "greenlight", email: "test@example.com")
+        @admin.add_role :admin
       end
 
-      context 'registration notification emails' do
-        before do
-          allow(Rails.configuration).to receive(:enable_email_verification).and_return(true)
-          @user = create(:user, provider: "greenlight")
-          @admin = create(:user, provider: "greenlight", email: "test@example.com")
-          @admin.add_role :admin
-        end
+      it "should notify admin on new user signup with approve/reject registration" do
+        allow_any_instance_of(Registrar).to receive(:approval_registration).and_return(true)
 
-        it "should notify admin on new user signup with approve/reject registration" do
-          allow_any_instance_of(Registrar).to receive(:approval_registration).and_return(true)
+        request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
 
-          request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
+        expect { get :omniauth, params: { provider: 'bn_launcher' } }
+          .to change { ActionMailer::Base.deliveries.count }.by(1)
+      end
 
-          expect { get :omniauth, params: { provider: 'bn_launcher' } }
-            .to change { ActionMailer::Base.deliveries.count }.by(1)
-        end
+      it "should notify admin on new user signup with invite registration" do
+        allow_any_instance_of(Registrar).to receive(:invite_registration).and_return(true)
 
-        it "should notify admin on new user signup with invite registration" do
-          allow_any_instance_of(Registrar).to receive(:invite_registration).and_return(true)
+        invite = Invitation.create(email: "user@google.com", provider: "greenlight")
+        @request.session[:invite_token] = invite.invite_token
 
-          invite = Invitation.create(email: "user@google.com", provider: "greenlight")
-          @request.session[:invite_token] = invite.invite_token
+        request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
 
-          request.env["omniauth.auth"] = OmniAuth.config.mock_auth[:bn_launcher]
-
-          expect { get :omniauth, params: { provider: 'bn_launcher' } }
-            .to change { ActionMailer::Base.deliveries.count }.by(1)
-        end
+        expect { get :omniauth, params: { provider: 'bn_launcher' } }
+          .to change { ActionMailer::Base.deliveries.count }.by(1)
       end
     end
 

From fc18976b6d002a1303f6a59a96921aa31aa203a5 Mon Sep 17 00:00:00 2001
From: shawn-higgins1 <23224097+shawn-higgins1@users.noreply.github.com>
Date: Tue, 9 Jul 2019 13:54:15 -0400
Subject: [PATCH 11/17] GRN2-107: Add office365 auth (#616)

* add office365 auth

* Delete conflicting file
---
 Gemfile                          |  2 +-
 Gemfile.lock                     | 13 +++++++++----
 app/assets/stylesheets/main.scss |  2 +-
 app/helpers/sessions_helper.rb   | 24 +++++++++++++++---------
 app/models/user.rb               |  4 ++--
 config/initializers/omniauth.rb  | 20 +++++++++-----------
 config/locales/ar.yml            |  2 +-
 config/locales/de_DE.yml         |  2 +-
 config/locales/en.yml            |  2 +-
 config/locales/es.yml            |  2 +-
 config/locales/es_MX.yml         |  2 +-
 config/locales/fa_IR.yml         |  2 +-
 config/locales/fr.yml            |  2 +-
 config/locales/hi_IN.yml         |  2 +-
 config/locales/hu_HU.yml         |  2 +-
 config/locales/it.yml            |  2 +-
 config/locales/pt.yml            |  2 +-
 config/locales/pt_BR.yml         |  2 +-
 config/locales/ru_RU.yml         |  2 +-
 config/locales/vi_VN.yml         |  2 +-
 config/locales/zh_CN.yml         |  2 +-
 sample.env                       |  1 +
 22 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/Gemfile b/Gemfile
index e32bf501..8edc5c0f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,7 +44,7 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-google-oauth2'
-gem 'omniauth-microsoft-office365', '~> 0.0.7'
+gem 'omniauth-bn-office365', git: 'https://github.com/blindsidenetworks/omniauth-azure-ad.git'
 gem 'omniauth-ldap'
 gem 'omniauth-bn-launcher', '~> 0.1.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9fd50cf3..1de91bf7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/blindsidenetworks/omniauth-azure-ad.git
+  revision: c0c7d4dfb4fa4e66986dba6b436a924d83e48377
+  specs:
+    omniauth-bn-office365 (1.0.0)
+      omniauth (>= 1.3.2)
+      omniauth-oauth2 (>= 1.5.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -155,9 +163,6 @@ GEM
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.2)
       rubyntlm (~> 0.3.4)
-    omniauth-microsoft-office365 (0.0.7)
-      omniauth
-      omniauth-oauth2
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
@@ -341,9 +346,9 @@ DEPENDENCIES
   mini_racer
   omniauth
   omniauth-bn-launcher (~> 0.1.0)
+  omniauth-bn-office365!
   omniauth-google-oauth2
   omniauth-ldap
-  omniauth-microsoft-office365 (~> 0.0.7)
   omniauth-twitter
   pagy
   pg (~> 0.18)
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index dcd6dacd..42e41209 100755
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -123,7 +123,7 @@
   }
 }
 
-.customBtn-microsoft_office365 {
+.customBtn-office365 {
   @extend .customBtn;
   background: #f65314;
 
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index df1fa19d..b95dd302 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -78,17 +78,23 @@ module SessionsHelper
   end
 
   def omniauth_options(env)
-    gl_redirect_url = (Rails.env.production? ? "https" : env["rack.url_scheme"]) + "://" + env["SERVER_NAME"] + ":" +
-                      env["SERVER_PORT"]
-    user_domain = parse_user_domain(env["SERVER_NAME"])
-    env['omniauth.strategy'].options[:customer] = user_domain
-    env['omniauth.strategy'].options[:gl_redirect_url] = gl_redirect_url
-    env['omniauth.strategy'].options[:default_callback_url] = Rails.configuration.gl_callback_url
-    env['omniauth.strategy'].options[:checksum] = generate_checksum(user_domain, gl_redirect_url,
-      Rails.configuration.launcher_secret)
+    if env['omniauth.strategy'].options[:name] == "bn-launcher"
+      gl_redirect_url = (Rails.env.production? ? "https" : env["rack.url_scheme"]) + "://" + env["SERVER_NAME"] + ":" +
+                        env["SERVER_PORT"]
+      user_domain = parse_user_domain(env["SERVER_NAME"])
+      env['omniauth.strategy'].options[:customer] = user_domain
+      env['omniauth.strategy'].options[:gl_redirect_url] = gl_redirect_url
+      env['omniauth.strategy'].options[:default_callback_url] = Rails.configuration.gl_callback_url
+      env['omniauth.strategy'].options[:checksum] = generate_checksum(user_domain, gl_redirect_url,
+        Rails.configuration.launcher_secret)
+    elsif env['omniauth.strategy'].options[:name] == "google"
+      set_hd(env, ENV['GOOGLE_OAUTH2_HD'])
+    elsif env['omniauth.strategy'].options[:name] == "office365"
+      set_hd(env, ENV['OFFICE365_HD'])
+    end
   end
 
-  def google_omniauth_hd(env, hd)
+  def set_hd(env, hd)
     hd_opts = hd.split(',')
     env['omniauth.strategy'].options[:hd] =
       if hd_opts.empty?
diff --git a/app/models/user.rb b/app/models/user.rb
index 2966e22e..f7af9a35 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -70,7 +70,7 @@ class User < ApplicationRecord
     # Provider attributes.
     def auth_name(auth)
       case auth['provider']
-      when :microsoft_office365
+      when :office365
         auth['info']['display_name']
       else
         auth['info']['name']
@@ -97,7 +97,7 @@ class User < ApplicationRecord
       when :twitter
         auth['info']['image'].gsub("http", "https").gsub("_normal", "")
       else
-        auth['info']['image'] unless auth['provider'] == :microsoft_office365
+        auth['info']['image']
       end
     end
   end
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index e3e54a78..4d4ae321 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'office365'
+
 # List of supported Omniauth providers.
 Rails.application.config.providers = []
 
@@ -10,19 +12,14 @@ Rails.application.config.omniauth_ldap = ENV['LDAP_SERVER'].present? && ENV['LDA
                                          ENV['LDAP_PASSWORD'].present?
 Rails.application.config.omniauth_twitter = ENV['TWITTER_ID'].present? && ENV['TWITTER_SECRET'].present?
 Rails.application.config.omniauth_google = ENV['GOOGLE_OAUTH2_ID'].present? && ENV['GOOGLE_OAUTH2_SECRET'].present?
-Rails.application.config.omniauth_microsoft_office365 = ENV['OFFICE365_KEY'].present? &&
-                                                        ENV['OFFICE365_SECRET'].present?
+Rails.application.config.omniauth_office365 = ENV['OFFICE365_KEY'].present? &&
+                                              ENV['OFFICE365_SECRET'].present?
 
 # If LDAP is enabled, override and disable allow_user_signup.
 Rails.application.config.allow_user_signup = false if Rails.application.config.omniauth_ldap
 
 SETUP_PROC = lambda do |env|
-  provider = env['omniauth.strategy'].options[:name]
-  if provider == "google"
-    SessionsController.helpers.google_omniauth_hd env, ENV['GOOGLE_OAUTH2_HD']
-  else
-    SessionsController.helpers.omniauth_options env
-  end
+  SessionsController.helpers.omniauth_options env
 end
 
 # Setup the Omniauth middleware.
@@ -59,10 +56,11 @@ Rails.application.config.middleware.use OmniAuth::Builder do
         name: 'google',
         setup: SETUP_PROC
     end
-    if Rails.configuration.omniauth_microsoft_office365
-      Rails.application.config.providers << :microsoft_office365
+    if Rails.configuration.omniauth_office365
+      Rails.application.config.providers << :office365
 
-      provider :microsoft_office365, ENV['OFFICE365_KEY'], ENV['OFFICE365_SECRET']
+      provider :office365, ENV['OFFICE365_KEY'], ENV['OFFICE365_SECRET'],
+      setup: SETUP_PROC
     end
   end
 end
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 9907b61c..9c46a929 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -155,7 +155,7 @@ ar:
   password_different_notice: تأكيد كلمة المرور غير متطابق.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recording:
     email: " البريد الإلكتروني للتسجيل"
diff --git a/config/locales/de_DE.yml b/config/locales/de_DE.yml
index c85614dd..f1dd1b55 100644
--- a/config/locales/de_DE.yml
+++ b/config/locales/de_DE.yml
@@ -284,7 +284,7 @@ de_DE:
   password_different_notice: Passwortbestätigung ist nicht zutreffend.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a933429c..f821a047 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -300,7 +300,7 @@ en:
   password_different_notice: Password Confirmation does not match.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e726de20..aaf68999 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -284,7 +284,7 @@ es:
   password_different_notice: La confirmación de password no coincide
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/config/locales/es_MX.yml b/config/locales/es_MX.yml
index 68254c69..a0b6d105 100644
--- a/config/locales/es_MX.yml
+++ b/config/locales/es_MX.yml
@@ -284,7 +284,7 @@ es_MX:
   password_different_notice: La confirmación de password no coincide
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/config/locales/fa_IR.yml b/config/locales/fa_IR.yml
index e0240819..bd1d21c7 100644
--- a/config/locales/fa_IR.yml
+++ b/config/locales/fa_IR.yml
@@ -283,7 +283,7 @@ fa_IR:
   password_different_notice: تاییدیه رمز عبور با رمز ارائه شده مطابقت ندارد.
   provider:
     google: گوگل
-    microsoft_office365: افیس 365
+    office365: افیس 365
     twitter: توییتر
   recaptcha:
     errors:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0a67e652..251015ae 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -155,7 +155,7 @@ fr:
   password_different_notice: La confirmation du mot de passe ne correspond pas.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recording:
     email: Envoyer l'enregistrement par Email
diff --git a/config/locales/hi_IN.yml b/config/locales/hi_IN.yml
index 3ff7299f..aebe071f 100644
--- a/config/locales/hi_IN.yml
+++ b/config/locales/hi_IN.yml
@@ -155,7 +155,7 @@ hi_IN:
   password_different_notice: पासवर्ड की पुष्टि मेल नहीं खाती।
   provider:
     google: गूगल
-    microsoft_office365: ऑफिस 365
+    office365: ऑफिस 365
     twitter: ट्विटर
   recording:
     email: ईमेल रिकॉर्डिंग
diff --git a/config/locales/hu_HU.yml b/config/locales/hu_HU.yml
index 28288ca6..83891157 100644
--- a/config/locales/hu_HU.yml
+++ b/config/locales/hu_HU.yml
@@ -283,7 +283,7 @@ hu_HU:
   password_different_notice: A két új jelszó eltér egymástól.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 92a9519a..0d6953cf 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -284,7 +284,7 @@ it:
   password_different_notice: La conferma della password non coincide.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 505327b7..d8c1e970 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -155,7 +155,7 @@ pt:
   password_different_notice: A Confirmação de Senha não corresponde a Senha inserida acima.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recording:
     email: Enviar Gravação por E-mail
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 695c102f..e5e0a32d 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -155,7 +155,7 @@ pt_BR:
   password_different_notice: A confirmação de senha não confere.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recording:
     email: Enviar link da gravação por e-mail
diff --git a/config/locales/ru_RU.yml b/config/locales/ru_RU.yml
index 4c652616..5d8e977e 100644
--- a/config/locales/ru_RU.yml
+++ b/config/locales/ru_RU.yml
@@ -131,7 +131,7 @@ ru_RU:
   password_different_notice: Подтверждение пароля не совпадает.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recording:
     email: Отправить ссылку на запись
diff --git a/config/locales/vi_VN.yml b/config/locales/vi_VN.yml
index 5762bc20..1efce94f 100644
--- a/config/locales/vi_VN.yml
+++ b/config/locales/vi_VN.yml
@@ -219,7 +219,7 @@ vi_VN:
   password_different_notice: Xác nhận mật khẩu không khớp.
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index a26fb655..4bf233e9 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -283,7 +283,7 @@ zh_CN:
   password_different_notice: 两次新密码不一致。
   provider:
     google: Google
-    microsoft_office365: Office 365
+    office365: Office 365
     twitter: Twitter
   recaptcha:
     errors:
diff --git a/sample.env b/sample.env
index 74ba1d00..57b6ba2a 100644
--- a/sample.env
+++ b/sample.env
@@ -47,6 +47,7 @@ TWITTER_SECRET=
 #
 OFFICE365_KEY=
 OFFICE365_SECRET=
+OFFICE365_HD=
 
 # LDAP Login Provider (optional)
 #

From 2a96269d44c2b80830efe9f563e5427c15d35f02 Mon Sep 17 00:00:00 2001
From: shawn-higgins1 <23224097+shawn-higgins1@users.noreply.github.com>
Date: Tue, 9 Jul 2019 16:46:25 -0400
Subject: [PATCH 12/17] GRN2-175: Update Greenlight to work with the new
 launcher (#614)

* Update greenlight to support the new launcher

* Update comments to indicate that checksum should eventually be removed

* Fix spelling mistake

* Fix rubocop

* Missed variable name change

* Support old environment variable
---
 app/helpers/sessions_helper.rb  | 12 ++++++++----
 config/initializers/omniauth.rb |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index b95dd302..d21573f5 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -79,13 +79,17 @@ module SessionsHelper
 
   def omniauth_options(env)
     if env['omniauth.strategy'].options[:name] == "bn-launcher"
-      gl_redirect_url = (Rails.env.production? ? "https" : env["rack.url_scheme"]) + "://" + env["SERVER_NAME"] + ":" +
-                        env["SERVER_PORT"]
+      protocol = Rails.env.production? ? "https" : env["rack.url_scheme"]
+
+      customer_redirect_url = protocol + "://" + env["SERVER_NAME"] + ":" +
+                              env["SERVER_PORT"]
       user_domain = parse_user_domain(env["SERVER_NAME"])
       env['omniauth.strategy'].options[:customer] = user_domain
-      env['omniauth.strategy'].options[:gl_redirect_url] = gl_redirect_url
+      env['omniauth.strategy'].options[:customer_redirect_url] = customer_redirect_url
       env['omniauth.strategy'].options[:default_callback_url] = Rails.configuration.gl_callback_url
-      env['omniauth.strategy'].options[:checksum] = generate_checksum(user_domain, gl_redirect_url,
+
+      # This is only used in the old launcher and should eventually be removed
+      env['omniauth.strategy'].options[:checksum] = generate_checksum(user_domain, customer_redirect_url,
         Rails.configuration.launcher_secret)
     elsif env['omniauth.strategy'].options[:name] == "google"
       set_hd(env, ENV['GOOGLE_OAUTH2_HD'])
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 4d4ae321..d601fb3f 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -27,7 +27,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   if Rails.configuration.omniauth_bn_launcher
     provider :bn_launcher, client_id: ENV['CLIENT_ID'],
       client_secret: ENV['CLIENT_SECRET'],
-      client_options: { site: ENV['BN_LAUNCHER_REDIRECT_URI'] },
+      client_options: { site: ENV['BN_LAUNCHER_URI'] || ENV['BN_LAUNCHER_REDIRECT_URI'] },
       setup: SETUP_PROC
   elsif Rails.configuration.omniauth_ldap
     Rails.application.config.providers << :ldap

From 338953d72808b7801ef3affd6d84f3c868abf1f1 Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Tue, 9 Jul 2019 17:03:18 -0400
Subject: [PATCH 13/17] Replaced old colour picker with a cleaner one (#617)

---
 app/assets/javascripts/admins.js              | 124 +++--
 app/assets/javascripts/application.js         |   1 -
 app/assets/stylesheets/application.scss       |   1 -
 app/views/admins/index.html.erb               |   5 +
 app/views/shared/_footer.html.erb             |   2 +-
 vendor/assets/images/colourPicker/blank.gif   | Bin 49 -> 0 bytes
 .../colourPicker/colorpicker_background.png   | Bin 1897 -> 0 bytes
 .../images/colourPicker/colorpicker_hex.png   | Bin 532 -> 0 bytes
 .../images/colourPicker/colorpicker_hsb_b.png | Bin 970 -> 0 bytes
 .../images/colourPicker/colorpicker_hsb_h.png | Bin 1012 -> 0 bytes
 .../images/colourPicker/colorpicker_hsb_s.png | Bin 1171 -> 0 bytes
 .../images/colourPicker/colorpicker_indic.gif | Bin 86 -> 0 bytes
 .../colourPicker/colorpicker_overlay.png      | Bin 10355 -> 0 bytes
 .../images/colourPicker/colorpicker_rgb_b.png | Bin 970 -> 0 bytes
 .../images/colourPicker/colorpicker_rgb_g.png | Bin 1069 -> 0 bytes
 .../images/colourPicker/colorpicker_rgb_r.png | Bin 1066 -> 0 bytes
 .../colourPicker/colorpicker_select.gif       | Bin 78 -> 0 bytes
 .../colourPicker/colorpicker_submit.png       | Bin 5030 -> 0 bytes
 .../images/colourPicker/custom_background.png | Bin 1916 -> 0 bytes
 .../assets/images/colourPicker/custom_hex.png | Bin 562 -> 0 bytes
 .../images/colourPicker/custom_hsb_b.png      | Bin 1097 -> 0 bytes
 .../images/colourPicker/custom_hsb_h.png      | Bin 970 -> 0 bytes
 .../images/colourPicker/custom_hsb_s.png      | Bin 1168 -> 0 bytes
 .../images/colourPicker/custom_indic.gif      | Bin 86 -> 0 bytes
 .../images/colourPicker/custom_rgb_b.png      | Bin 1008 -> 0 bytes
 .../images/colourPicker/custom_rgb_g.png      | Bin 1069 -> 0 bytes
 .../images/colourPicker/custom_rgb_r.png      | Bin 1018 -> 0 bytes
 .../images/colourPicker/custom_submit.png     | Bin 997 -> 0 bytes
 vendor/assets/images/colourPicker/select.png  | Bin 506 -> 0 bytes
 vendor/assets/images/colourPicker/select2.png | Bin 518 -> 0 bytes
 vendor/assets/images/colourPicker/slider.png  | Bin 315 -> 0 bytes
 vendor/assets/javascripts/colorpicker.js      | 484 ------------------
 vendor/assets/stylesheets/colorpicker.scss    | 161 ------
 33 files changed, 85 insertions(+), 693 deletions(-)
 delete mode 100644 vendor/assets/images/colourPicker/blank.gif
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_background.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_hex.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_hsb_b.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_hsb_h.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_hsb_s.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_indic.gif
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_overlay.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_rgb_b.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_rgb_g.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_rgb_r.png
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_select.gif
 delete mode 100644 vendor/assets/images/colourPicker/colorpicker_submit.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_background.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_hex.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_hsb_b.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_hsb_h.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_hsb_s.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_indic.gif
 delete mode 100644 vendor/assets/images/colourPicker/custom_rgb_b.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_rgb_g.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_rgb_r.png
 delete mode 100644 vendor/assets/images/colourPicker/custom_submit.png
 delete mode 100644 vendor/assets/images/colourPicker/select.png
 delete mode 100644 vendor/assets/images/colourPicker/select2.png
 delete mode 100644 vendor/assets/images/colourPicker/slider.png
 delete mode 100644 vendor/assets/javascripts/colorpicker.js
 delete mode 100644 vendor/assets/stylesheets/colorpicker.scss

diff --git a/app/assets/javascripts/admins.js b/app/assets/javascripts/admins.js
index cd29fd8e..55fa3a43 100644
--- a/app/assets/javascripts/admins.js
+++ b/app/assets/javascripts/admins.js
@@ -45,45 +45,8 @@ $(document).on('turbolinks:load', function(){
     })
     
     /* COLOR SELECTORS */
-    
-    $('#colorinput-regular').ColorPicker({
-      onBeforeShow: function () {
-        var colour = rgb2hex($("#colorinput-regular").css("background-color"))
 
-        $(this).ColorPickerSetColor(colour);
-      },
-      onSubmit: function(_hsb, hex) {
-        $.post($("#coloring-path-regular").val(), {color: '#' + hex}).done(function() {
-          location.reload()
-        });
-      },
-    });
-
-    $('#colorinput-lighten').ColorPicker({
-      onBeforeShow: function () {
-        var colour = rgb2hex($("#colorinput-lighten").css("background-color"))
-
-        $(this).ColorPickerSetColor(colour);
-      },
-      onSubmit: function(_hsb, hex) {
-        $.post($("#coloring-path-lighten").val(), {color: '#' + hex}).done(function() {
-          location.reload()
-        });
-      },
-    });
-
-    $('#colorinput-darken').ColorPicker({
-      onBeforeShow: function () {
-        var colour = rgb2hex($("#colorinput-darken").css("background-color"))
-
-        $(this).ColorPickerSetColor(colour);
-      },
-      onSubmit: function(_hsb, hex) {
-        $.post($("#coloring-path-darken").val(), {color: '#' + hex}).done(function() {
-          location.reload()
-        });
-      },
-    });
+    loadColourSelectors()
   }
 
   // Only run on the admins edit user page.
@@ -119,11 +82,82 @@ function filterRole(role) {
   window.location.replace(url);
 }
 
-function rgb2hex(rgb) {
-  rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
-  function hex(x) {
-      return ("0" + parseInt(x).toString(16)).slice(-2);
-  }
-  return "#" + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
-}
+function loadColourSelectors() {
+  const pickrRegular = new Pickr({
+    el: '#colorinput-regular',
+    theme: 'monolith',
+    useAsButton: true,
+    lockOpacity: true,
+    defaultRepresentation: 'HEX',
+    closeWithKey: 'Enter',
+    default: $("#colorinput-regular").css("background-color"),
 
+    components: {
+        palette: true,
+        preview: true,
+        hue: true,
+        interaction: {
+            input: true,
+            save: true,
+        },
+    },
+  });
+
+  const pickrLighten = new Pickr({
+    el: '#colorinput-lighten',
+    theme: 'monolith',
+    useAsButton: true,
+    lockOpacity: true,
+    defaultRepresentation: 'HEX',
+    closeWithKey: 'Enter',
+    default: $("#colorinput-lighten").css("background-color"),
+
+    components: {
+        palette: true,
+        preview: true,
+        hue: true,
+        interaction: {
+            input: true,
+            save: true,
+        },
+    },
+  });
+
+  const pickrDarken = new Pickr({
+    el: '#colorinput-darken',
+    theme: 'monolith',
+    useAsButton: true,
+    lockOpacity: true,
+    defaultRepresentation: 'HEX',
+    closeWithKey: 'Enter',
+    default: $("#colorinput-darken").css("background-color"),
+
+    components: {
+        palette: true,
+        preview: true,
+        hue: true,
+        interaction: {
+            input: true,
+            save: true,
+        },
+    },
+  });
+
+  pickrRegular.on("save", (color, instance) => {
+    $.post($("#coloring-path-regular").val(), {color: color.toHEXA().toString()}).done(function() {
+      location.reload()
+    });
+  })
+
+  pickrLighten.on("save", (color, instance) => {
+    $.post($("#coloring-path-lighten").val(), {color: color.toHEXA().toString()}).done(function() {
+      location.reload()
+    });
+  })
+
+  pickrDarken.on("save", (color, instance) => {
+    $.post($("#coloring-path-darken").val(), {color: color.toHEXA().toString()}).done(function() {
+      location.reload()
+    });
+  })
+}
\ No newline at end of file
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1bec0ad4..9e2fd706 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -31,5 +31,4 @@
 //= require tabler
 //= require tabler.plugins
 //= require jquery_ujs
-//= require colorpicker
 //= require_tree .
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f3fdace1..d675a905 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -33,7 +33,6 @@
 @import "tabler/variables";
 @import "bootstrap";
 @import "tabler-custom";
-@import "colorpicker";
 
 @import "utilities/variables";
 @import "admins";
diff --git a/app/views/admins/index.html.erb b/app/views/admins/index.html.erb
index c3af385a..f52a799d 100644
--- a/app/views/admins/index.html.erb
+++ b/app/views/admins/index.html.erb
@@ -12,6 +12,11 @@
 # You should have received a copy of the GNU Lesser General Public License along
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 %>
+
+<% # Only load the color picker on the Admins page %>
+<%= stylesheet_link_tag    "https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/monolith.min.css" %>
+<%= javascript_include_tag "https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.min.js" %>
+
 <div class="container pt-6">
   <%= render "shared/components/subtitle", subtitle: t("administrator.title"), search: false %>
 
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index f9867aa1..792bc997 100755
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -14,7 +14,7 @@
 %>
 
 <footer class="footer pt-3">
-  <p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank")).html_safe %> v <%= Greenlight::Application::VERSION %></p>
+  <p class="text-center mb-1"><%= t("footer.powered_by", href: link_to(t("greenlight"), "https://bigbluebutton.org/2018/07/09/greenlight-2-0/", target: "_blank")).html_safe %> <%= Greenlight::Application::VERSION %></p>
 </footer>
 
 <%= render "shared/components/cookie_warning" %>
diff --git a/vendor/assets/images/colourPicker/blank.gif b/vendor/assets/images/colourPicker/blank.gif
deleted file mode 100644
index 75b945d2553848b8b6f41fe5e24599c0687b8472..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 49
zcmZ?wbhEHbWMp7unE0RJ|Ns9C3=9Vj8~~DvKUo+V7?>DzfNY>Fh|Ltj$Y2csQN9XW

diff --git a/vendor/assets/images/colourPicker/colorpicker_background.png b/vendor/assets/images/colourPicker/colorpicker_background.png
deleted file mode 100644
index 8401572f1939a1a24c1963513573b0194ad36ee0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1897
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
AumAu6

diff --git a/vendor/assets/images/colourPicker/colorpicker_hex.png b/vendor/assets/images/colourPicker/colorpicker_hex.png
deleted file mode 100644
index 4e532d7c65393fe56d7463e1da3faa591f03de84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq002k;001lq0ssI2N$P1_00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA2nn^@KRCwC#n6YcZKorKmBnM{5VnN~}9ReD%Nhj%)e@2UckI?wn+*F*3;85I(
zxENdy>|*I~AlHjh(Li4w_e~$k1>TSMlH7e>k|a?SftQq0B8sB@e$Nc7)9DBRzVCyb
z1b`q2c!CKbZg`U5o2itl0Sv%)yQM?b>-9{KyTHhep8?|QckHZYvzcW~5d<@9^YvHp
ztN^T5E7MqasmZKO0Qfo_tQD_Cp^cRCbkSPY3PWmOrwUtP=mYq!XfhrH$n!kUb8V{2
z2zJb@O#p!BU0T}j_bo$O28aMq#VY1=a}K4HFOx|FxU3(vcdlc4{G^oH07wS|@(ugl
zu}h<vrm1C`Hi{Ln>2#{EpG-rzyuU{=%QDL_0lRX0#t`gyJhJT=_461{Fr^gFFz2D&
z?#3}Quw7Y-ZXCZam(0MPhC`Q9H4*H#%p;?>f&5sn>j`t-77IF5&!dq`sa#4$MD?Up
z1Z7s}QYx2H{U_Ho#}=1TQ65E?QgHyga(l)Q>~phW+cE0rF`i(%vV0^K=++YE{0sm&
WpVhv@?^YTB0000<MNUMnLSTZ@H00j^

diff --git a/vendor/assets/images/colourPicker/colorpicker_hsb_b.png b/vendor/assets/images/colourPicker/colorpicker_hsb_b.png
deleted file mode 100644
index dfac595d017e279ff670df2c816e02d922660d9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 970
zcmV;*12z1KP)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4P)S5VRCwC#nn6n&K^TU=-E6Jmny{kAgHdYMnDn-IF?jG$4BqP9gMtMis0Dw8
zAV{dW=nt@ez?%dVDIU_2gRqI_5Em~-k8ZNXWV1btZa3MO4c19#+Wqh_Zf2N=;hoLQ
zLzrMN$n!kVR;sFUJkQ_V-BE`=I5@}w0L!vKVQ~Q9@px!O=Q!>KBXRE#RaJ4J1Hkq5
zH74#rAmB*#N9cI-&<?si>+9?5X8Zj7{P_5|^XQH{u=yKC6vb33b$ff;+uIw9#SFtZ
zJw0vcV;BZjbSqURlaVB;VRjAxerlS1<l*6Ap-_0kaeaM#!C>&~!NI`5fVIQh?ryB;
zCRH|<L-dhw*g8800JU1pK5~A3zFaPQz252R=|mz?Dwq44b;DOC)nq7ina`tkXkwx+
zFu*YOk)kMSn#QthPfw4}=Mw~>X*Y~znJyFxHP3oeqGU3e&1O9;`*C3*9*=)dr#lP&
zn<{s4fg0h-$-2z|0F15BXa1p~(a}*s5CEWXbyYJAdmo&O{#YpD48vSpURq~=HZW^z
zYn4ic=lPM5k&}~?zi?i#P(>mU00>*Q=~G~A=!rx^QIxK(E{0+5@9$+<_W68FXS3cg
z9in$e&*$@{Qpx;xe0;nc^Q+Ji{h4jrtW!Iut3V(?BD!Pgx=!e-({Wy>6<t+TTCdgp
zf-vm&Q-^+2EONts|Bp<DI`k<?a*Y68M&Nz@iQ?5u&gC#(tG}I{Vd9>NMqMNDj~M~n
z)!GO=qQA@t;I7t2;1S(50<IBojeu(eTqE$BMqnlyrSe)`P!!h){D(&1rdS-qDY5Wf
ztEs$|0)W@+CDaH^Nz#Y8xfUH#M@Qru0Y|4vt`TSpolGN8sZ?k+0uK)lv>Ji7R-H^E
z;Fxt5y<r+k6h%c*(&@A;%duE&c6Qd@rvvC_ZEbDo^+mK1FjswNX9obbx3@PpH|a0}
zdbNrgpEowX?CzrWh9$}58iA@M>+yKp{*YWFP<>kUy}douSY2JE!wBfrD*F4hvVtJ@
z_xH_*L>mEXHkOx{0bprq$rczQjer>#REvv?4Nu550(w0tO-7)tlOusf;N935Ms)0f
sary=%7ro}V>f{=MmOlY4Yuc{?08g~^-7;vm)Bpeg07*qoM6N<$g2&OnRsaA1

diff --git a/vendor/assets/images/colourPicker/colorpicker_hsb_h.png b/vendor/assets/images/colourPicker/colorpicker_hsb_h.png
deleted file mode 100644
index 3977ed9f21e3186eefd37b198a7cc3f8de6c69cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4dPzh<RCwC#na@h&Kp4QkX;N)#QEI5|!A2HqZTBL@Q}wtAzJMnW3N8qOu8&da
zMRvXDEBFYq$Hj}Kc-h8HVG$K9UW&v<+a}q=)DV-j5#8C&u=xmOCi%krn11;)zo6;q
z>1Z?xtc9W|d^8%pySrl!Jsywq01yZSfWhDafa5q;(RrSK!<nS75Jgc)p##9x)fFM`
zR4V03^)7U>_25Mnz_o6R-Q8VL6wU6+%F4pRf-Q$MI@dS4=mAHh)9FT|@$~eByOWcX
z!C<h_XjpSdqg%&1KR>q-b_?cFRh?(5s;V}d2mk<dO>4K?&4-6bIBX^iheAZrO{%IS
z0YIfv$z`+F(Rl#Sb=`U9^73-C*$nbL0E`QQVHk#CxMmUxbFA4+=9etvc4lVg#bpWz
zInPX|)2gcCza|_G>$(mIxn`0I%UGFA#{CZCigR#qP_0(EKmY)WdwYgq^vWbf{@jo*
zE^s3|JL^F2F_(#niAW>@0HNVwp65~TOfr++9V?g3RwW5{t@J$$rn?^>GJgkDFu7a~
z0J4_L6actnGO6o2dKt1Tm&@fyBr-HKgb=#EzCJrUYqeS<BO_)G$8q=f_k^&=#>Q+^
z@p#<Y<v7m0U}RYq1R)d(;X^k!Hwd9vEH;pW>6tJ$H`nQONIa<D8U3kvJp9|{Qq#1-
z&idQYsd!&!6<tvjR+rV|u~;&ZU=IDZUgwjEM7dI74t+kK_l*EsM&RSiH;TU=KP8Fa
zviisADIxB~Lcuozz7e3s2#}8cMxcxC8v)-4_(p(gBj7&k`}_N~T1^lHeCYW2xK^vd
zfM(rF?~Trc5$IX#wxv_p?T)@!C@{IK{(X7r8-f4O2;A1|Q>he-%W5W9r2sHGI!dV#
zn9t`wEiLs)_<nLiuMzNcn)DihSE18s1lsL3t45&JYO!hrJZGI=BcSySs*QjZv{)><
zqd%&uZ8MDk?wUrxmh*4WOQjM3lu9KVI=x0fd;SdeWoPH>w{N(;v%SrL5$IU%>swn}
z&Ykoc0rTVI;o%`}Y;JDa?=Z*_rV$WDQ4~e15wPVDEf~Cg-q^s9M@L8IPO6Q7wKmq*
z*8yN{ZOu_IR2l)>*Xq^PRofnVjezF$`JY}R@TxaQ3XQ;rsVRc!#0$pj@kcMZ?m6r9
i8Ue%TbFitZe+B@uIz19ZnQ%P-0000<MNUMnLSTX+U)PcV

diff --git a/vendor/assets/images/colourPicker/colorpicker_hsb_s.png b/vendor/assets/images/colourPicker/colorpicker_hsb_s.png
deleted file mode 100644
index a2a699736c24b34c60afac8cea399b2c4afcf9a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA58A(JzRCwC#nn6h0U=+t+YIIeCZ8N0REt9otS9j@(Ajt5v?W7gKqX!Ee2!alT
z*{jEbDCoQ>c=RY9Hf%t4)YgLZFxlE#lxYuB4{FKmYLj+{XqP4>>D<09+4?7kkiL)i
zCw=+8yx$khX0s6l0a_EoFgQUFr>Ccyv)<Cuf&+j~rvnWN2Y|Y|I;~pAar_n|Q9mIJ
z!=SPb07pkhh<sBNrReIntfQ@mN~}w3y|J-zXlRHe$xJ4bOeTZDVD+slK7r+D7{A|t
zd3j0Gv|g_t7#L`3YFb-c6U7t?1*F!6uA<SX+wB%*#{uAbCL<bVGMVP)=EC8y!C=Vc
za&2vG2L}hO7K<?Ej$V({dePPASd4ey;dBbK;{cG)=S9O3iNw^@)XvV%?#GYuczk_*
zy-+Af!;q?&?y<v>*xTdJ9d`TAin3TNEXx9h36D@HluRbgX0xZi|M`m->2&(y;zATt
zUtgb2rxE!!7z{#JcW)%jt^)w9^msr~9*-v;i!CfHcs!of)m5L*$Fi&_47G}h;x`gy
z*8u=lD!{P5zCN4HW;7V?-@EsXVF2Ld<Ro7xl!T$Sej~obF${|*62j~_A0-@<N~Jb8
zH{VQ79v&WMvst^{PSf=D+J<4(D|SJyj*boha0(t%0Ki->*VWaPbRbERt*xy_qcI!~
z@9yrBBxyFAg#ir>4M<nhvaW>LasI!M{&seDmP)0v*(}F#R;yKycq%MgFbV-Kmy2at
z6btolO5PRDr@!4Z$8p@>z3aEPu8Q|{ty*UoMyqW#X);+#XFW~m>+vyeF`IXyQO#NJ
zbh~RrKwCuMN$DHKAJ?Z?3}IWn844lt{j9sYMg;ybB7j=*MBv)`?T7$s$rFKV>l!5j
zc-gjXW@g6ebar)h4ST%+u)Mq+iA1Vh>;hK~hoekI)rdfi2>c2WDBo(VtgHlsL7oWA
z&(HHjpvo(k$QAFtqAp4OL_n^=BM3sifqK^6t;x3f;LDd95%>>@z}MsBc8bzsTdm2i
z6abo=n^j5#I^FK)FJH<8eAw7fFA-2=n(8G26<Jp&5y<6oS|tMVyBew{0u|kLbrJ!^
zTG#P2j7WaJpCn0|rnk4ZdwO~X2M47wRj^)EAQ0e6rD`Hjyz8^Gvj8wXJv}iop$#Iy
z-E4!s9v`27`<6c+9~;vE5nu(iJ~}!oy@-RPy{9P3_4Micckd#RNFWgKdc8iMZ)<C-
zzPb}par1F;agje685xnl3{?^Vj%E4dmCwhUTv}QxUQ{&^5Y~p*>ji+};bGxL%+uSO
z+~1duRQyKZk=2THHElK;WdhRY=jtT_oYMBcdWk?qZ;mP?0uS5U5n4xHFiI<+dadUb
l@49-4fb1urmzm6u0RTq3k6f>52*3aU002ovPDHLkV1hB)7U=*0

diff --git a/vendor/assets/images/colourPicker/colorpicker_indic.gif b/vendor/assets/images/colourPicker/colorpicker_indic.gif
deleted file mode 100644
index f9fa95e2825eadd2d779ad270a71eddb94f94748..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmZ?wbhEHbRA%60n8?6jX=xc99sU3Re+C8y#h)yU3=B*RIzTo9NS=X7-KS;c>A7MD
o3b%A+G;E1+{h2#gG;NlJnPP?C%HX<p+}SsMt_R$cWM!}h005U8G5`Po

diff --git a/vendor/assets/images/colourPicker/colorpicker_overlay.png b/vendor/assets/images/colourPicker/colorpicker_overlay.png
deleted file mode 100644
index 561cdd9c59a498b499cbfd1295dc4d2037e235ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10355
zcmV-(D2&&MP)<h;3K|Lk000e1NJLTq005Q%005Q<1^@s6JOOdy00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaAe`AI}URCwC#eanvINRp%)C+D=l9`;ZBJNpmnIHzu)uwC7iS()Jv(>)Z8B@~LP
zskuk>0)q)45bjPo-NPtU5fxQ4Hh2FoGyC6W_AoQwfBXI$J?{4V&pZ36_xa*}$2NB_
z?N>dXc<z7lF|z%l?=Sb;$D)hz3_si5<@oQfcO2vKTJPQ6z4zYx^ZD%e``y2N`_}*R
zm%sEcz4!lPX8&sk!0exS7Ejb{Kq4T_PSmq{{FU#BgZJt&5`d@201)sP<MFchd3JG)
z{oMTt`}x=g+sE_gzOD7%+m4(Dzy5eU`t$j;`~B`8A0PJp`*-{L^{f5-^Uwa%Pe0jT
z|N2+^(tCgGpn815N%Pr&ymQiCJfYz)T%~XA^Ww2iKfiA>Gqbk;n!C5)IX`whhWfkj
zZ|>f95RKQ5eRkk%JDA36{(L^|`Fz^r@vz6^;rIL9ZnvA=Za4q_{k#48>#z3DfBw_{
z_P4+JPe1)+-@bjbFYphQerW$@W^I41;efT)R*v)1=Z=959-jt1_`&@upMCjUJi)=X
zZ3jN@=LPT>91D+m>_@LR0MSMOasXBvK!V70fXLnL`FvXMy^X(*$D=(SkL`ZH`|Wn~
zkB^V`<HryC_U&8y_19n9KmPHL_V>U4-G2W0=k|C!+Lzw@%8BKH^%dX*CvOT6`fP)f
zassgc-|0lP){Yay7eeq^3=*3Gi}%Ch;Wl_|YMZ-TYi;YjTWhWFe_QW81Qtc5BU0_Z
z2hjF&ege^mQag}*k5GO8+n&#7yWj7&|86@4`q!^t?O*@;m;Lg~FZRnXzxda$U+wvP
z+7wtYFe#9V5hes@A%dkRUI0naO%=FdBnp6(0n6d>MnTj$n(e?rfG~iLWBd_>PP8__
z(+9A|F_G@f%zN*~U~+eRJRSpB_Iy5l0P1$T_1o=c_xpXj-|zO@Z@(SD`t{de?d#XC
z{@ZWAS?_%ctnrWeB5jo-Tan(zp!(!Hwt(W~_YmLFL{z$fE(2EZcmpK$gwifxBAqk<
z)S1%EY|t43$S^{U=lkEjzcvK<)_Xr976J=3)%||AkB<-k@#9DT`1ok|`@Mbp_RYrc
z_wV2RcDwx!tSC}c0j20?B2J@7<g5BB_>O$62q4+}j+4|{!;|f;HN%S$BYFU=(?<bN
zX25b1*NW~M(%l}J26!4qEYMNM<LC3)b{#c9HJ;n9soLZ5u>1YqZnxX`weR1*x8HvI
zt$loa46W6E{P@vsx0^j4k7j0CV^xJU(PS$Csx64?h>ko+AS#hgQI*m}UeHSh5vfPO
zA^;(cb>1(~ONaPoV1eG+M3m|Xq(O%xdSQebRJd!Zw!gNCEO10D`}p{<Z{NNRA#Xo^
z{IJ{Y=8wn2-2Fm@9$fV=(WE%pK8bW0^-1t3peaDoF<T*(w;2`o-rF9*j>r}OtL@{=
zV8RG>h-;v}CicB#dposZ1ly4M2uuTL=I+}7*7N!FT~pcP@j#HZ0V)L60MfT_-}=YL
z$F}RR0W7~z;S5j8T1ZlJpJjv*IO#YtxCP#iM^Tl9J!WPC6pj~IlHK`);)dP8`=B*&
z@|GBM<Cw#+Bwcl)!eJW>Iz&rh=&GIaY^T5z{XL)0wnwUVzu()gw@y@uk3T*>+Q-L-
zJsywk@p$wR898E2y`L;f(beq*jpPB?BI=8>G2Ta>d=YsZ_H$tecqGu3e>7;3DU(1p
z9B$TB+g>6u0AeGNz74CO|Ne7|WUvh_gp)uAk7^j7M`Y@~AA)_?R(8MN{eHjq=kvJ@
zQ*;RVeVcv%{=MJtcY8b@N2I)Htcg*Wfhq%3OCnEbvWg7sqL+|@cJIgWs>kEgwg`Yt
z07iOHl)*Iy3><S)86E1Q0my**3`#C&ZlX8UQK0WYLm*)$xPe!7P~mQbZUR_#zu)`g
z@z`#+8)k{V194=MKEQnf7H2$@Y%7g&NI`HykJopz^7K{!$pyrmD4fh7Z2`E_c@(KG
z5paO35T&w=E;23EV;15kt%P6#APrjU9I^H&h1zNWX+$a9wjr<vp!UeM?NMj|X#fn3
z(gT1WA0G}8_pGsA09EF&A17DPt*g%(>9V5F3}^z>mkbZVghE~cjdhi>4p^L{_7V1g
z0{~9$y2|#@IR}5r_7lhDm;p?O=Nm?-=ks}Ndp@7r-i>fXsgVf|opit72e{e}uC_<3
ze!t&+*I{i3<w2w4^W43asBp#W3MefT;dqrx1Cun8@`y6+)G{3<1iad|5|tv~X%ke~
zz#2g3eT%Za0Y>zrMzkV}VZ$=b^Z6XxMkaV@to^kUt?gOiHX_yzFuUDu4!)P~G;6yK
zYmy2B5UFUDMT!U@6`(~C#gvdIz?d>lRkkN0kpTrtM?EY4GI*4ZLrNP$9-|f75~#Nb
zOr0$S1k=z}<8`zYAPelz=d-zc+go3(_uh93+`w+I+wImzltWwMcDwb*<FTPdF+O9Q
zkCNR`+$RE0L~WkDAAu4@I0Z6~Xp$(*gU$g(fzD9~zZU^Z?Tb1IMY%ILq2zMfZ$Dud
zO98Z1AH7oOw6k{w9Sca02dzCG4|n&&ZWx7UcH;MKM+XE)Pc!S&h*gbX6QEdTA<({u
z_p=a*l=10-*fwy>5lkG3jO_wdqZ9jWl)*V=c}FA~)&ti0CJ~Dr^iBXffP~R&SPB5P
zk;Qd)9|9gb8XELq4L!D@k-BTGlL0#{4l~;jSWyY2Ql{}NA_-$sQ6cInPqdUNK&Xt4
z$}<)KuAwo>CTG?M#Q+O5*2%lVY!6INNsR!q5v3Sp+rHmG7=ouOcYWVy8--@pSbKzW
z$Qax0cI%+Yd}t~J>HzEb?q5`aGy_cU-Jyx^2<iK4NA|K?2d1*A2L1y-A0XNLj}+)Q
zBlAda5yds(wqM+L0H;p``!OB_EN-ZCk?lFT>8JiFpp}yqF{06U-$?Jt0QFr%4X^4s
zz@+SkVKaau-vEe*TR$9lELQKj3_B|hTznCg`YAOA)%vI%_M)-)7=n(`l2Fvikxx=9
zmrOWHLPMRA<}qOtT)Z*11_*SR;dMcU+=yoYm?Ie&`U&Ze#JfWq%%Hyxt;O3;g`=tO
zcn<c1?cmym$loK<Hh?(j5?hr=Wa9!jQ{hZsDd$@~_k<3a`jkHMK%^h;wxCHxeH%<1
zxI{1U{A5}(NG6uTMcku>5Ez|oZXz`zEpBkq&_=+L&bCupL-Q2CW&kd<8#+*)@B3`1
zw?OnC`iqL%r^5NruvK8GnqBl<SrIJ)P^6=%ykdcg$=O&$nJ$Dm7l2RAb*#S@fVJWA
zST~{dumkCmH3G;sVKH<tMG<6Dybr*Q=raU+<YU49r>F#C{)lW?#<@f+rm!k4CLptk
zkhckqc|f1a`F3uOqv)dC^@}aQ`_lVNSOXUw6}aq;qSc^y>Aa)efSL*b#~KS~*Elxt
zJ)ciEvxd(2*msER;h+PE+HNHr8R+n-(6Zn}g$nLxjWzR`5-?;X7LHVxQc6UVBBML5
z20?MIYK+QRhoW%j=#|y-R<@yD!p{TkWUQk&Dv4U*06^#cAX;@O=?owqR7li#+BOVQ
z*ygxx9CMF!BTD&Bmm2{8Y&XmzRyA4?I6QI9BY-t^j6hR`$54hS9|I$qDne(VQ}j1_
zq_ERrOk5zEMC$9Lt2#_}IBlcH9lWYez3T_v!G4GHj<kp+9&qiClFl9h9hwGD`ymAa
z+mxuV1)U3WKghDUz<gK|U`JfC#sPqlsRh8fL^eTbMnc@+1RH_PC;OdfZcq+<?j?H!
z3Ui8HSXg!t+|JE>xDBEfy6aBu$3yEJbcT<IRWQUjyk``q*-|((;7);qYCSNAuXY2Q
zqlE|+X{!e4P4x?F83YLUL+n*`6%knn1>V%9=ZYea32lYNVH5U(35x+esFTA!q8WhG
zR3yUag{CM(sYVfNV=CMu4N_raTHLAZlr0Xxj;wG8Q^#h(;hBw$5~8%7N;*aAi)w%+
zz(q7UiA<aY4&A|7A@3)BECw1IrIQSB`Wgd^{Hl|UKtSqBW3jD3x{4nknIJy~=N&;e
zJSqlVqrx@5e{?iBjIm=vl!^Bluq**ppMWg_j0Irvq%*++3&F70oHG_G;W)YEP1N{2
z0vi;FBQQA|sYtVs-CeeezV!~zJ7tC&w#J~36#&g43bB}XN&uXFD+CjwDzzJujL#PU
zH;rc5XA2;CGJzp-_9N=GMBLAScJjT3<`LPRic(G%#mE*-H1`?L1ElT-e2m%(--lZ2
zq`9abdHNnuP`>E4@xJjnVxq8&SQooMfT<;xftsA)MWD1~)=NZVo;c)|WPeee5Esyp
z76aDB$fvqcp?J*M9rv)~zAefMcQ9i~$H{r`P#ff|aP()5$EV1K@1t_ih9IUM`wlHL
z7TOIHx|>C~3pkXHQUD}ybIC>dR!vc+5cM-HWr2`yLF@1qw8K;%ADU>`3PP}B38!O*
z2H?Sng+SZT?|M8Qk_y2>K#k>)m7b^$X%g3qfW&W{gOmzOU?MRe3Gr7b&w>WL8F)OP
zK<-O-O!E^;Jn22Q5Qa{oNv4+2UxVnw`x)B{KtCq>+fidVHunv>LV6oE!Wc_z_JhZ2
zQfr5X0MwU?F=Fxl2AE8gW1?uodPj<S0o2B|xCBTHUZ%xYqL~Fk9Q`eW!t#m6z`Hs{
zFWB#hUeNy1p|E{2LCFy903s(UJSYt#6acA%+wP(w;ONSeA$nX_t5j&w3}HoED(#=`
z7Xe9Re;GAiK#^^u$F9J{S?9QN$GDML#|FNOAP2Mf&}Bnh<1x^W64Yoo6Nj?EO;I6c
zg#?hp$KvdfK{mFH>18T21dz?M!U?6F8voSE-<|leUuhfL4NOfG^{{`*g;9Ii#;wXD
zqHxVoSrkz;o9QY7&qb``F_LWvI?e*+Hgwqc*E*MeMr0y7MBR6kZlD`>Bbx!2!>mWF
zY<t%1M=PdS<Ze^Pfdx@aMLk!oEx|HCs%+!JLFey;dg4+Yz-_Fzz>a7*)+oG*PN$%w
zt_I`hqr(BbFN|&{O9FJA;WU3`WguwjyuPlnqS|3}qD4ze6B(cdV6vbH%_rAI2SY}S
zY+AbLaPVl!MfDn_*{(EJpsTPYx$h^mEAX(!!X7N5tqa{DEsnzTpw~T`;e-pv{x7sL
zIC>EcvPtTz;$7JYYC6@dcPg_VJkduUXe@s3rO3=n14W{oD9@FnPLT&oF_*|g&riAv
zCRw2KJ{<KeIH@OH1vUgeZ(KXX<4ul#0wn7x7V}if!4;u%jWy|fP_4(lU@e#cMn<u%
z2rkvpVC+jV-Ejdum{`FUf}%_d>;@;Dh4#WJS^^!h{csZS0ZrmD5QuCeu>LxV$!KAS
z`H-jVmmK%JRu}<bC9;VOa`x90r7?{bj@1G!mr@}+?y7r1xa+5Rhe&5YZ<_#>1O-|O
z7+xSNM5^L`EK^p5$O_SJIMFFYCWnc#ylAe&+{tl+f^A8>2Q4w7UYgCIi6U3fOO*jI
zvJ_m@1fwZk(w|a7Kg#@qiKwRR1}fnoSlDg9P$tush(^Qr;^#*O2jD>foq(w*5<M*h
zl>Kp21QRz;xKiP)JTq(ZivUJ*4M*c&Cf4zNXh|6Nt-~rcO>{7*yE3$B9wB!nfU|ze
z{P2BfRUoy}>nEok=`yn$;5ByL4|g3`qG1~2DfxpEp?BR$H#)5rsCwLwj9Ad1royOw
zX7;zB)0((Lf>*>lYLCP(Qx*f$pXzwvMm`tq$3{hH>B8eg2#Qo5M81sx&8;$+DRM&~
zMl2&g3Zv9UZN(Us9Hzx%jnG)2<Jw!|mMOSOp{ByBVH%WdQVo@ed`Wi!cr5av0!Q6~
z#y(3ZGArX;^cL-RqPRpyWfAJ2MR3r$@sI6=lk<+$hpsthcj$4k<`VmF3_v`s1B~wg
zD_hCMCZJP|dC}sq7L;!;Rsh=(N@ofE)q>AD6_c@yGqV)nb|PUki!>WV34@cwr5ny7
z(HuR233QXqz{4vm4*>N)!qWzTI%%E}$=dJbmy*VcBF-$DT>!RdBd9J08OhXf6s1zg
zR_=NO2i-(w=`{Jl1;w+C5Q%<gAc_5qrmbH}L*&jI&6f5k;*#TUfyTs(=|3>?a#i6a
zja7(ZA^4Jlakgev*2|@`J<F(3L^FOpa@0-HqI%BYWm};_g`$H2-*cfPVPLZHsiGHW
zlZ}hhI5mxJ4qjZ>@>}Y?4Xo-mZj-s(Cnf;k>b6UyiU6m!5shV038|se`$CO{+KGj^
za@UFKPL>5N{9){IQ4R5;%_zdMNSE70)QZ5B+YQA`Q1)f9kCm-9qk7k8(QF|zRE>U-
zKxc~~68aWQm~bWR#cfMeCU|k^2{^_Myo$cqhNGe`S{-)2q0{9;#qYqYA5QdltBQAa
z#Ixo<zVRY|DVuaMSaggi8ck?0n$8tz3=j5eqW>z5L<F)-yqj>>mEPLO8ShHK<9?zA
z1`F4xV^B@;6osgYa4|~leCOELvcjZ|IMhbL%w(0($)d36sj>n^s<vYFf26u8(_#WZ
z@;FR)xRfN!kU0UBPcj3E?1qy*B2mxIdxuqTHbI9@MQ4xbPdV`tSi|McqEcil3}-!|
zv8JLP0%T0ZhsH7sd@PGHH!<z~qSMHA&it$pSWFdSW{xQ<Ld_$jZAJjP^iQFs0LR|M
zbbP0&U3>?NhTtH;JM@ULkA;sr6{D{jt5Q3RN;hh)t)xB}*#`I>!uf;&-Faq$lBFOU
z))4qYkGaYo8JJN-6Cja}JdY#$VBmr`L6@g2lfXX4XQN{BrE-AVvlSg#Vko;ID+Eu)
zyNXH)C}kICMt4HPT_}$uqG~HnB3(3%KBPTiKa@bl+2f$Dz;1}FhmEKUZ`F$>9TWD0
zi_G;zjRSm2bG6ono8MY%4(|IfO6MA@+NPY$Jgx%GmB0>c35%wD1={RlkOno(cY!6v
zdlh6LygSkzp7^1gMAnFceG358XhpzI`)*1%fqv@5A}Ci54=c4BUa=n%168d=qgILW
z$+5Fya<pP!RE)N04xx&2M0ZMm`OF}lxa%ew1C6F%Nx*{?k^cw1uI4~ya}(6O0X4Ds
zw7OpuvE&qZ676jgg=P~|Etq*@D#L@5D<`gs$I=_iPE7V(En_r^Vk_X<pguRt(va>f
z$P!IaA-U)*z@3`)PFdmT$J)o@csv^YAgV3-SQSelTyQq3H5O<0C_qjDvjD0nTB#X2
zICroG8s(DRErQI{G03iPWfL$EuP=9`*9NNwo~Rae8ql0k_2hI~m#HwAer}ajV=@3n
zYi0$OMiV_iscWA_HL<W7uP}32wNFgYaJ3{6+Y2h&rV>zOEy(>5<V0~7Dx5u5wui`=
zoifr>!zFu?73V#isG14yfbP_Omds|(D6<rif*H=9P^QmBdqvE%ceN6!_!yb{&P{}B
z8%)YLMY@r}adt|r$C<m1)Vaxs^$rz&@?T{ugwc#Npe5y;R70(7dqq#N7nOmB>;}{}
z=zDcAKf5qO+l&_RH3SOwVnsiw!PK@guvWBI1PaxhCyqOfSjo0%O?C?a*+^r}<{y3v
zu%ZYx=_chu@dot72InR^6xd+xfqUOjutyOpvm;)z8(x@dKbt5q74nIgH$|%|qD8&-
z>UhdN5dHEc+RUQXWdG^JidUj3u2I3hV6Zr`sUV={MR1c}DJz@^@(U%Y8PFBbDC0AD
zPZ*)ll9<eDUbP}xrO+JdEz#Q2iQ*5+6AN+h)OJ3$GE%2hhMf*H<N2@@{CuM=o-iSG
z*DF-WK(eZzC5{nMVWp;+iFg+g%97spiif3)#7$+Xk#HBK8U>auFki7v_~b1yAh=mi
zM90Qu9i^E@oe+{Y7xshHUGF&WE$V4^z1VC7$THmpls2^%qDUv|k(Ml3#C64L`?9Hw
zGwF$URg6aGUrf;O==&xUJZ5DtdBKy@o>66q3ezHV1`74Xl71>vf?DXM)A6yHKQTBh
z8^}r~SbeRcxnQMbhcXbZSd(clj3`RHGc`8R>ay_^E)?&P8&7MDj#il#i1(87o<=C&
z7f%zQs8FFti+3onsLq9m;-c@sS9t=e*_GX>Ga&<4s}!dV?(Pt1r7*h_tG|SxOLP}6
zOAuKNHcC2SRyYIJXu6wG81Dzq8(IICR6B`SVHU@0o^tV5wZ{ZgyCk3}GG-vm<`rfW
zU@sa77L8SgD}zFcdIC?MWS^Jz89U#3O@R<2mAz~?B(r#;C{k(qv%vG3=`<6QGbHt8
z+KE;H3_UK_%OHgjEo$831YlO|PAUji>H7*?bv1(-KW8HWZ^6Wg&CWNZuiFi8P63mm
zIibQ*RC2M<Y+yg6{|i!KBxoy|DtIoV2xf%^!*m*nu*(A$9+5hVqOHm%FVRa(j!>l>
zFH_-X%`L2YVJh+@vv{IeLM@9f74W>%QnT>-Cg$gHzqu#W=WIO`sE|D-QvzLqhbBiv
zb;6tqE7RnoNHNhz;W`c3bTN)t)omGN`gQ5;aEZudfsw4`Ii#v&o2v;MEH7BA3ILuo
zVzf;}smpuRc}bQ7P@rz^{yP=E6QNckm?vv!eP+Z`0Q`)I^(s|Trj<seNw%l9scu$u
z!qX@vrgT|S3$$cv{aIsuGO$V-OV|rOnV32|ewyt~oOhp1yeRrzEz(%ZRZp_Vkm9K2
zB?4fBiKdqt=<FD34k6QNqPapUjDY2d5$ctx^JGJWSz+S#Um}*edBDWYKha5$S++t}
zn0ahrR#??+;&&-4gbS1-R>&YbIJzjvpUzinttW-(<%rcL)9Wi)qPxDAU`B=QGa{B~
zMr;$$t4$^s%#I<a*=O4(K;y{NW>m;?1XwEx`ZJhI$WHsod`)QbkF3z=Hw>_7agTy{
zpY0cQMVRQLPsMuF(I5=arY2z~^9{q|axl4-BUFhB!Ofp(DK)!^_iK@(uINs+4XLb<
z+sXw^mVng+1zui{GCk4OqRdTCGQ^e%b}{q0RQ_SwdPT@jD2;E$Vu@gnbXY40_6BqP
zRAg&H{WsKDxMCp!M7<|yk<k%rrm<$(oa<Z3RowM#Mdl`Ef@D_01*i$Vs+mPmcY{y#
zmIuzhDJ>Q>6k0UTkF#2F|7nj}cvQy(c1ehNfj%@ae?G6=r@rH|#>yg9&?4+fhiMZl
z%tR+X`rPKhdRvM%Cjgt?S2`&3H10%5Xtia=XcDm)6i97N=$^_k+n6E`6J<}C9`wUE
zVX(GI)LPP5q1X<3+oPGzHd&M{YB{!vSobKiODu+In{;soP}muf^w>A$q7R@lRT7|P
z!k%@Mv#wI$5t2b_DTrLr4FuNh1{cc?Rim31SNE%wg2cSWHqmA29K|3)O1(5GR+oV`
zn{+an3}PyJs$O)p&VuK6O1q4^qCuiPr^m~7!(}aqS7+(0K2K&?OMuNzRPs4t>+%ad
z@;;d~D=AD+TC^RT1}|A<bWw8FXy==XUJTaVcl`au-}P5iptcNHGePYI9p;H<@hIx4
zHsfTS2svvyT0JIO4`OAO(5o3^Vo8M2Q&|I%#!}lDBxH^%nmlEJ2qsa&Y08C%ZMnwE
z3{lf}gy)l-PAn~maSx7HnR*uaQOBYc&{`Ya6M6<JXC0U<WD+I{)dT>uIT5jZ0?Za@
zw#&I-ErpL&J2Ko4sh@!5`3(W0tgI5b($#BbYd0hdi^vENZ8N=QSGa^^M8k#2ucemf
zEM2EY$xI4FQ{{M;Qj0FG$=pExUPn6&XWsC$mF$K}_kvpD$nrI?roCSgC<%zII8V`o
zXyyfQ9E)Gjq>XGLli6c~dqmHoS$0qAQ+6hFSVV;v3MGHcDN}8ko)SgrsofwWR1$46
zVQ<-Vc?C*d;YFF5>iaAJaJtA_WGB3!ze2mguJ?bufJZ#Ol!(-MV=4sA)B?RVE++Q4
zrj#nO!@Bb>j83nt<B&~oo$agUthrdspHkgydG8QpLDuM^eB^-*p};bW(C+${cYKrf
zkizJmk0BMRl2$-z5e-&<)|_`ndH|MmCBQ%fg)^OlY%T+Xy5oHqMUrIUrN!JVzj;&&
zYR>AIl0>s#=<w56xQcpFw1g!JqQ<_KSPha2Wx2-mUA$zp2xu~-Mf#%AOy_V#Kk+`5
zd8)|Ks8h17n6`yQP2}-|eOi#!WyhV;WWol@dbm(=q~}OqHSyZ^Y7zQKlOYUe+1=?M
z9{05)Q7U`xSwxGd$G7ZFZzy22&U+FaFO7MX@(<oXp*oE&qRFVUWHA#Swn~_E?TvlP
zaUb8I2TuDM6&4!$nwXcDwk#Vh;O`4JF<0dakC)-Lz)y?rJmKoIlSv_Aj~8cdkv}KE
z=C1Fpm}#?cd<4k0tV5S91Qm%k{=X*CYm0zYu^CDL6w$1FFC8^AD9Q>gxt9({tOAYM
zte*MmBwy-Y^_ebHZhJ+eO<I&(T~NwG2)0MPS_Z({O2D$h-BuI5WkOJA+hhqSnk&dr
zt^l6O{j1xIzLL!HlB7h-6hva0*OU*&Kb*875-pFmWgt^giT4w&H(FywnyNx`6TLMx
zNM|QaB?$pAvb&JAq%B8LqA7hBWyGrAA3&w<t*A0vX*=-yxw|3gK#15Uv>>WhL{K?s
zWh$HiYvoobS!8NSmRKHe3vSyRWQZ@_+12K^%qwlHTqMeQkB%)Ooy<T*WKxmG0%u+Q
zeVGbV$2ieP8Qr7<E}Z|cwpRd|x;oQ~VP*M%m2JfnKc(3U-4SJ0=-;D6gf!P2SV;uR
zfRMfio%!PQFfWSO^yE-Rd2-`}`HRtoq1^W9FZYjMXpZO<Q+aup*Ub42bXXL@(}H)v
z7TLZbWmfEl>PpF#)&81F`9&welrH$>6{u?}?33s+-8X94F76wxD4njqnnm|Ol$W9&
zXM7?ntk7YN3THOML_dYpSBW;otS!?(;f<amLB0T_CGZrfFj`Bs^jGa4WOOnUL?<H3
z{FE;HY+${*oeS41py6ySi%PQ6Z~3iPEQ^LK+H6ImP0C17p}$o%6S?mvw;lfq;B@X@
znE?uWw#=+$8Y{I6GFl8Yi@&g68o?$;shk9mH1*A1fA#O|^D7fbWJiS3UcvObjlS0=
zTz7omHkmt^bv?{AmbkK_6FrMc)9A(GdXfH?=<^fk?v+L7%3u`r%$daCKJ-S7au*t-
ztj{9)i?VDA5U9WYBc#GaM^)&ss<~7ME`ueZ%gVZ49`sGgXtDyFEJ}O*wlGT(QB8e&
zA*wpf#*(yG&|k6LP#s8R0Zg3VaPUp61yQ}?1C3RpS~}@CXR&-?@Pv`fEr$+><%=mZ
zfGZb`n*4#&wr2GDR-@nS#1^7ksJXH((kvRS*7&GRS`Jh}+f?=~FYRPv0&mi4-Gm?J
zvvJGJVL^E^V+^8@O$<`IM67HwMbf0_0l30x_yv7t1)7|KDQeuK#}@;&^8SV82eL8A
z>X<8jUWFP<+AN85DbP}2u{a;X@%Mf_oA$S(o4kklDK!Nyxkb)7+5nUH*~EAaJ*-)u
z|BBU6l@rxseAfI|D1v*?pvO*sCo5tWouX~;-(hvuu~5-pt5<tq;3@F839VN(oUKNU
zS*O4xjbAD5&&EA7Z+Y7W5vP27@j3aubTaWBo$!RVB4AiVj|HkrXQ5Oh(xi=K=_FfW
zGH+qO5YQgqK&yIDL^NqL8VvMRuCW$?Wd+kSvmdMg%r^VSv*Tq#-mdFBSOs*iye2ed
zB|2NByF*+EsXhuS4<Sevz!U+ieVJu3740z*+vTf#k{C>{>LMU5D1u+8b)x;U{bWn@
zix<Wv<u6cfy4J<)IEgJ$ao_7yI0H!mkS_s2Wt5YFwIWTHCgvvZFONr|Go(5mR*?+s
zs84|E+|nZ)bqg}YC~|2kOw!R=go*x{m3^z+&zWKc6f0mWXNm=oO~>oS_bmhIjSDiP
zSl<4J-H;97i&1MP>MK`zl=X!x*u8jC)v@Jz5{1X=|EZj;8Rb}3swy6%d||y%c%D;X
z<%C83S=GlgTB}gP3jmLvm%q!(XT2cy4Z2HT8RsQNz-U(hy%z<1N`<SDpcLXGihX53
zih#5VfL{U2;^WK0X2BAgv+;OotfF<YCK@ZM7s_=*-v(CpPe&6eIP*%fu#2OsIJ_7U
zqrp|{O}rKLKJz^ZFs<^xW@8|tlRTCH&n${*U=_l%^r>e16^|FT<5Z(s6?j#VTsTon
zCv+j|zDm~?MBhkUzpJ4xD=ELMv5FCF1wa*`T)?#mBA)?b<z!ddfnNFl-nd9O8ol!W
zg;8iBLe;5o1{f1lyA}t|Rw6=hb(RJ%%hFaT>&<<u7hnmL6TSAz#l<otqr@2iV=7!s
zLo+&iXHb_;0BK6~yaM7Cz^|M@n_UES!dkFE+{y)$%@b50dbh#v6kMW+H9e^m{!)Ov
zd$Nily?m_MNqHq=iB^@0J+l(kqx0}7z>c1aJ5yv7Ii<q1z2#MKE&Sv5XARUU=w5j~
z0n2A!h%a5ZZ;V|_^wk_#1&T|-22FosRldVfSI^aZW&?%$iz4u)C`|T(eEtrw@Rn>&
zw`g;5%eFTGI=fhwE_l<+5u_jrfR<~lcfe-xO)`&tXo<*dQIYJqtx|<5C>N=JdetX)
z;xJ3*JkB!CV)W(zRX$gGsJPltRd=232Aj03tbk3?q`HzSS6lTeO-`84-dD9)Dz60>
z+Ux?Tfce#^mF-g=$4az1EpD6Crj~$IeNBAHSHM$w4a55-Y6S017aXgOj{rm&aG&_v
zbbKlo;)1psubrvz&B0s&mx^f1;4BRErL<Hy0j19=oIoqM<1b${D*%XG@&y3BVmGvD
z#9BDH%O^cMaqK&-p5)2kS#?kg1^Ji9YIRIjK~A1tHM+k%R>rH%ycnU<h_njE6_8OT
zXP+=2s{mSl{hbR`2zg(LuB(x=5WPH!fLAJ<U5O)QR{M)>r}i1xc5&CUZIL!(hh2Q%
zVF85G$M?@|k?AL{c>H{+ImGMXwj@$S=VZlAuSDZz>MOkG?7UARP-F?H8dhbST)uG<
z!K%^C=xT3K)>BF8i_z#$*_L=tD-o(3rHb2TQLIjdRp13+D1+sl!FqSlDp%v5IX1KR
zE?#KMWB2aZOo25Spwjj?2I^fftq$5!4|=7?T)FV8`(!$;3Z&1t5Em}EcrwM}0M5Ww
z-e&^BrF~uiYbyeJ`Q(WrcWTO3Cq^s)!3r0Of5txavt8_lKMNF-lT|rk)oAr81HO2o
ztKQCk%draku>xSNOf71K!B`oTPaB*n9lUv!RxZM~$7%(XD-rkIv9hSU;RTQC-7E9m
z_pA)~3P9g^PYW!Us@AN$Z{?y`0Y+$hym$e&j0)cY$}1;-^=h&guB=zD$d|<XYLv>}
z_Zb(`yU}a`yg3zq62Mlt+}<6q&m6or<-uo2fw#utm5BUF(Xb9ITHWv9)mH{ug#2>Z
zK&9)+K9#}q#er=r|KDVMK0T561VDQ6b7#P6U)~Mxt5@GENx_@c^yydbzcHKqvw^g1
zGZjC#ed)b_`TzOP{2K<o*?;q&e*;KYfBy4J@BROp*~9+l=YM`a@8@6tZvc^aJt>~q
RdwKu>002ovPDHLkV1myV#+d*B

diff --git a/vendor/assets/images/colourPicker/colorpicker_rgb_b.png b/vendor/assets/images/colourPicker/colorpicker_rgb_b.png
deleted file mode 100644
index dfac595d017e279ff670df2c816e02d922660d9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 970
zcmV;*12z1KP)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4P)S5VRCwC#nn6n&K^TU=-E6Jmny{kAgHdYMnDn-IF?jG$4BqP9gMtMis0Dw8
zAV{dW=nt@ez?%dVDIU_2gRqI_5Em~-k8ZNXWV1btZa3MO4c19#+Wqh_Zf2N=;hoLQ
zLzrMN$n!kVR;sFUJkQ_V-BE`=I5@}w0L!vKVQ~Q9@px!O=Q!>KBXRE#RaJ4J1Hkq5
zH74#rAmB*#N9cI-&<?si>+9?5X8Zj7{P_5|^XQH{u=yKC6vb33b$ff;+uIw9#SFtZ
zJw0vcV;BZjbSqURlaVB;VRjAxerlS1<l*6Ap-_0kaeaM#!C>&~!NI`5fVIQh?ryB;
zCRH|<L-dhw*g8800JU1pK5~A3zFaPQz252R=|mz?Dwq44b;DOC)nq7ina`tkXkwx+
zFu*YOk)kMSn#QthPfw4}=Mw~>X*Y~znJyFxHP3oeqGU3e&1O9;`*C3*9*=)dr#lP&
zn<{s4fg0h-$-2z|0F15BXa1p~(a}*s5CEWXbyYJAdmo&O{#YpD48vSpURq~=HZW^z
zYn4ic=lPM5k&}~?zi?i#P(>mU00>*Q=~G~A=!rx^QIxK(E{0+5@9$+<_W68FXS3cg
z9in$e&*$@{Qpx;xe0;nc^Q+Ji{h4jrtW!Iut3V(?BD!Pgx=!e-({Wy>6<t+TTCdgp
zf-vm&Q-^+2EONts|Bp<DI`k<?a*Y68M&Nz@iQ?5u&gC#(tG}I{Vd9>NMqMNDj~M~n
z)!GO=qQA@t;I7t2;1S(50<IBojeu(eTqE$BMqnlyrSe)`P!!h){D(&1rdS-qDY5Wf
ztEs$|0)W@+CDaH^Nz#Y8xfUH#M@Qru0Y|4vt`TSpolGN8sZ?k+0uK)lv>Ji7R-H^E
z;Fxt5y<r+k6h%c*(&@A;%duE&c6Qd@rvvC_ZEbDo^+mK1FjswNX9obbx3@PpH|a0}
zdbNrgpEowX?CzrWh9$}58iA@M>+yKp{*YWFP<>kUy}douSY2JE!wBfrD*F4hvVtJ@
z_xH_*L>mEXHkOx{0bprq$rczQjer>#REvv?4Nu550(w0tO-7)tlOusf;N935Ms)0f
sary=%7ro}V>f{=MmOlY4Yuc{?08g~^-7;vm)Bpeg07*qoM6N<$g2&OnRsaA1

diff --git a/vendor/assets/images/colourPicker/colorpicker_rgb_g.png b/vendor/assets/images/colourPicker/colorpicker_rgb_g.png
deleted file mode 100644
index 72b32760a5c40b7ab834d176ac588750a06f13f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1069
zcmV+|1k(G7P)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4vq?ljRCwC#na@w+KorMcp|EVXQK$+YM6*gzHqnN7BF59kyLV$Gkwjyn8-M%_
zE{RbNUKIZauO4)ds|T|oT-ef(s1a0_$f>a^t?r@HEtF8AJM1*eOAln2$@}v7PN(lv
zVqjo^rfD!+2!cS;G+ihZOeejotBV8xi^T#a3=#mWR;yX1lO*|ym8f@!APA_W1Hk3w
zB_iEkuh&r3o1~-lLnG2_dVP3!cw}V6=kpbd#Y`r1aB$FM>4rPdqTFGsf@RrABvLAs
z_V)IUj*iC1$ET;KtLC7VuFaK9CiU4#0Js;$s%4Xtll%Mo+uPgi?d>#8=kxjb`T6VX
zYnRih&Uxo>AeFAF`pIzskVqr~Lqpo^765pv442ErFwDvEaR<YA-0lw)b(PDlt*sSr
zZzV}mr=hO8nrP7PCkTQd2rix0W+wpv2tvE2qq7qLvbo%Qit-N*uCA^s<C~kCJkK}J
z>>5>mzrVKEiOMUN%>sbW=d;^vxor09`ug(nG5}<=S@G^porYX_`AU~VE3z!TGDK12
zc|IHtTS-zB#k2Esx7%GV#GgQ4^p{X9P7p+z=e5~u7zO}#c6JsQ7vu3b&+`;T_4M>`
z9GA&t7={6YXue?rfdBvuX|^c<5G>0+K0fLf%ChWqI(vJ2Z8lpnnM|cp%5P9_w|2W7
z>1kS1l^S-tomBpdnunPn2&bo~4-XFj(BI$hKzujU8^&M)%d(Orp*X1D81+?=O8VFB
zIa!wfZPi~d9gF96vq~2P!K`gH<8pO-Jf@R=lh2dg9?y?N!gSI{gTWRNFc%T{RQW{l
z*CWMo2;1uKCntz>kA*@lBG4iNxDWx<QJ)CBRJ}z6T122l1h6IowOft*`}=4#swV;t
zhofnINmU|6eM4Om{zSl_!J}!qP7gH}3YoI4KD)SR5rO}Z2;AiJeO|8_+iFvGr2x>@
z)`lq&7!3wLPfXOA@a^yrUm{@0H1Q<@4N1q72$V`Cvl4;&Z#A$c0u5CiPa<IGb$p3{
ztchqeDpv;9L_n?j*47pPY;0_-tgM)W2*{G8Twj)!l%_5gi>ZTH69Gx%^@W86{U8at
z_Fg3dSGk-*1b!6?u~<wY0u)6xNqYI^<L>UR@?manP6sovBm$~8BD1qf>UcbEU>Hn@
zfYuw~a2Nn)W@dDT!IB76y{(>_nyMPXmk7v4umABS0u4PmVn_r&_Vpo@j@&Rtryjo2
npA4&xFA;ctuJh%cDE=M*G)vtq^hrv*00000NkvXXu0mjffA{0B

diff --git a/vendor/assets/images/colourPicker/colorpicker_rgb_r.png b/vendor/assets/images/colourPicker/colorpicker_rgb_r.png
deleted file mode 100644
index 4855fe03f8ea8d88b4f8ae625c7958eea65208ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1066
zcmV+_1l9YAP)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4ut`KgRCwC#nL$e%K@`W|#$^*@2)1ijA*P`i*Vs!8o}|Yj_z@}|6buN87D4dl
zS;)b(p0whp5G)M=FI7^gQ8aB#6dSZ+h!%w1Y;?1+hmFg+n<hb-be85ZhhgRo^JnJG
z?!4a+ot>RFn+=R+9LJG1n=PBo8cw>y;UEFPWHNyPjRb(ErY56GCrR=VBT=6aj^j{C
z2Y}PlQ$)I5E>~4mPm+!{9%_-UkM*gkDWxt5LNprP-`}sZ^r|P&B!6Kv=J9woH#gVT
z*4Ee8bGcj~5O6x38Xwfs)pPCb?dfMH0U$33`jPQ?{QUg<*V)<EX!PUiD#I}Gg9EG8
zsyLV}7NpV@RX-950Eoq6JzlSRb`k)J#iD+s$K!E09A>k*x3{;YrDbbti|2U@V!3Kl
zRCTj#GL@3+Y**KVSO<d8kDQ#Glq;8)m-F-U$z;;)c9-=;WvaPYmMwow%gULVnc3al
z9UL5-o13%S?XHdvi`iVyW2&f193ILQZ+Ex$m=ZdZ`(C(QKTl3RZEVcW&N`jWvOXvm
zy<~ET69jRXOsZ!$m9|Dxlr1BO&*5-3n|(Vpl)t$t<AXF{?n_Tk4*+<*UiIvR&*!_n
zz156jSvC@h&@?T7Qd(PEMNv$r(`{{SiVsCmNdKmKRcfOsij?<4(~(N0XqvWIEOOWN
z^|dI9R;#sGEY|I=Ry8IGpU+n)6j1!ApJ<g;k@ED9J9CmG{o7T4ymTz?>qeE%ahy@p
z>gUg%wKI(2q+et*WIMxri^U8lz0dD&5CLNmfmf=FKMMPvNFYqBzie+K(*3%>zd-~V
zL;x2efZ8e(fs*tF5oi#B1`)uT2$WAXLZQ&n(GgA41VQBU`NhRWQ51QeZ*Fd`W2iq+
zC9AKVB^iPU{58STq)rq?Q52=WX&5rCK1rt=MBqOp0vDN#+vPH1T5ZUz6aegYJElaS
z&+mUTFi^oE5)R`_1gbJke2G9!((xn$q9_`b2vmO6z?uluwCZ>gfvT~NFA<Pbwy>}u
zJ+zYaydY?bOazXPk7GMK??WM;=NX3ieRZYrsgLwvFbDv_U{E6+Um_sgKZCuSp8l}3
zB-f`^k&G`9D5zq6Vq!wyh%XUP9v_#Nm*vX%__#5MfK({RB``K7i(FY*Q5vx(0tHD@
z%IN4Q0E~=`C@okM0nKam@bIvv1z#c{ReS!&mk88!bHtDcymY$}N=F_r<$jdLkY231
k>i80YySoaVIYIa{0Hu_2rW%yutN;K207*qoM6N<$f_Z=6i~s-t

diff --git a/vendor/assets/images/colourPicker/colorpicker_select.gif b/vendor/assets/images/colourPicker/colorpicker_select.gif
deleted file mode 100644
index 599f7f13a6854d198f501588948ffcf97bf9f365..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78
zcmZ?wbhEHb<YwSzn8?Hc1pmPR$WZ*r!pOkD#GnHb1<5lo$xms{kbWR15y5uEZTiv3
YH#ckNwl~aFEr=?y37Dqg#>ij|08)1sO8@`>

diff --git a/vendor/assets/images/colourPicker/colorpicker_submit.png b/vendor/assets/images/colourPicker/colorpicker_submit.png
deleted file mode 100644
index 05a46f476882a54485fcc795a65a7c9d6339f0f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5030
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

diff --git a/vendor/assets/images/colourPicker/custom_background.png b/vendor/assets/images/colourPicker/custom_background.png
deleted file mode 100644
index cf55ffdd68ed42f2d70bd7ec2010cee86c110816..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1916
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
G+5ZDFiasF#

diff --git a/vendor/assets/images/colourPicker/custom_hex.png b/vendor/assets/images/colourPicker/custom_hex.png
deleted file mode 100644
index 888f444495b3e08dbfa91181bf94d90bf48c85c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq002k;001lq0ssI2N$P1_00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA2xJg7oRCwC#n9oZBK@`Wot_u~SmxN3r5Ih70Mbu#-5IXvQ^oxZ4n2NCaJ3IzL
z;2{X2q@qylU`7g|2rF%4hk<Pzw~)od+i4!}@OJjGybtqc_w6_I@KkGex=_nv(TLgZ
zbQ3evih(uWS|$L-7?d*;fa82=upc9MGGo!m0NAJF_<K-lewGeZ_2pFrQK}V15QATP
z`riJ56o^g}%&pA;!1{ep2e7uXAO_N1Y9`iZ0+^bdkTSM+b3CvzS$9!Nv+W)=Ft<Y6
z?im0KBP99x=`ny(u}~@&crctsaL2^jjK5RMk5wrM(s!&sbYQl2a$+A^ne18qh(3%6
z!ofU}c>7tIEDr$O-dD(j4er=)=917y8nqSkCx?994FUl(+=?D`-;|%FKoPJJ$1~Dk
zjQIfzhr{G14>qP93*O5^1+Z8&qNbSh-ukFFnu>uX6LGWNXj<z_ih-4`?zBqvf4~S%
zB+HBG0WjYx)#k=39jc4VYpqggm5R!&I2M(PpotY~l}f8rr2e42#x1Q<1*sLaN)<q`
z5yvyqVE$C9bZU;=<e^onAcG|n@k*_(o|yAJ0C%G6SR^dns{jB107*qoM6N<$f<CP8
AJpcdz

diff --git a/vendor/assets/images/colourPicker/custom_hsb_b.png b/vendor/assets/images/colourPicker/custom_hsb_b.png
deleted file mode 100644
index 2f99dae8e6ef73e91a5d6283d2a732b6372d5e27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4&q+i<RCwC#ntMnTK^(__w>x)wo?d?__$+*uo~9%|=tUwFNd)~@{SiSRM1iP1
zASj~8A5vMMMVJ*8R1oAJffN{u5l9L~`8X~2uCvq=70-M4+}rJswQaq-Zg0;<cj1Ql
zV|MO0GvAy0&g|@GPc`t}Vt2RzL(&k7QkyI?ngAp9Q95LIxZ+}?aY!eDmfFM(D8NYT
z_!I&FhGB3>SApbi87WN=0MN7>uxOXuEzPRdLb~V*S*6$YQ95zyOEewaw5Du|_wy;C
zl5QB5;0os9F;P`G4YRr=s>-+YTXl_mIXfq}th88$(g^@ySk@z3C}ZNr)PjP-%&eTY
zmgaYDo!&9Hr3=R@+?M4%IsyP~c$jy~!-q;UQj(TvddBXgC@T5b!SRV{VZi+S0#@m~
zs$4@F02JpNzV=hX(GdU;gpVz$sriF0BHT9P{M^}IRaF_O(@sp;*3vM%s@?%p_LdZ`
z+&5@m;dP(MObv!>BN&ERn4g`tIi{xV>$qfvidRTyeHr&mMR}efjdr_VG`(-QU%#{H
z0gK<?!o&}^H7kuP^cX46Wy-RinM)(qNt0!ao9~R&B!VEkV{l4e&YZ<rmd(jb6^{N-
z!_?L_BBY*mIjkc;igxb@0Joc2FT-%^dyFP=!&FpOrzIyYEG)7tY|!iSveTz+j`cE(
zP`$Wx!{+2jotD4+M*W<_ycLQ{m#|D7&RNmk&BJ5(j$Z*uXP97|K$4_L06|LbQ}wrr
zs45i5_rvsyud<1frR$?~m>#RKO4mo}(8QE&)H;df{DkJDHkqTf0Y)ao#h_8^<o3cG
z#SwvyuHFz4P!<vR(l><F>v`Gf7>PjXu6#^Hp!H*ShzQ7%2q5m++oRS(8F!Q%h>wkS
zy5`zinpG;*zLLT<mM&CPoNxHl-S0zsa6|xi@=pYorH6<>hzNv;K!^y0h`|3O0<9mr
z@g2V~5`pxTB>w@cgc%_sAW!KDaWN*#s1hHm2~cLT*_|>a0v%nwZ(G{^M3(K{BVQsw
zl1QmUfDps6@+AUlwMMB#K&=T=DiP4AgYvo@hyY27Y~1qwj{qV`KG$44DZE4^DQhCY
zzwo(o{saJAzfgYp#$#m=0p2iIYoA=IKF*b|-F~V7BA^y5)0+C{-j(tt0_cxn&YeEW
z6>i>psSF~35Xt2`4X?QQJ$vd1Uny%MfCLAD`iHLp;O?U)VWoVDfO_REso~ihj~e+B
z0nuBMe2D-G<m4zrA~0nB75uEP`(rh?jVMw&L5R(|Y>9yXH>eR2;lBp})JU<4<5KtT
P00000NkvXXu0mjfA`AaT

diff --git a/vendor/assets/images/colourPicker/custom_hsb_h.png b/vendor/assets/images/colourPicker/custom_hsb_h.png
deleted file mode 100644
index a217e9218e6a512b507a35e8a6141f0e56193439..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 970
zcmV;*12z1KP)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4P)S5VRCwC#m|aK|K^(yUyEA+4?d5?fXd;=M7I&7CAQ1#X&_j>CL_YN-gn@+F
zgHSIeAw>3IK|;|7L=oge5IzJ#A^0E&>G?(8=|!HGo*#L7AKu<>4|8pMd)HkZt+#{w
zXC7weW^aBB|Jj-SF*9F$o1tx>E$qcMycycAC@-ZBJ@9=M1Art+Kw)425XHpaLf3nT
z*o$qs(c_|+-@n%!JfIWz{MV(NRK`u1oK!3sq$xeUk30*0rTO&r;Lz}xX3Q?2XDLZ^
zNtQLm=b0`ovGcrzGy{tZJ8^M;iCsNLZ*=us&BvV@!eqi&`J(hE1%Vf=JRxLR*23X^
zHtTjcstkxmW4fX%R1Gc%0Gw!YjZb;hvts~YStk9-f%l(m0w0fy0I;#P!Y~ZOFd0Yc
z6v|xg8E^fO8d9H}oln`OnfJJ7mbVJzw2DT;EXx*f%c_Y}(B({td#$~-(d7^m2>@v8
zyhBz%)<4CSQ06-3bdbu#v?m=s^TUgQAW80>SVT-DWO+Bqe^ZT5c^X^}GWW!^H|6DM
z{2&`t&HcxOX}{XxtgBuQu9KfyE}VDPRTnB@)bzR0U55`X2iGIf82PEXs$7=k;M$J@
zqW{A-4Q++h&2S`|@upE=bV<r*EfGTco~Ba1t4_y#omO;vv5nTx>Xp?Ee;`O5dSyi!
z_6LF|n~ze5J~HYyjR0NfpC{*ZC2Op&)zJu?In|^S_t5Z|X#`9oU=$;ucVssLNp#Z)
zm`1=f0;Ul#jllmj0z<=NR2qTWnkv%>>_H<?SyATo`Dy&DW`WMw*xWLx5f~YD4}SQV
zWx%<!r;Td_5W=*6;IX-MtZ|J1$607K0-U9Y)`YQem{ucz5SyhK+6Z8Tl+ttKvbu>8
zN}^l&B27_@0BI^lKr=??RZm8DS1SN?ceNr_7}^MstN?&p_nzJCxJ2r=d!JKa1US_;
z?df}&-f3JTfPWoH*RQmY%H4;rv~L($))vJGczsJ=-;&x0XvXM>ju9#M``?gN>ukHI
zbY@GK!e7T#7lFRVZvo)JlL2+7ag6|%dL;F~c&F(xt`Sh)F!UJ#{5Lm80~&$3`EU8J
sdf~SzMzo^mJOqtv1hQW_1cCoK0IhW09jn*o82|tP07*qoM6N<$g4YtalK=n!

diff --git a/vendor/assets/images/colourPicker/custom_hsb_s.png b/vendor/assets/images/colourPicker/custom_hsb_s.png
deleted file mode 100644
index 7826b415077be23ed1b1bf05b2da62d4aa5b1c67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1168
zcmV;B1aJF^P)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA57D+@wRCwC#nQcf@Q5eUc-Fr6Onu3&AF^rild$UyX1q~x8l(L`*3O@uvFO(o;
z_5wxr@*$1tgY{vMl7$6QeMqAy6e1xqkX2R|TUIxmtGu(iIrnyNAC8Ud=Dmt?_1xOS
z`EYjbGoJs>o;~L|ziI4tJI8S#VLo05L|S~@48(C<Vq&6{M-UL1()(Qf2mpAVm-66&
z2T~0IKrk4TdK?fmL`x3@0uzw_^Ve^svw2d|{j$4mPM)KX?w-$1zqG1x?m9JH`49*M
zCz9(PkEgM*k!9I{F3CLKvSocCfzl~lVZyAsx|(I#qN1XloSbLvt=F0!@PZIFl$I`z
zwK8K-WOM`ov3h;j+uUw<d3kwmZZ12(X%S+2zb-JFzBs>$eTIg-ib~hV#^6c%;`soO
zlezfi8;3YL0sx8%PiTw9QdL!zm6bIwEpOSPl&u?AQ<R3HrnFFo!gY0jShCQJ=da)O
zgd8+Bn@u0F>j2Q*-QCgA(fXtl0Cw!$vnn?|%wceFNYM&oFvQ9@3=R%a03eJUpBbjP
zxp`q)T3K1y!+W<%Hg9jJw`vg*Mw-&Q9tyNHEd`IT=#<!LcvTQuT3Q?q$H0#tADKR*
zK@R|Pl4epAB?u52%1a*}IK}a25JyMDULrG@O!@iw=W1$_laqZY@uU6C>UEpqjD~4E
z^RfC@Z$F3^H8z_~ryHfSWm(qgbTa*XVcv?&bj$btfnHa?*um@dDVpmsF>?L3*Xu+0
zyNG<2kdR<9neuc7gy{DU#-ng495vU+K24>ZIF9oRKKZ>NR5}3gyyPRArj<QS`N>J2
zf+9GneqF87jYgx)wVGJz@o_T{>vs3KTv8sMfSye0b7#*&eJ)p4MuzH$z|-elQ6iu&
zBJkq1T~TGrm!v941lAN}Dx|xuy)#M#qC|icBA~R%6M<prDkTD=T<`#(qM`y5fg9KB
zq=>*&npp9OT#pigC=nPp5g7fdQCeDBTwIKaKxO%EOa#U(w2IzM!^(@?E$JU80&VS`
zsw4ubW>b_1{D(wfc2d$OhEe0SngVs&z)y})BJlKi*ZoJ2WgLpv7LrQ@Xd0=N2vB3;
zSaOMgR;yDh5zy*l)Jg<&+6m=42}FRVDYX&-MAM;h_SjzWOGMK|6M@hlJ|_?D1b{O~
zcb%xIR|gRYCCsVwSC1dqf#;_$G^l_GXhlEMv$c(piwF||u`vwu!e-l0Qj(pWefUUx
zZQbpLdh413tIzMB(#G&_!c^|xjwk0X-;976L=pjnXgn@jo3O}(`?iG^i6#O_)CkmG
zxeWl9>h6da$t42Xkw=pC+TE}fa*4p0M-sV20F9?}B#;Q$d%jF+*QfVdjmwBCrAMCe
isv!dMU5CLC`)2?-k0%YdqHBTx0000<MNUMnLSTZx*%R~t

diff --git a/vendor/assets/images/colourPicker/custom_indic.gif b/vendor/assets/images/colourPicker/custom_indic.gif
deleted file mode 100644
index 222fb94cfd66bd2bd525891024289d8ee7adc321..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 86
zcmZ?wbhEHbRA%60n8?7e|H!!+3pf7%|DS<@LGdRGBLf2ygAS0*0Fq~5Quk?Dd3vtc
ofx<0a84X)vTz}@y6-}FEVWwE&w=%fy9e4IkpX&klBv~1(0kNDNu>b%7

diff --git a/vendor/assets/images/colourPicker/custom_rgb_b.png b/vendor/assets/images/colourPicker/custom_rgb_b.png
deleted file mode 100644
index 80764e5d6dd8aac3c5ef87d83b45d29780af1fe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1008
zcmV<M0}uR(P)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4c1c7*RCwC#nrlcDK^(y6c4ze-dVNsvS$Lk7-d#%KDZNO9B8i}H)rSZIAqqt8
z0YMQxK1gMO7GYLYP(hF%0x2*QLy#1V@^M=3*;VR^9(UeDy}aA)!`iamU9KIiH$ywj
zhuOK=n;*mfzdQ50Qw)ExxjjCBThS(Jpxfh1O-aHI-9F`j004$z0EPtu00M#F|Aj7f
zhG-Kt;^>QkKy=@(+mI#^_t>{dQ7Uu;MwBWt`i+KWzHKxWRFsz@h)w_i7?usGHrkT0
zKD)TsoR@FvXls4b(GxyKYINaT<}LZ*vqJ!YN*N!1=fMNzxw_27Kw#GGrD;0r$o{Em
zr*Oc+f?rZ}o~pp02LO~789ois!r37JfFKm%ceb>?)2NlMS?`CQ&YGI)1dVFi;abap
z;i(3Ot;S6{u01$1wk*~o=Qus0RH+$;@h{9dT^@(i9mA9r5-&q%BL(iMs>(uxJ`fB(
zYkAvrw{d&PJy!bo78ZWG&G~w+(Qlzc)0AaHD_6$tGgjLqx8AwgnFK+EkC766sd6FC
zvaBgDTR8h41E#*A8A58#=dq7}E!nvj01ynuY^%f3_gk#u0aI07tIx{t`+u@5Sf|w#
z8gra3Ppkq)NH30V*qD`|QSq0b>F@IrKMF<B{~}F2-nrH6G-8a-FwsN;Ns`jOO_^v{
z9gqDwuISoC4X(%PX@_gVK7$>4dTKJ9u+MBYo3KOg?j4Yg0AA=H2S+6(D>UXvXavf4
z6iLM0-qj}?0VIt8<j&q9y*Apit!!UfN|M(%-_h2pP$>44nb#OyNL5;7c;7b^0X;e+
zAaz;U2rQw?MnE<KvJsGtfNTW*r4eZF>ci3q<mfVGBk&&@f%Md5t8D_uV>JQrEH1Yf
zQ6tdZJMg-#bA<sFyLX{$1V|F%dcY&ZbS%0?fTH4XH3C#zJgxx~M@1FuC>Q~f6nSu?
z`yT;Fl6<W@e_VJ8NfK!z!2jTL>FhB8z}0h=7q30U!wB#JbGiP}h1#QB`^wG77#IOc
zkfwEwPs2OWH3IN=z??aGm}^|W^BfN&03pfMTTL&x^*w#!5Z{Tk5rBe?K;!+F0D#*M
zT7;eG8UbqgE2-(ptB@XajezJY30)%qSF>|O&<Ko<{fK_mV}ELfB(CTLA-3ws8Ue+M
epQ_c$UjqPVmqNzW?iQ8+0000<MNUMnLSTaLt-+rF

diff --git a/vendor/assets/images/colourPicker/custom_rgb_g.png b/vendor/assets/images/colourPicker/custom_rgb_g.png
deleted file mode 100644
index fc9778be1eb862a7ada05ae4a34726df0a2c73af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1069
zcmV+|1k(G7P)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4vq?ljRCwC#nO#UzVHn3B&&Qk_ilpY|_s0}<nkbk=f+Q7$H$gXc6IfZH7ino^
z30Zg{rD>>?nPou*fl}Rc5eb1HAxWC1`PusLBR4nqy_`E;96KC0+d@0;ym(%oi|yfg
z_x$(ndC&X2zxj-gtMmpFpf&>hrG(yKl7$8#Cw*>SLjZuo;Q#~&0RVRU%J!1Z^$rQ}
zmwJ}IY`1Uh(_^FL9O<6^I_pste+$N=s=rEqKRDJuFszy!3EUA98=rV2KbLRPF#vE-
zl#}&+80~1kLz1G?r%oQ+pZBik&E1EcPBC0dXXnbwNOsLm0Dzy^*J;{|=Uw@S3#!VF
zX>|sJ$s8sNZn@nSArH}L^-PS_YU5NoqiR=5JOE^8rVM_XWM{_!0K<IPrdeEC(yI6E
z%~;UrX6Drfqd78sXLCbMNKhb2;7l0TtIi}E8l9pjilV5r<T!SA!gbD1wH5$kB4uWa
zb$E2T;btA}FFRMROp5i&mL2{)y?(7zYe#gX3;;&PRW{plbfoNJ<)vGV^#BkPC6`LX
zOc>X4nMA2cakQ~TGSb(W#7`WfP_{jIVqaO2_=ywZB4+0`t6RrGF=5<GUp2bK>F>bK
zPOLkvw4|`EvGqhzag0J~wV399e2Gg;OHPPh(CEBUFtqxQBU8@Lb=P0tPwZQLxpYyh
zpHj{KT3+6rk({nnn9LT7)wTtt!W4|Fde7476CuD~nv<O-_7wrZ*yJ}0$4^7|($_yt
z-2@qoW`oh}rql4UbcbUjHGtzdx2LINbF0qxejQcm0sc}{uhk10-OQXCIq6}tU}9!Y
zy(cRbIqAK9Ljn;%OZvd@1gFZ<l?o1tKweHJN4mRv`UN5&5COgr0j`I8BCxvZ0ud01
zfItKUA|Mcf|49V8d-{<i0*crOfe36vA`m7Eo>I-Ac&)|&&7sp9c}fI&`-Wb<e(NUS
z(1Be35&;}1P`%(`o^ULGi2zB8P$dGS$QRXu5s@3Mb*~cv9LG>40tAjTR$Fz3{g%LS
zUK0W451*?SjsrkVWzm)E_t78%IF8YFt-gc4k5*R{GEQC-0g|;%YnvXsI@jqO86prB
z9!e7dd1%nt((^PCFq$k|)ENFLn2M64^otuUPhDXKABg}#;IuWgKBL#SytsgI@|p+`
ztVW>eUMB!Fw|B9f{3Qb9+9Rp;(Mu-}e~Ey{BZ<F6fcTfrk%vTJV*2}LSKXVpW&%f5
nI)-^#b>0#I_nn4BBK|!9q`eQ<!71fb00000NkvXXu0mjf`y<{e

diff --git a/vendor/assets/images/colourPicker/custom_rgb_r.png b/vendor/assets/images/colourPicker/custom_rgb_r.png
deleted file mode 100644
index 91b0cd4c520013444ae3a64c7e10b28060992557..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1018
zcmV<W0|oqvP)<h;3K|Lk000e1NJLTq002G!002S=0ssI2fJ5@B00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4fJsC_RCwC#m|aK|K^(y6c4zO?v(zImG3)ZwJU`+t%!))43VaBAEQo?ckfMkq
z9|U{Ie6UO_tx!s^pn{-;9_k?o3PD0RD7CZlPA}~|?M&1A_Pp(3&tvZcw~p4^!TmE2
zv%9l9KZgJ8%=`qS-z<wuPJmh@%VltJ$*D|FLk`_GGY0_xfj|Ht7!Uy9_pfX$bhc+m
zvRuZDzU=qM_jOg)R+hNOzfUt#aW`QYsbZtw=(r!Mi^S3c`%3l{=W-1l0{{d_GNM>a
z#zPh5bu}lek5);fvfiF9%hXIn8@AEueU)hQqkD${0Et)>{ie1kXIsXWtjzSX(&AG!
z2CL1kEy{7aJfQ|2kC#>S5LK}z8vszM(|r1DqW2B~02n5Se$)8XVw?Tt@pwNNjBb~s
zvP>sWlDb*O4a<jBs^L*{L7s}Lk9-*q%k`Mib+3b}q@<-cHC-vlQ<)}yBx=giiNnyz
zSc!Z4R@+`}e&4J2*RQoK{B}%CPOs;X)2WK`v#H9E(G)pNNiwofVYXP+s?3Tb)$MJq
zmdTlzZP-K)7AnO_k}TY{lioYV_=#gxWvL2f?~^`>SeU4Uq3DN<X6A&sa8aM1vwhY+
zPm-iWEUMR^CkQA{lDgd9^-mZ&Ju|u{cgL)K-tF;Hk5V?v2?9EtZVVHwtOOE*{twf1
z$>E}3`h3ei-*WU$Bf;o_Ks=KU$8mO7(?GnVj>di+RrF-J4Ao=x&$$Jw&5j&;hEf5o
zHv9gPLgdf~28VegfEN14kug@ub{D8wGy;_ebu4ke?Kkj7fHwkMF#>GI+D0IV&Km*V
z2=GRLHv+s7_@74LZNC9YBcN7g@<w0-8i5R@!fdgkc&x?%nz69x;HVK87#x26=G__%
zst%WP*9hP^MD>7&G3i+D8Ucb3qG|*Pp$OH45fX9bIv0!pj$^1A0f^(F($ZK*zl1m*
zM3;y~5rr}WdFrfEou*NLMj}nJ+U$zdO%ZKa9`#@}H`D?Enj30yT5#G3gc7Eyt@pD2
zG*!Ra{ty8pK+vXXOXuV0o7^=5aCJ$lKX-zvwBCJ+h7o`er^?OlXVmy!I(s~Hlha0k
z{y*t_@Eiber{@Lz55rv}K!h(z-H%>I+~KYfU|f>8YXsom>>N301jfdv;ve<IpPC_#
oDmsQSjXGzIfMCt1QmOdQ0EAO|)dGk<=l}o!07*qoM6N<$f=Fi3y#N3J

diff --git a/vendor/assets/images/colourPicker/custom_submit.png b/vendor/assets/images/colourPicker/custom_submit.png
deleted file mode 100644
index cd202cd93b753b31926593e79eb3756cd58bd677..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 997
zcmV<B0~-8^P)<h;3K|Lk000e1NJLTq000&M001lq0ssI2?l<4300009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA4Ye_^wRCwC#l-+OJWE94q*RQ?AiR0MGMw%@}VN1KRu@(A31>#H7y28o^Y!?Ut
zH(bGg!wuKmGLR-VIu&VBK^my6Efv{HS2f*~kA9_T6FaFBC$Swa;+ifQNNbT06G!jO
zvEJv=Ip_8Hk%dI6Skkc95Pe>@SkgK|!9827XSY}YmStfd!2&Q0^Pjhf&nISQW;{z%
z(K~Te4kS+vluw`R8|?3Ww!7VeOwG>oyleNTtJiPJE8m<63lXVDD0@(HZ*TL<_X-o`
zd||Zv(&(GJFIOtn)+(;wm^jIOG5r2{F|Q!A1yw`d=dbbp$f-`3eDlkhs~EpHa_%o1
zSx6-PuCIsR8xd<cPzj6#w+EsRdKhX@EXczzUt0cdY%ZGUId=3R3#-v+CUbY=Z(pYT
z(+V^{_zrjv!7V@(p@ra)KxEIBw@-ilM*REkqtDobXj<@YdlqG8%H0`VC6-^11ouH!
z=zu2xQGyz@h^XnDQUn+7EdN&LKd>dbUS$C=3~A=dQ@?8Bg(}Pv+!E`RB-z6sA>M#a
zd8Gt}hjIWVUQ~Y$Iug4PC$bhYs1mR;paLooaJeYY=K*Ess5NZBY8_`|XBNVG-(4jq
z91M!kW#}P517QFa$X1cBK&>IOsd##GjsyS$pwX~T7c(@mxby(E6pSp`HPAGWB3Plw
zvdCCSXt<SL?0TMeB({YU1N{TskMi=Sz6sYl*bGPtBne~))+jbO+}Ae6@U8y-7j~<f
zRoKzp6}`ZIl=x~cnJcY;ra_WG5=aBf43>(y^x~C^mwm^(jyaOnSpYacdWMYS+t084
z^2+w%(=O@I5mKuuYq`}Q?t~JPpM7%pt#fC0-?w*!<Lq}Kgiy+`l-^soe|vg5t}M-S
z6cyowZuLe&LoW`V=!w-0!!#|&rCvA4)a*Q^)Ul+LVHoCbR@<^H)BN*MP19^`#4t?2
zd~9B{^!C`u5q;kM;y1IpkuMbYY!Q$}HeV>dH2B<}EheYuo*06&0P2R(PVkSzLgcj`
zVW8J0_-tX~r?D$-1b;*o|4o8p{{*)!{wMeoM(~F$ngoCMosr`UvD=f=@$qZFb7M_{
zzZwY*efmZ_!FT>n%gGzf>BeHwSS<Qs+fvr*Mhn3o(a66<@PI5nNUiP%zkdt>#&(ny
T=A<H#00000NkvXXu0mjfu`<nz

diff --git a/vendor/assets/images/colourPicker/select.png b/vendor/assets/images/colourPicker/select.png
deleted file mode 100644
index 21213bfd51b088497f3a9e423170cd65532d873d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzj7da6RCwC#
zn88ZJKoEv^H>r9_QX-<aTm-QoUcBdtJb3aMJoVrc<?hLYBKQD`7@FjwHZlGaW??DV
z7IBjncHnQ*NnpP24ol{jZQBYRQp$aN9YJGgSJ;hDXa>DN@01`G*?mYE;P(j>ieaLJ
zp1@KmP7DbnxHd5epSMZF>_Ios1X7kEzM%)`8u}mxVv)EwgAVwi+aL%gVHgVE_pQ>@
zbuG%W6jfCb)Fr3i6gRMr(<q9p!*pAN8dQsF8tE}r9vKPgd0uys=Q+_^fx#|_IF1F^
zlE$skuYJNW(uS7(Q6)Ak9FPNYKn}<OIiPI^vi0KAu6q6G8%QKc;(BPifwC;y93Ty|
z4wUM9WmZ91pLfzU{huD<v!eZrmYp-}9E@{gHfx)v>1H#Un@BbTwH6Q2xnfI1$74|x
z`a$b3REt~>BR!+Rjm(B~!)%yB$32-1&(IZ{4HWm<AG#RWj-e>Qa;H~;maQBTMsJ;5
wu=L25Ib=s<$1=nh_wOs&FkN?p<wt-40Cz2b<|?fAX#fBK07*qoM6N<$g8vxSNB{r;

diff --git a/vendor/assets/images/colourPicker/select2.png b/vendor/assets/images/colourPicker/select2.png
deleted file mode 100644
index 2cd2cabeb6777c724034d5b0e0efd664011f515c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTEdT(3l>h+v*8l*BQUCyPMF0TmW&i*=2LJ#e`2#0~
zRsaA2j7da6RCwC#n88ZJKomvKOQ$N-q%EcB2MDDFapS&U<ieHT;L3$x)V(Vgm4bpB
zK?$L0VnI#nxab6;U|Ym#TF8ajJci7fnafLZg`Bk3E#MGn0K3@LI}ifTKmZ^jhyihd
z4&YIYB48vUv11BF!eG|!04Q@!8O$DV3G@KRGQ=k^1TKI#z|&f{L~DHvw9TaJD4zDh
z=#?Z%t<qGhiiWq3=hlY6nJN2@F>t2tcoJKO0Z5XR@gxT5=E@BPRC5JM(-{EmRs+wi
z*>P|@#ScQvT9QAwUwvX=#Ku^(QHKpv2~+}=KqXKKR03@~kh1h#z3lU2-9S7%K9wHY
zZlHd@zd1k|%qmdMx=&^ql(G#p7!3Z$L#9{gzl=qFW|hX6<o?aHQWZ(l8GaDr2cg}r
ztSUd7XyTYiB-359?q(CM!!+wIz$jM^#e@wfxv=31I9gNKa1WfDumRvU%ZE-2j$;5K
z5xL1uVZ=N%DhwvOI{EgB*18QGm_%g9GQ@}R?+f6=Jkt9b055rm#J5mn6951J07*qo
IM6N<$g4GbyQvd(}

diff --git a/vendor/assets/images/colourPicker/slider.png b/vendor/assets/images/colourPicker/slider.png
deleted file mode 100644
index 8b03da96ebd45d66729466d43f263854ce7a0c49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^;tULoEF4TgmQSrk8IWR0cl32+U|4^`oVDvEkS|%{
z8c`CQpH@<ySd_}(n3A8As^FQMn4TJxnwU~qcrw)nsOYSxi(^Q|tv7e9`I-%Q7%l_^
ztnQPw5R+NR{5|Qxtf>M^<+t`|yc1Y?-gyyEotInm#MOm!f^^y*-dYoVJ8o0wy4TmX
zR?7dfn;bc9{iI8VpES5yofZaYh;TjCpK_UhilywQPp{V&o!)zNr-EuAP#7%xRC{Am
z6GR!1|0e8}W%vqnuQi`zyC%VuOt~~QLec?j5=hH8t&PuqF6Zm0mDYFhgqkAab@NoR
n(3#>M@3IhYo&TccjBE_r(UXjnZhw#mdW^x-)z4*}Q$iB}AxU+4

diff --git a/vendor/assets/javascripts/colorpicker.js b/vendor/assets/javascripts/colorpicker.js
deleted file mode 100644
index 45f56ced..00000000
--- a/vendor/assets/javascripts/colorpicker.js
+++ /dev/null
@@ -1,484 +0,0 @@
-/**
- *
- * Color picker
- * Author: Stefan Petre www.eyecon.ro
- * 
- * Dual licensed under the MIT and GPL licenses
- * 
- */
-(function ($) {
-	var ColorPicker = function () {
-		var
-			ids = {},
-			inAction,
-			charMin = 65,
-			visible,
-			tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>',
-			defaults = {
-				eventName: 'click',
-				onShow: function () {},
-				onBeforeShow: function(){},
-				onHide: function () {},
-				onChange: function () {},
-				onSubmit: function () {},
-				color: 'ff0000',
-				livePreview: true,
-				flat: false
-			},
-			fillRGBFields = function  (hsb, cal) {
-				var rgb = HSBToRGB(hsb);
-				$(cal).data('colorpicker').fields
-					.eq(1).val(rgb.r).end()
-					.eq(2).val(rgb.g).end()
-					.eq(3).val(rgb.b).end();
-			},
-			fillHSBFields = function  (hsb, cal) {
-				$(cal).data('colorpicker').fields
-					.eq(4).val(hsb.h).end()
-					.eq(5).val(hsb.s).end()
-					.eq(6).val(hsb.b).end();
-			},
-			fillHexFields = function (hsb, cal) {
-				$(cal).data('colorpicker').fields
-					.eq(0).val(HSBToHex(hsb)).end();
-			},
-			setSelector = function (hsb, cal) {
-				$(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100}));
-				$(cal).data('colorpicker').selectorIndic.css({
-					left: parseInt(150 * hsb.s/100, 10),
-					top: parseInt(150 * (100-hsb.b)/100, 10)
-				});
-			},
-			setHue = function (hsb, cal) {
-				$(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10));
-			},
-			setCurrentColor = function (hsb, cal) {
-				$(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb));
-			},
-			setNewColor = function (hsb, cal) {
-				$(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb));
-			},
-			keyDown = function (ev) {
-				var pressedKey = ev.charCode || ev.keyCode || -1;
-				if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) {
-					return false;
-				}
-				var cal = $(this).parent().parent();
-				if (cal.data('colorpicker').livePreview === true) {
-					change.apply(this);
-				}
-			},
-			change = function (ev) {
-				var cal = $(this).parent().parent(), col;
-				if (this.parentNode.className.indexOf('_hex') > 0) {
-					cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value));
-				} else if (this.parentNode.className.indexOf('_hsb') > 0) {
-					cal.data('colorpicker').color = col = fixHSB({
-						h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10),
-						s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10),
-						b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10)
-					});
-				} else {
-					cal.data('colorpicker').color = col = RGBToHSB(fixRGB({
-						r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10),
-						g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10),
-						b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10)
-					}));
-				}
-				if (ev) {
-					fillRGBFields(col, cal.get(0));
-					fillHexFields(col, cal.get(0));
-					fillHSBFields(col, cal.get(0));
-				}
-				setSelector(col, cal.get(0));
-				setHue(col, cal.get(0));
-				setNewColor(col, cal.get(0));
-				cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]);
-			},
-			blur = function (ev) {
-				var cal = $(this).parent().parent();
-				cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus');
-			},
-			focus = function () {
-				charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65;
-				$(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus');
-				$(this).parent().addClass('colorpicker_focus');
-			},
-			downIncrement = function (ev) {
-				var field = $(this).parent().find('input').focus();
-				var current = {
-					el: $(this).parent().addClass('colorpicker_slider'),
-					max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
-					y: ev.pageY,
-					field: field,
-					val: parseInt(field.val(), 10),
-					preview: $(this).parent().parent().data('colorpicker').livePreview					
-				};
-				$(document).bind('mouseup', current, upIncrement);
-				$(document).bind('mousemove', current, moveIncrement);
-			},
-			moveIncrement = function (ev) {
-				ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10))));
-				if (ev.data.preview) {
-					change.apply(ev.data.field.get(0), [true]);
-				}
-				return false;
-			},
-			upIncrement = function (ev) {
-				change.apply(ev.data.field.get(0), [true]);
-				ev.data.el.removeClass('colorpicker_slider').find('input').focus();
-				$(document).unbind('mouseup', upIncrement);
-				$(document).unbind('mousemove', moveIncrement);
-				return false;
-			},
-			downHue = function (ev) {
-				var current = {
-					cal: $(this).parent(),
-					y: $(this).offset().top
-				};
-				current.preview = current.cal.data('colorpicker').livePreview;
-				$(document).bind('mouseup', current, upHue);
-				$(document).bind('mousemove', current, moveHue);
-			},
-			moveHue = function (ev) {
-				change.apply(
-					ev.data.cal.data('colorpicker')
-						.fields
-						.eq(4)
-						.val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10))
-						.get(0),
-					[ev.data.preview]
-				);
-				return false;
-			},
-			upHue = function (ev) {
-				fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				$(document).unbind('mouseup', upHue);
-				$(document).unbind('mousemove', moveHue);
-				return false;
-			},
-			downSelector = function (ev) {
-				var current = {
-					cal: $(this).parent(),
-					pos: $(this).offset()
-				};
-				current.preview = current.cal.data('colorpicker').livePreview;
-				$(document).bind('mouseup', current, upSelector);
-				$(document).bind('mousemove', current, moveSelector);
-			},
-			moveSelector = function (ev) {
-				change.apply(
-					ev.data.cal.data('colorpicker')
-						.fields
-						.eq(6)
-						.val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10))
-						.end()
-						.eq(5)
-						.val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10))
-						.get(0),
-					[ev.data.preview]
-				);
-				return false;
-			},
-			upSelector = function (ev) {
-				fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
-				$(document).unbind('mouseup', upSelector);
-				$(document).unbind('mousemove', moveSelector);
-				return false;
-			},
-			enterSubmit = function (ev) {
-				$(this).addClass('colorpicker_focus');
-			},
-			leaveSubmit = function (ev) {
-				$(this).removeClass('colorpicker_focus');
-			},
-			clickSubmit = function (ev) {
-				var cal = $(this).parent();
-				var col = cal.data('colorpicker').color;
-				cal.data('colorpicker').origColor = col;
-				setCurrentColor(col, cal.get(0));
-				cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
-			},
-			show = function (ev) {
-				var cal = $('#' + $(this).data('colorpickerId'));
-				cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]);
-				var pos = $(this).offset();
-				var viewPort = getViewport();
-				var top = pos.top + this.offsetHeight;
-				var left = pos.left;
-				if (top + 176 > viewPort.t + viewPort.h) {
-					top -= this.offsetHeight + 176;
-				}
-				if (left + 356 > viewPort.l + viewPort.w) {
-					left -= 356;
-				}
-				cal.css({left: left + 'px', top: top + 'px'});
-				if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) {
-					cal.show();
-				}
-				$(document).bind('mousedown', {cal: cal}, hide);
-				return false;
-			},
-			hide = function (ev) {
-				if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) {
-					if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
-						ev.data.cal.hide();
-					}
-					$(document).unbind('mousedown', hide);
-				}
-			},
-			isChildOf = function(parentEl, el, container) {
-				if (parentEl == el) {
-					return true;
-				}
-				if (parentEl.contains) {
-					return parentEl.contains(el);
-				}
-				if ( parentEl.compareDocumentPosition ) {
-					return !!(parentEl.compareDocumentPosition(el) & 16);
-				}
-				var prEl = el.parentNode;
-				while(prEl && prEl != container) {
-					if (prEl == parentEl)
-						return true;
-					prEl = prEl.parentNode;
-				}
-				return false;
-			},
-			getViewport = function () {
-				var m = document.compatMode == 'CSS1Compat';
-				return {
-					l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
-					t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop),
-					w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth),
-					h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight)
-				};
-			},
-			fixHSB = function (hsb) {
-				return {
-					h: Math.min(360, Math.max(0, hsb.h)),
-					s: Math.min(100, Math.max(0, hsb.s)),
-					b: Math.min(100, Math.max(0, hsb.b))
-				};
-			}, 
-			fixRGB = function (rgb) {
-				return {
-					r: Math.min(255, Math.max(0, rgb.r)),
-					g: Math.min(255, Math.max(0, rgb.g)),
-					b: Math.min(255, Math.max(0, rgb.b))
-				};
-			},
-			fixHex = function (hex) {
-				var len = 6 - hex.length;
-				if (len > 0) {
-					var o = [];
-					for (var i=0; i<len; i++) {
-						o.push('0');
-					}
-					o.push(hex);
-					hex = o.join('');
-				}
-				return hex;
-			}, 
-			HexToRGB = function (hex) {
-				var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
-				return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
-			},
-			HexToHSB = function (hex) {
-				return RGBToHSB(HexToRGB(hex));
-			},
-			RGBToHSB = function (rgb) {
-				var hsb = {
-					h: 0,
-					s: 0,
-					b: 0
-				};
-				var min = Math.min(rgb.r, rgb.g, rgb.b);
-				var max = Math.max(rgb.r, rgb.g, rgb.b);
-				var delta = max - min;
-				hsb.b = max;
-				if (max != 0) {
-					
-				}
-				hsb.s = max != 0 ? 255 * delta / max : 0;
-				if (hsb.s != 0) {
-					if (rgb.r == max) {
-						hsb.h = (rgb.g - rgb.b) / delta;
-					} else if (rgb.g == max) {
-						hsb.h = 2 + (rgb.b - rgb.r) / delta;
-					} else {
-						hsb.h = 4 + (rgb.r - rgb.g) / delta;
-					}
-				} else {
-					hsb.h = -1;
-				}
-				hsb.h *= 60;
-				if (hsb.h < 0) {
-					hsb.h += 360;
-				}
-				hsb.s *= 100/255;
-				hsb.b *= 100/255;
-				return hsb;
-			},
-			HSBToRGB = function (hsb) {
-				var rgb = {};
-				var h = Math.round(hsb.h);
-				var s = Math.round(hsb.s*255/100);
-				var v = Math.round(hsb.b*255/100);
-				if(s == 0) {
-					rgb.r = rgb.g = rgb.b = v;
-				} else {
-					var t1 = v;
-					var t2 = (255-s)*v/255;
-					var t3 = (t1-t2)*(h%60)/60;
-					if(h==360) h = 0;
-					if(h<60) {rgb.r=t1;	rgb.b=t2; rgb.g=t2+t3}
-					else if(h<120) {rgb.g=t1; rgb.b=t2;	rgb.r=t1-t3}
-					else if(h<180) {rgb.g=t1; rgb.r=t2;	rgb.b=t2+t3}
-					else if(h<240) {rgb.b=t1; rgb.r=t2;	rgb.g=t1-t3}
-					else if(h<300) {rgb.b=t1; rgb.g=t2;	rgb.r=t2+t3}
-					else if(h<360) {rgb.r=t1; rgb.g=t2;	rgb.b=t1-t3}
-					else {rgb.r=0; rgb.g=0;	rgb.b=0}
-				}
-				return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
-			},
-			RGBToHex = function (rgb) {
-				var hex = [
-					rgb.r.toString(16),
-					rgb.g.toString(16),
-					rgb.b.toString(16)
-				];
-				$.each(hex, function (nr, val) {
-					if (val.length == 1) {
-						hex[nr] = '0' + val;
-					}
-				});
-				return hex.join('');
-			},
-			HSBToHex = function (hsb) {
-				return RGBToHex(HSBToRGB(hsb));
-			},
-			restoreOriginal = function () {
-				var cal = $(this).parent();
-				var col = cal.data('colorpicker').origColor;
-				cal.data('colorpicker').color = col;
-				fillRGBFields(col, cal.get(0));
-				fillHexFields(col, cal.get(0));
-				fillHSBFields(col, cal.get(0));
-				setSelector(col, cal.get(0));
-				setHue(col, cal.get(0));
-				setNewColor(col, cal.get(0));
-			};
-		return {
-			init: function (opt) {
-				opt = $.extend({}, defaults, opt||{});
-				if (typeof opt.color == 'string') {
-					opt.color = HexToHSB(opt.color);
-				} else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
-					opt.color = RGBToHSB(opt.color);
-				} else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) {
-					opt.color = fixHSB(opt.color);
-				} else {
-					return this;
-				}
-				return this.each(function () {
-					if (!$(this).data('colorpickerId')) {
-						var options = $.extend({}, opt);
-						options.origColor = opt.color;
-						var id = 'collorpicker_' + parseInt(Math.random() * 1000);
-						$(this).data('colorpickerId', id);
-						var cal = $(tpl).attr('id', id);
-						if (options.flat) {
-							cal.appendTo(this).show();
-						} else {
-							cal.appendTo(document.body);
-						}
-						options.fields = cal
-											.find('input')
-												.bind('keyup', keyDown)
-												.bind('change', change)
-												.bind('blur', blur)
-												.bind('focus', focus);
-						cal
-							.find('span').bind('mousedown', downIncrement).end()
-							.find('>div.colorpicker_current_color').bind('click', restoreOriginal);
-						options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector);
-						options.selectorIndic = options.selector.find('div div');
-						options.el = this;
-						options.hue = cal.find('div.colorpicker_hue div');
-						cal.find('div.colorpicker_hue').bind('mousedown', downHue);
-						options.newColor = cal.find('div.colorpicker_new_color');
-						options.currentColor = cal.find('div.colorpicker_current_color');
-						cal.data('colorpicker', options);
-						cal.find('div.colorpicker_submit')
-							.bind('mouseenter', enterSubmit)
-							.bind('mouseleave', leaveSubmit)
-							.bind('click', clickSubmit);
-						fillRGBFields(options.color, cal.get(0));
-						fillHSBFields(options.color, cal.get(0));
-						fillHexFields(options.color, cal.get(0));
-						setHue(options.color, cal.get(0));
-						setSelector(options.color, cal.get(0));
-						setCurrentColor(options.color, cal.get(0));
-						setNewColor(options.color, cal.get(0));
-						if (options.flat) {
-							cal.css({
-								position: 'relative',
-								display: 'block'
-							});
-						} else {
-							$(this).bind(options.eventName, show);
-						}
-					}
-				});
-			},
-			showPicker: function() {
-				return this.each( function () {
-					if ($(this).data('colorpickerId')) {
-						show.apply(this);
-					}
-				});
-			},
-			hidePicker: function() {
-				return this.each( function () {
-					if ($(this).data('colorpickerId')) {
-						$('#' + $(this).data('colorpickerId')).hide();
-					}
-				});
-			},
-			setColor: function(col) {
-				if (typeof col == 'string') {
-					col = HexToHSB(col);
-				} else if (col.r != undefined && col.g != undefined && col.b != undefined) {
-					col = RGBToHSB(col);
-				} else if (col.h != undefined && col.s != undefined && col.b != undefined) {
-					col = fixHSB(col);
-				} else {
-					return this;
-				}
-				return this.each(function(){
-					if ($(this).data('colorpickerId')) {
-						var cal = $('#' + $(this).data('colorpickerId'));
-						cal.data('colorpicker').color = col;
-						cal.data('colorpicker').origColor = col;
-						fillRGBFields(col, cal.get(0));
-						fillHSBFields(col, cal.get(0));
-						fillHexFields(col, cal.get(0));
-						setHue(col, cal.get(0));
-						setSelector(col, cal.get(0));
-						setCurrentColor(col, cal.get(0));
-						setNewColor(col, cal.get(0));
-					}
-				});
-			}
-		};
-	}();
-	$.fn.extend({
-		ColorPicker: ColorPicker.init,
-		ColorPickerHide: ColorPicker.hidePicker,
-		ColorPickerShow: ColorPicker.showPicker,
-		ColorPickerSetColor: ColorPicker.setColor
-	});
-})(jQuery)
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/colorpicker.scss b/vendor/assets/stylesheets/colorpicker.scss
deleted file mode 100644
index c55437a2..00000000
--- a/vendor/assets/stylesheets/colorpicker.scss
+++ /dev/null
@@ -1,161 +0,0 @@
-.colorpicker {
-	width: 356px;
-	height: 176px;
-	overflow: hidden;
-	position: absolute;
-	background: image-url("colourPicker/colorpicker_background.png");
-	font-family: Arial, Helvetica, sans-serif;
-	display: none;
-}
-.colorpicker_color {
-	width: 150px;
-	height: 150px;
-	left: 14px;
-	top: 13px;
-	position: absolute;
-	background: #f00;
-	overflow: hidden;
-	cursor: crosshair;
-}
-.colorpicker_color div {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 150px;
-	height: 150px;
-	background: image-url("colourPicker/colorpicker_overlay.png");
-}
-.colorpicker_color div div {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 11px;
-	height: 11px;
-	overflow: hidden;
-	background: image-url("colourPicker/colorpicker_select.gif");
-	margin: -5px 0 0 -5px;
-}
-.colorpicker_hue {
-	position: absolute;
-	top: 13px;
-	left: 171px;
-	width: 35px;
-	height: 150px;
-	cursor: n-resize;
-}
-.colorpicker_hue div {
-	position: absolute;
-	width: 35px;
-	height: 9px;
-	overflow: hidden;
-	background: image-url("colourPicker/colorpicker_indic.gif") left top;
-	margin: -4px 0 0 0;
-	left: 0px;
-}
-.colorpicker_new_color {
-	position: absolute;
-	width: 60px;
-	height: 30px;
-	left: 213px;
-	top: 13px;
-	background: #f00;
-}
-.colorpicker_current_color {
-	position: absolute;
-	width: 60px;
-	height: 30px;
-	left: 283px;
-	top: 13px;
-	background: #f00;
-}
-.colorpicker input {
-	background-color: transparent;
-	border: 1px solid transparent;
-	position: absolute;
-	font-size: 10px;
-	font-family: Arial, Helvetica, sans-serif;
-	color: white;
-	top: 4px;
-	right: 11px;
-	text-align: right;
-	margin: 0;
-	padding: 0;
-	height: 14px;
-}
-.colorpicker_hex {
-	position: absolute;
-	width: 72px;
-	height: 22px;
-	background: image-url("colourPicker/colorpicker_hex.png") top;
-	left: 212px;
-	top: 142px;
-}
-.colorpicker_hex input {
-	right: 6px;
-}
-.colorpicker_field {
-	height: 22px;
-	width: 62px;
-	background-position: top;
-	position: absolute;
-}
-.colorpicker_field span {
-	position: absolute;
-	width: 12px;
-	height: 22px;
-	overflow: hidden;
-	top: 0;
-	right: 0;
-	cursor: n-resize;
-}
-.colorpicker_rgb_r {
-	background-image: image-url("colourPicker/colorpicker_rgb_r.png");
-	top: 52px;
-	left: 212px;
-}
-.colorpicker_rgb_g {
-	background-image: image-url("colourPicker/colorpicker_rgb_g.png");
-	top: 82px;
-	left: 212px;
-}
-.colorpicker_rgb_b {
-	background-image: image-url("colourPicker/colorpicker_rgb_b.png");
-	top: 112px;
-	left: 212px;
-}
-.colorpicker_hsb_h {
-	background-image: image-url("colourPicker/colorpicker_hsb_h.png");
-	top: 52px;
-	left: 282px;
-}
-.colorpicker_hsb_s {
-	background-image: image-url("colourPicker/colorpicker_hsb_s.png");
-	top: 82px;
-	left: 282px;
-}
-.colorpicker_hsb_b {
-	background-image: image-url("colourPicker/colorpicker_hsb_b.png");
-	top: 112px;
-	left: 282px;
-}
-.colorpicker_submit {
-	position: absolute;
-	width: 22px;
-	height: 22px;
-	background: image-url("colourPicker/colorpicker_submit.png") top;
-	left: 322px;
-	top: 142px;
-	overflow: hidden;
-}
-.colorpicker_focus {
-	background-position: center;
-}
-.colorpicker_hex.colorpicker_focus {
-	background-position: bottom;
-}
-.colorpicker_submit.colorpicker_focus {
-	background-position: bottom;
-}
-.colorpicker_slider {
-	background-position: bottom;
-}

From f1b4089d150800cdcbc82844505fb04a30090bfd Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Tue, 9 Jul 2019 17:05:04 -0400
Subject: [PATCH 14/17] Added fix for room limit (#618)

---
 app/helpers/rooms_helper.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/helpers/rooms_helper.rb b/app/helpers/rooms_helper.rb
index cf0f3dd7..009fd77d 100644
--- a/app/helpers/rooms_helper.rb
+++ b/app/helpers/rooms_helper.rb
@@ -37,7 +37,7 @@ module RoomsHelper
 
     # Does not apply to admin or users that aren't signed in
     # 15+ option is used as unlimited
-    return false if !current_user || current_user&.has_role?(:admin) || limit == 15
+    return false if current_user&.has_role?(:admin) || limit == 15
 
     current_user.rooms.length >= limit
   end
@@ -45,8 +45,10 @@ module RoomsHelper
   def current_room_exceeds_limit(room)
     # Get how many rooms need to be deleted to reach allowed room number
     limit = Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
-    @diff = current_user.rooms.count - limit
 
+    return false if current_user&.has_role?(:admin) || limit == 15
+
+    @diff = current_user.rooms.count - limit
     @diff.positive? && current_user.rooms.pluck(:id).index(room.id) + 1 > limit
   end
 end

From 09afd9154f47b3ea6543297efabcff5c87f19312 Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Wed, 10 Jul 2019 13:40:21 +0000
Subject: [PATCH 15/17] Updates to Gemfile for custom gems

---
 Gemfile      |  4 ++--
 Gemfile.lock | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8edc5c0f..33b61aca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,9 +44,9 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-google-oauth2'
-gem 'omniauth-bn-office365', git: 'https://github.com/blindsidenetworks/omniauth-azure-ad.git'
+gem 'omniauth-bn-office365', git: 'https://github.com/blindsidenetworks/omniauth-bn-office365.git', tag: '0.1.0'
 gem 'omniauth-ldap'
-gem 'omniauth-bn-launcher', '~> 0.1.0'
+gem 'omniauth-bn-launcher', git: 'https://github.com/blindsidenetworks/omniauth-bn-launcher.git', tag: '0.1.0'
 
 # BigBlueButton API wrapper.
 gem 'bigbluebutton-api-ruby'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1de91bf7..44e22c68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,16 @@
 GIT
-  remote: https://github.com/blindsidenetworks/omniauth-azure-ad.git
-  revision: c0c7d4dfb4fa4e66986dba6b436a924d83e48377
+  remote: https://github.com/blindsidenetworks/omniauth-bn-launcher.git
+  revision: 0d0597bec9aed63b9c9d44e99e16353c5d587d48
+  tag: 0.1.0
+  specs:
+    omniauth-bn-launcher (0.1.0)
+      omniauth (~> 1.3, >= 1.3.2)
+      omniauth-oauth2 (= 1.5.0)
+
+GIT
+  remote: https://github.com/blindsidenetworks/omniauth-bn-office365.git
+  revision: d6640b37b5df50b5ed80e1271518bfb5dfb2a966
+  tag: 0.1.0
   specs:
     omniauth-bn-office365 (1.0.0)
       omniauth (>= 1.3.2)
@@ -151,9 +161,6 @@ GEM
     omniauth (1.9.0)
       hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)
-    omniauth-bn-launcher (0.1.0)
-      omniauth (~> 1.3, >= 1.3.2)
-      omniauth-oauth2 (= 1.5.0)
     omniauth-google-oauth2 (0.6.1)
       jwt (>= 2.0)
       omniauth (>= 1.1.1)
@@ -345,7 +352,7 @@ DEPENDENCIES
   listen (~> 3.0.5)
   mini_racer
   omniauth
-  omniauth-bn-launcher (~> 0.1.0)
+  omniauth-bn-launcher!
   omniauth-bn-office365!
   omniauth-google-oauth2
   omniauth-ldap

From 523d9a38f25372d39f460701e6d022beb74fdfa8 Mon Sep 17 00:00:00 2001
From: shawn-higgins1 <23224097+shawn-higgins1@users.noreply.github.com>
Date: Wed, 10 Jul 2019 11:26:43 -0400
Subject: [PATCH 16/17] GRN2-30: Add custom ldap sign in page (#619)

* Add custom ldap signin page

* Remove old omniauth-ldap gem

* Use new bn gems
---
 Gemfile                                      |   5 +-
 Gemfile.lock                                 |  23 ++---
 app/assets/images/ldap-logo.png              | Bin 0 -> 8231 bytes
 app/assets/stylesheets/main.scss             |  11 +++
 app/controllers/sessions_controller.rb       |  84 +++++++++++++------
 app/controllers/users_controller.rb          |   4 +
 app/helpers/application_helper.rb            |   8 +-
 app/views/shared/_header.html.erb            |   4 +-
 app/views/users/ldap_signin.html.erb         |  34 ++++++++
 config/initializers/omniauth.rb              |  41 +--------
 config/locales/en.yml                        |   1 +
 config/routes.rb                             |   2 +
 spec/controllers/sessions_controller_spec.rb |  37 ++++++++
 spec/controllers/users_controller_spec.rb    |   8 ++
 14 files changed, 180 insertions(+), 82 deletions(-)
 create mode 100644 app/assets/images/ldap-logo.png
 create mode 100644 app/views/users/ldap_signin.html.erb

diff --git a/Gemfile b/Gemfile
index 33b61aca..2e77d0e3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,8 +45,9 @@ gem 'omniauth'
 gem 'omniauth-twitter'
 gem 'omniauth-google-oauth2'
 gem 'omniauth-bn-office365', git: 'https://github.com/blindsidenetworks/omniauth-bn-office365.git', tag: '0.1.0'
-gem 'omniauth-ldap'
-gem 'omniauth-bn-launcher', git: 'https://github.com/blindsidenetworks/omniauth-bn-launcher.git', tag: '0.1.0'
+gem 'omniauth-bn-launcher', git: 'https://github.com/blindsidenetworks/omniauth-bn-launcher.git', tag: '0.1.1'
+gem 'bn-ldap-authentication', git: 'https://github.com/blindsidenetworks/bn-ldap-authentication.git'
+gem 'net-ldap'
 
 # BigBlueButton API wrapper.
 gem 'bigbluebutton-api-ruby'
diff --git a/Gemfile.lock b/Gemfile.lock
index 44e22c68..9bc6b0b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,16 @@
+GIT
+  remote: https://github.com/blindsidenetworks/bn-ldap-authentication.git
+  revision: 538132e0df70dbe470120f7bc7a93968c522031f
+  specs:
+    bn-ldap-authentication (1.0.0)
+      net-ldap
+
 GIT
   remote: https://github.com/blindsidenetworks/omniauth-bn-launcher.git
-  revision: 0d0597bec9aed63b9c9d44e99e16353c5d587d48
-  tag: 0.1.0
+  revision: 025785046c3d532ed2252ef4762469c8d08d4839
+  tag: 0.1.1
   specs:
-    omniauth-bn-launcher (0.1.0)
+    omniauth-bn-launcher (0.1.1)
       omniauth (~> 1.3, >= 1.3.2)
       omniauth-oauth2 (= 1.5.0)
 
@@ -165,11 +172,6 @@ GEM
       jwt (>= 2.0)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.5)
-    omniauth-ldap (1.0.5)
-      net-ldap (~> 0.12)
-      omniauth (~> 1.0)
-      pyu-ruby-sasl (~> 0.0.3.2)
-      rubyntlm (~> 0.3.4)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
@@ -187,7 +189,6 @@ GEM
     popper_js (1.14.5)
     public_suffix (3.0.3)
     puma (3.12.1)
-    pyu-ruby-sasl (0.0.3.3)
     rack (2.0.7)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -256,7 +257,6 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.0)
-    rubyntlm (0.3.4)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -336,6 +336,7 @@ DEPENDENCIES
   action-cable-testing
   bcrypt (~> 3.1.7)
   bigbluebutton-api-ruby
+  bn-ldap-authentication!
   bootstrap (~> 4.3.1)
   byebug
   cancancan (~> 2.0)
@@ -351,11 +352,11 @@ DEPENDENCIES
   jquery-rails (~> 4.3.3)
   listen (~> 3.0.5)
   mini_racer
+  net-ldap
   omniauth
   omniauth-bn-launcher!
   omniauth-bn-office365!
   omniauth-google-oauth2
-  omniauth-ldap
   omniauth-twitter
   pagy
   pg (~> 0.18)
diff --git a/app/assets/images/ldap-logo.png b/app/assets/images/ldap-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f11320ef02daad6da7ac625cc8eb6ffce6a1a496
GIT binary patch
literal 8231
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

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 42e41209..4271ade6 100755
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -145,6 +145,17 @@
   }
 }
 
+.customBtn-ldap {
+  @extend .customBtn;
+  background: #d61515;
+
+  .customBtn-image {
+    background: #ffffff image-url("ldap-logo.png") no-repeat left top;
+    background-size: 18px 18px;
+    padding:10px 10px 10px 10px;
+  }
+}
+
 .signin-button {
   font-size: 16px;
 }
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 678ea8a0..f4de6416 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -19,6 +19,7 @@
 class SessionsController < ApplicationController
   include Registrar
   include Emailer
+  include LdapAuthenticator
 
   skip_before_action :verify_authenticity_token, only: [:omniauth, :fail]
 
@@ -47,8 +48,65 @@ class SessionsController < ApplicationController
 
   # GET/POST /auth/:provider/callback
   def omniauth
+    @auth = request.env['omniauth.auth']
+
+    process_signin
+  end
+
+  # POST /auth/failure
+  def omniauth_fail
+    redirect_to root_path, alert: I18n.t(params[:message], default: I18n.t("omniauth_error"))
+  end
+
+  # GET /auth/ldap
+  def ldap
+    ldap_config = {}
+    ldap_config[:host] = ENV['LDAP_SERVER']
+    ldap_config[:port] = ENV['LDAP_PORT'].to_i != 0 ? ENV['LDAP_PORT'].to_i : 389
+    ldap_config[:bind_dn] = ENV['LDAP_BIND_DN']
+    ldap_config[:password] = ENV['LDAP_PASSWORD']
+    ldap_config[:encryption] = if ENV['LDAP_METHOD'] == 'ssl'
+                                    'simple_tls'
+                                elsif ENV['LDAP_METHOD'] == 'tls'
+                                    'start_tls'
+                                end
+    ldap_config[:base] = ENV['LDAP_BASE']
+    ldap_config[:uid] = ENV['LDAP_UID']
+
+    result = send_ldap_request(params[:session], ldap_config)
+
+    if result
+      result = result.first
+    else
+      return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials"))
+    end
+
+    @auth = parse_auth(result)
+
+    process_signin
+  end
+
+  private
+
+  def session_params
+    params.require(:session).permit(:email, :password)
+  end
+
+  def check_user_exists
+    provider = @auth['provider'] == "bn_launcher" ? @auth['info']['customer'] : @auth['provider']
+    User.exists?(social_uid: @auth['uid'], provider: provider)
+  end
+
+  # Check if the user already exists, if not then check for invitation
+  def passes_invite_reqs
+    return true if @user_exists
+
+    invitation = check_user_invited("", session[:invite_token], @user_domain)
+    invitation[:present]
+  end
+
+  def process_signin
     begin
-      @auth = request.env['omniauth.auth']
       @user_exists = check_user_exists
 
       if !@user_exists && @auth['provider'] == "twitter"
@@ -89,28 +147,4 @@ class SessionsController < ApplicationController
         omniauth_fail
     end
   end
-
-  # POST /auth/failure
-  def omniauth_fail
-    redirect_to root_path, alert: I18n.t(params[:message], default: I18n.t("omniauth_error"))
-  end
-
-  private
-
-  def session_params
-    params.require(:session).permit(:email, :password)
-  end
-
-  def check_user_exists
-    provider = @auth['provider'] == "bn_launcher" ? @auth['info']['customer'] : @auth['provider']
-    User.exists?(social_uid: @auth['uid'], provider: provider)
-  end
-
-  # Check if the user already exists, if not then check for invitation
-  def passes_invite_reqs
-    return true if @user_exists
-
-    invitation = check_user_invited("", session[:invite_token], @user_domain)
-    invitation[:present]
-  end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3883a584..dd89d633 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -68,6 +68,10 @@ class UsersController < ApplicationController
     end
   end
 
+  # GET /ldap_signin
+  def ldap_signin
+  end
+
   # GET /signup
   def new
     return redirect_to root_path unless Rails.configuration.allow_user_signup
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 248ebbf8..eb3ebf65 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -33,7 +33,7 @@ module ApplicationHelper
 
   # Determines which providers can show a login button in the login modal.
   def iconset_providers
-    providers = configured_providers & [:google, :twitter, :microsoft_office365]
+    providers = configured_providers & [:google, :twitter, :microsoft_office365, :ldap]
 
     providers.delete(:twitter) if session[:old_twitter_user_id]
 
@@ -42,7 +42,11 @@ module ApplicationHelper
 
   # Generates the login URL for a specific provider.
   def omniauth_login_url(provider)
-    "#{Rails.configuration.relative_url_root}/auth/#{provider}"
+    if provider == :ldap
+      ldap_signin_path
+    else
+      "#{Rails.configuration.relative_url_root}/auth/#{provider}"
+    end
   end
 
   # Determine if Greenlight is configured to allow user signups.
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index a11211df..1228e2b4 100755
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -72,9 +72,7 @@
           </div>
         <% else %>
           <% allow_greenlight_accounts = allow_greenlight_accounts? %>
-          <% if Rails.configuration.omniauth_ldap %>
-            <%= link_to t("login"), omniauth_login_url(:ldap), :class => "btn btn-outline-primary mx-2 sign-in-button" %>
-          <% elsif allow_greenlight_accounts %>
+          <% if allow_greenlight_accounts %>
             <%= link_to t("login"), signin_path, :class => "btn btn-outline-primary mx-2 sign-in-button" %>
           <% elsif Rails.configuration.loadbalanced_configuration %>
             <%= link_to t("login"), omniauth_login_url(:bn_launcher), :class => "btn btn-outline-primary mx-2 sign-in-button" %>
diff --git a/app/views/users/ldap_signin.html.erb b/app/views/users/ldap_signin.html.erb
new file mode 100644
index 00000000..3d7c301c
--- /dev/null
+++ b/app/views/users/ldap_signin.html.erb
@@ -0,0 +1,34 @@
+<div class="container">
+    <div class="row pt-7">
+        <div class="col col-lg-6 offset-lg-3">
+            <div class="card">
+                <div class="card-header background">
+                    <h4 class="mt-2"><%= t("login_title") %></h4>
+                </div>
+                <div class="card-body background">
+                    <%= form_for(:session, url: ldap_callback_path) do |f| %>
+                        <div class="form-group">
+                            <div class="input-icon">
+                                <span class="input-icon-addon">
+                                    <i class="fas fa-user"></i>
+                                </span>
+                                <%= f.text_field :username, class: "form-control", placeholder: t("administrator.users.table.username"), value: "" %>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="input-icon">
+                                <span class="input-icon-addon">
+                                    <i class="fas fa-key"></i>
+                                </span>
+                                <%= f.password_field :password, class: "form-control", placeholder: t("password"), value: "" %>
+                            </div>
+                        </div>
+                        <div>
+                            <%= f.submit t("login"), class: "btn btn-primary btn-block signin-button" %>
+                        </div>
+                    <% end %>
+                </div>
+            </div>
+        </div>
+    </div>
+</div> 
\ No newline at end of file
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index d601fb3f..b046590a 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -15,9 +15,6 @@ Rails.application.config.omniauth_google = ENV['GOOGLE_OAUTH2_ID'].present? && E
 Rails.application.config.omniauth_office365 = ENV['OFFICE365_KEY'].present? &&
                                               ENV['OFFICE365_SECRET'].present?
 
-# If LDAP is enabled, override and disable allow_user_signup.
-Rails.application.config.allow_user_signup = false if Rails.application.config.omniauth_ldap
-
 SETUP_PROC = lambda do |env|
   SessionsController.helpers.omniauth_options env
 end
@@ -29,19 +26,9 @@ Rails.application.config.middleware.use OmniAuth::Builder do
       client_secret: ENV['CLIENT_SECRET'],
       client_options: { site: ENV['BN_LAUNCHER_URI'] || ENV['BN_LAUNCHER_REDIRECT_URI'] },
       setup: SETUP_PROC
-  elsif Rails.configuration.omniauth_ldap
-    Rails.application.config.providers << :ldap
-
-    provider :ldap,
-      host: ENV['LDAP_SERVER'],
-      port: ENV['LDAP_PORT'] || '389',
-      method: ENV['LDAP_METHOD'].blank? ? :plain : ENV['LDAP_METHOD'].to_sym,
-      allow_username_or_email_login: true,
-      uid: ENV['LDAP_UID'],
-      base: ENV['LDAP_BASE'],
-      bind_dn: ENV['LDAP_BIND_DN'],
-      password: ENV['LDAP_PASSWORD']
   else
+    Rails.application.config.providers << :ldap if Rails.configuration.omniauth_ldap
+
     if Rails.configuration.omniauth_twitter
       Rails.application.config.providers << :twitter
 
@@ -69,27 +56,3 @@ end
 OmniAuth.config.on_failure = proc { |env|
   OmniAuth::FailureEndpoint.new(env).redirect_to_failure
 }
-
-# Work around beacuse callback_url option causes
-# omniauth.auth to be nil in the authhash when
-# authenticating with LDAP.
-module OmniAuthLDAPExt
-  def request_phase
-    rel_root = ENV['RELATIVE_URL_ROOT'].present? ? ENV['RELATIVE_URL_ROOT'] : '/b'
-
-    @callback_path = nil
-    path = options[:callback_path]
-    options[:callback_path] = "#{rel_root if Rails.env == 'production'}/auth/ldap/callback"
-    form = super
-    options[:callback_path] = path
-    form
-  end
-end
-
-module OmniAuth
-  module Strategies
-    class LDAP
-      prepend OmniAuthLDAPExt
-    end
-  end
-end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f821a047..fe338331 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -302,6 +302,7 @@ en:
     google: Google
     office365: Office 365
     twitter: Twitter
+    ldap: LDAP
   recaptcha:
     errors:
       recaptcha_unreachable: Oops, we failed to validate your reCAPTCHA response. Please try again.
diff --git a/config/routes.rb b/config/routes.rb
index a99d62cb..e0429db7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,6 +29,7 @@ Rails.application.routes.draw do
   get '/signin', to: 'users#signin', as: :signin
   get '/signup', to: 'users#new', as: :signup
   post '/signup', to: 'users#create', as: :create_user
+  get '/ldap_signin', to: 'users#ldap_signin', as: :ldap_signin
 
   # Redirect to terms page
   match '/terms', to: 'users#terms', via: [:get, :post]
@@ -88,6 +89,7 @@ Rails.application.routes.draw do
   # Handles Omniauth authentication.
   match '/auth/:provider/callback', to: 'sessions#omniauth', via: [:get, :post], as: :omniauth_session
   get '/auth/failure', to: 'sessions#omniauth_fail'
+  post '/auth/ldap', to: 'sessions#ldap', as: :ldap_callback
 
   # Room resources.
   resources :rooms, only: [:create, :show, :destroy], param: :room_uid, path: '/'
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 3ea499c5..d8f2bbc3 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -336,4 +336,41 @@ describe SessionsController, type: :controller do
       expect(response).to redirect_to(root_path)
     end
   end
+
+  describe "POST #ldap" do
+    it "should create and login a user with a ldap login" do
+      entry = Net::LDAP::Entry.new("cn=Test User,ou=people,dc=planetexpress,dc=com")
+      entry[:cn] = "Test User"
+      entry[:givenName] = "Test"
+      entry[:sn] = "User"
+      entry[:mail] = "test@example.com"
+      allow_any_instance_of(Net::LDAP).to receive(:bind_as).and_return([entry])
+
+      post :ldap, params: {
+        session: {
+          user: "test",
+          password: 'password',
+        },
+      }
+
+      u = User.last
+      expect(u.provider).to eql("ldap")
+      expect(u.email).to eql("test@example.com")
+      expect(@request.session[:user_id]).to eql(u.id)
+    end
+
+    it "should redirect to signin on invalid credentials" do
+      allow_any_instance_of(Net::LDAP).to receive(:bind_as).and_return(false)
+
+      post :ldap, params: {
+        session: {
+          user: "test",
+          password: 'passwor',
+        },
+      }
+
+      expect(response).to redirect_to(ldap_signin_path)
+      expect(flash[:alert]).to eq(I18n.t("invalid_credentials"))
+    end
+  end
 end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 5622dcb1..42bc6103 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -387,4 +387,12 @@ describe UsersController, type: :controller do
       expect(response).to redirect_to(root_path)
     end
   end
+
+  context 'GET #ldap_signin' do
+    it "should render the ldap signin page" do
+      get :ldap_signin
+
+      expect(response).to render_template(:ldap_signin)
+    end
+  end
 end

From c7a0c6a46349edd9c86d2b6a8d271a045980ecef Mon Sep 17 00:00:00 2001
From: farhatahmad <35435341+farhatahmad@users.noreply.github.com>
Date: Wed, 10 Jul 2019 11:51:19 -0400
Subject: [PATCH 17/17] GRN2-192: Made error pages more descriptive (#620)

* GRN2-192

* Brought back error codes
---
 app/controllers/application_controller.rb     |  6 ++++-
 app/controllers/errors_controller.rb          |  4 ----
 app/views/errors/bigbluebutton_error.html.erb |  6 ++---
 app/views/errors/internal_error.html.erb      |  2 +-
 app/views/errors/not_found.html.erb           |  8 +++----
 app/views/errors/unauthorized.html.erb        |  6 ++---
 app/views/errors/unprocessable.html.erb       | 23 -------------------
 config/locales/en.yml                         | 15 ++++++------
 config/routes.rb                              |  1 -
 .../application_controller_spec.rb            | 16 +++++++++++--
 spec/controllers/errors_controller_spec.rb    |  7 ------
 11 files changed, 38 insertions(+), 56 deletions(-)
 delete mode 100644 app/views/errors/unprocessable.html.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c8943667..70df16a3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -141,7 +141,11 @@ class ApplicationController < ActionController::Base
         retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials')
       rescue => e
         if e.message.eql? "No user with that id exists"
-          render "errors/not_found", locals: { user_not_found: true }
+          render "errors/not_found", locals: { message: I18n.t("errors.not_found.user_not_found.message"),
+            help: I18n.t("errors.not_found.user_not_found.help") }
+        elsif e.message.eql? "Provider not included."
+          render "errors/not_found", locals: { message: I18n.t("errors.not_found.user_missing.message"),
+            help: I18n.t("errors.not_found.user_missing.help") }
         else
           render "errors/internal_error"
         end
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
index 5c388a4e..e9131af4 100644
--- a/app/controllers/errors_controller.rb
+++ b/app/controllers/errors_controller.rb
@@ -21,10 +21,6 @@ class ErrorsController < ApplicationController
     render status: 404, formats: :html
   end
 
-  def unprocessable
-    render status: 422, formats: :html
-  end
-
   def internal_error
     render status: 500, formats: :html
   end
diff --git a/app/views/errors/bigbluebutton_error.html.erb b/app/views/errors/bigbluebutton_error.html.erb
index b1e41b6b..f30cdd8e 100644
--- a/app/views/errors/bigbluebutton_error.html.erb
+++ b/app/views/errors/bigbluebutton_error.html.erb
@@ -14,7 +14,7 @@
 %>
 
 <div class="container text-center pt-9">
-  <div class="display-1 text-muted mb-5"><%= I18n.t("errors.bigbluebutton.title") %></div>
-  <h1 class="h2 mb-3"><%= I18n.t("errors.bigbluebutton.message") %></h1>
-  <p class="h4 text-muted font-weight-normal mb-7"><%= I18n.t("errors.bigbluebutton.help", doc_link: "http://docs.bigbluebutton.org/greenlight/gl-install.html#setting-bigbluebutton-credentials").html_safe %></p>
+  <div class="display-1 text-muted mb-5"><%= t("errors.bigbluebutton.title") %></div>
+  <h1 class="h2 mb-3"><%= t("errors.bigbluebutton.message") %></h1>
+  <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.bigbluebutton.help", doc_link: "http://docs.bigbluebutton.org/greenlight/gl-install.html#setting-bigbluebutton-credentials").html_safe %></p>
 </div>
diff --git a/app/views/errors/internal_error.html.erb b/app/views/errors/internal_error.html.erb
index af926b5b..0c76f1db 100644
--- a/app/views/errors/internal_error.html.erb
+++ b/app/views/errors/internal_error.html.erb
@@ -14,7 +14,7 @@
 %>
 
 <div class="container text-center pt-9">
-  <div class="display-1 text-muted mb-5">500</div>
+  <div class="display-1 text-primary mb-5">500</div>
   <h1 class="h2 mb-3"><%= t("errors.internal.message") %></h1>
   <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.internal.help") %></p>
   <a class="btn btn-primary" href="javascript:history.back()">
diff --git a/app/views/errors/not_found.html.erb b/app/views/errors/not_found.html.erb
index 95bdcbbb..d259ceac 100644
--- a/app/views/errors/not_found.html.erb
+++ b/app/views/errors/not_found.html.erb
@@ -14,10 +14,10 @@
 %>
 
 <div class="container text-center pt-9">
-  <div class="display-1 text-muted mb-5">404</div>
-  <% if defined?(user_not_found) %>
-    <h1 class="h2 mb-3"><%= t("errors.not_found.user_message") %></h1>
-    <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.user_help") %></p>
+  <div class="display-1 mb-5 text-primary">404</div>
+  <% if defined?(message) && defined?(help) %>
+    <h1 class="h2 mb-3"><%= message %></h1>
+    <p class="h4 text-muted font-weight-normal mb-7"><%= help %></p>
   <% else %>
     <h1 class="h2 mb-3"><%= t("errors.not_found.message") %></h1>
     <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.not_found.help") %></p>
diff --git a/app/views/errors/unauthorized.html.erb b/app/views/errors/unauthorized.html.erb
index 1e6682a8..23dcdd7d 100644
--- a/app/views/errors/unauthorized.html.erb
+++ b/app/views/errors/unauthorized.html.erb
@@ -14,7 +14,7 @@
 %>
 
 <div class="container text-center pt-9">
-  <div class="display-1 text-muted mb-5">401</div>
-  <h1 class="h2 mb-3"><%= I18n.t("errors.unauthorized.message") %></h1>
-  <p class="h4 text-muted font-weight-normal mb-7"><%= I18n.t("errors.unauthorized.help") %></p>
+  <div class="display-1 text-primary mb-5">401</div>
+  <h1 class="h2 mb-3"><%= t("errors.unauthorized.message") %></h1>
+  <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.unauthorized.help") %></p>
 </div>
diff --git a/app/views/errors/unprocessable.html.erb b/app/views/errors/unprocessable.html.erb
deleted file mode 100644
index cec62f44..00000000
--- a/app/views/errors/unprocessable.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
-# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
-# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
-# This program is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free Software
-# Foundation; either version 3.0 of the License, or (at your option) any later
-# version.
-#
-# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-# You should have received a copy of the GNU Lesser General Public License along
-# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-%>
-
-<div class="container text-center pt-9">
-  <div class="display-1 text-muted mb-5">422</div>
-  <h1 class="h2 mb-3"><%= t("errors.unprocessable.message") %></h1>
-  <p class="h4 text-muted font-weight-normal mb-7"><%= t("errors.unprocessable.help") %></p>
-  <a class="btn btn-primary" href="javascript:history.back()">
-    <i class="fas fa-arrow-left mr-2"></i><%= t("go_back") %>
-  </a>
-</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fe338331..9082984e 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -119,7 +119,7 @@ en:
       message: Invalid BigBlueButton Endpoint and Secret
       title: Server Error
     internal:
-      message: Oh no! Looks like something went wrong on our end.
+      message: Looks like something went wrong on our end.
       help: The error has been logged, we'll take a look!
     migration_error:
       contact_admin: If you are not an administrator, please contact one.
@@ -138,17 +138,18 @@ en:
       confirmation: doesn't match %{attribute}
       inclusion: is not included in the list
     not_found:
-      message: Whoops! Looks like we can't find that.
+      message: Sorry! The page you are looking for does not exist.
       help: Is it possible its been removed?
-      user_message: User Not Found.
-      user_help: Sorry, this user is not registered.
+      user_not_found:
+        help: Please contact an administrator.
+        message: Sorry, this user is not registered.
+      user_missing:
+        help: Please verify the URL and try again
+        message: The URL that you have entered is not valid.
     title: Errors
     unauthorized:
       message: You do not have access to this application
       help: If you believe this is a mistake, please contact your system administrator.
-    unprocessable:
-      message: Oops! Request is unprocessable.
-      help: Unfortunately this isn't a valid request.
   expired_reset_token: Password reset link has expired!
   features:
     title: Features
diff --git a/config/routes.rb b/config/routes.rb
index e0429db7..a1dc1eaa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,7 +22,6 @@ Rails.application.routes.draw do
   # Error routes.
   match '/401', to: 'errors#unauthorized', via: :all, as: :unauthorized
   match '/404', to: 'errors#not_found', via: :all, as: :not_found
-  match '/422', to: 'errors#unprocessable', via: :all
   match '/500', to: 'errors#internal_error', via: :all, as: :internal_error
 
   # Signin/Signup routes.
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 14bf1f65..f8f8a917 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -74,7 +74,7 @@ describe ApplicationController do
     it "renders a 404 error if user is not found" do
       allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
       allow(Rails.env).to receive(:test?).and_return(false)
-      allow_any_instance_of(SessionsHelper).to receive(:parse_user_domain).and_return("")
+      allow_any_instance_of(SessionsHelper).to receive(:parse_user_domain).and_return("fake_provider")
       allow_any_instance_of(BbbApi).to receive(:retrieve_provider_info).and_raise("No user with that id exists")
 
       routes.draw { get "user_not_found" => "anonymous#user_not_found" }
@@ -83,7 +83,19 @@ describe ApplicationController do
       expect(response).to render_template("errors/not_found")
     end
 
-    it "renders a 500 error if any other error is not found" do
+    it "renders a 404 error if user is not given" do
+      allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
+      allow(Rails.env).to receive(:test?).and_return(false)
+      allow_any_instance_of(SessionsHelper).to receive(:parse_user_domain).and_return("")
+      allow_any_instance_of(BbbApi).to receive(:retrieve_provider_info).and_raise("Provider not included.")
+
+      routes.draw { get "user_not_found" => "anonymous#user_not_found" }
+
+      get :user_not_found
+      expect(response).to render_template("errors/not_found")
+    end
+
+    it "renders a 500 error if any other error related to bbb api" do
       allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(true)
       allow(Rails.env).to receive(:test?).and_return(false)
       allow_any_instance_of(SessionsHelper).to receive(:parse_user_domain).and_return("")
diff --git a/spec/controllers/errors_controller_spec.rb b/spec/controllers/errors_controller_spec.rb
index 48616b0a..d346e940 100644
--- a/spec/controllers/errors_controller_spec.rb
+++ b/spec/controllers/errors_controller_spec.rb
@@ -26,13 +26,6 @@ describe ErrorsController, type: :controller do
     end
   end
 
-  describe "GET #unprocessable" do
-    it "returns unprocessable" do
-      get :unprocessable
-      expect(response).to have_http_status(422)
-    end
-  end
-
   describe "GET #internal_error" do
     it "returns internal_error" do
       get :internal_error