Added Google calendar button (#429)

* implement first version of the recording authentication, redirecting to the playback URL with the jwt token

* set default recording visibility by environment variable

* use the http header, if present, to determine the client ip address

* fix email verification when disabled

* revert playback component to link_to, change method to get

* remove unnecessary variable

* Added "Add to Google Calendar" button on Room page

* Added Google Calendar button enable to env.sample

* Updated CSS for the Google Calendar Button row

* Added correct translation when copying room link

* Fixed new Google Calendar button mobile display

* GRN-80: Allow local accounts on multitenant (#428)

* Changed the way the omniauth providers are declared

* Allow local authentication for multitenant mode based on customer settings

* Cleanead up code mandated by rubocop

* Completed implementation for signin and added the one for signup

* Fixed issue with rubocop

* Renamed customer_name to lb_user

* Renamed lb_user -> user_domain, fixed issue with signup controller, email verification WAS NOT implemented

* Completed implementation of email_verification

* Fixed rubocop issue

* Final update

* Fix for test with loadbalancer

* Make sure loadbalancer mockup is only used when env defined

* Fix for test on rooms_controller

* Fixed most of the test failing on multitenant env

* Fixed issue detected by rubocop

* Fixed issue with activation tockens not working on resend

* Fixed new issue found by rubocop

* Updated travis script

* Harcoded credentials for mockup

* Updated expectation on start_session

* Fixed issue with duplication of home room

* Updated script for rubocop

* Restored Gemfile

* Update sample.env

* Update sample.env
This commit is contained in:
Rafael Baldasso Audibert
2019-05-13 18:05:31 -03:00
committed by Jesus Federico
parent d7b9e7a322
commit d8f6c3f872
8 changed files with 48 additions and 18 deletions

View File

@ -111,5 +111,8 @@ module Greenlight
# Whether the user has defined the variables required for recaptcha
config.recaptcha_enabled = ENV['RECAPTCHA_SITE_KEY'].present? && ENV['RECAPTCHA_SECRET_KEY'].present?
# Show/hide "Add to Google Calendar" button in the room page
config.enable_google_calendar_button = (ENV['ENABLE_GOOGLE_CALENDAR_BUTTON'] == "true")
end
end

View File

@ -62,12 +62,14 @@ en:
uid: User ID
username: Username
title: Manage Users
add_to_google_calendar: "Add to Google Calendar"
bigbluebutton: BigBlueButton
bigbluebutton_exception: Oops, there was an error when starting the meeting!
cancel: Cancel
cookies:
cookie_info: Cookies help us deliver our services. By using our services, you agree to our use of cookies.
cookie_button: I Agree
copied: Copied
copy: Copy
default_admin: You are still using the default password for this account. Please click <a href="%{edit_link}">here</a> to change it
delete: Delete