Commit Graph

221 Commits

Author SHA1 Message Date
shawn-higgins1 4a4fcec6fb Add a colour picker that is consistent across all browsers (GRN2-96) (#518)
* sync

* Fix corruption

* Add back room.rb

* Line endings

* More line endings

* Add jQuery colour picker

* Remove inline styling
2019-05-17 12:28:58 -04:00
shawn-higgins1 23abdb52ee Add paging to Recordings Table (GRN2-26) (#512)
* Add translations for the validation messages

* Add translations for next/prev button

* Add paging to recordings

* sync

* Fix line endings
2019-05-14 09:01:41 -04:00
Rafael Baldasso Audibert d8f6c3f872 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
2019-05-13 17:05:31 -04:00
shawn-higgins1 55afbe99f5 Refactor users.html to only make one db call to get roles (GRN2-121) (#513)
* Refactor _users.html to only make one db call to get role

* Apply comments
2019-05-09 18:24:58 -04:00
farhatahmad 75bde6a42d GRN2-xx: Email and admin fix (#515)
* Email and admin fix

* Redirected super_admins to the admins page

* Small fix

* Update rooms_controller.rb
2019-05-09 18:07:17 -04:00
shawn-higgins1 63ada8b3db Fixed #514: Fix UI issues with the create room modal (#516)
* sync

* Fix create room modal UI

* Fix line endings issues

* More line ending issues
2019-05-09 14:02:36 -04:00
farhatahmad 84d7d8992a Small bug fix (#508) 2019-05-07 18:11:13 -04:00
farhatahmad 2e064de0a9 GRN2-xx: Fixed minor issues related to deletes (#506)
* Minor fixes to improve quality

* Changed styling on login button
2019-05-07 14:53:29 -04:00
farhatahmad 73f6ec846f Fixed recaptcha (#503) 2019-05-07 11:18:15 -04:00
farhatahmad 75f48f4979 GRN2-125: Added a configurable reCAPTCHA on sign up (#502)
* Added a configurable reCAPTCHA on sign up

* Added missing code
2019-05-07 09:21:04 -04:00
shawn-higgins1 f6dd3d34eb Add recording count to room delete (#501) 2019-05-07 09:07:16 -04:00
farhatahmad 91760d284b Added check to make sure user is signed in (#499) 2019-05-07 09:03:02 -04:00
Jesus Federico 9f74b0e2c0
Admin panel (#496)
* Added the administrator role and functionality that comes with it  (#403)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* Update user.rb

* Update admins.js

* GRN-15: Added the ability to change color and image from admin interface (#425)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* GRN-15: Added the ability for admins to customize color and image

* Update user.rb

* Update user.rb

* Update routes.rb

* Update admins_controller.rb

* GRN-87:Added a super admin role and made changes to how to the design works (#430)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* Update user.rb

* Update themes_controller_spec.rb

* Update routes.rb

* Update admins_controller.rb

* Removed duplicated code that broke the build after last merge

* GRN-78: Restructured some of the views to make the UI more consistent and responsive (#435)

* GRN-20: Added roles to the user model

* GRN-75: Added a view for admins to see their users

* GRN-77: Added Edit/Delete/Promote ability for admins

* GRN-71: Added admin account by default

* GRN-15: Added the ability for admins to customize color and image

* Added the super admin and completed the design tab

* GRN-78: Cleaned up buttons and moved signin to its own page

* GRN-78: Moved the Rooms and Recordings link to nav bar

* Merge fix

* Views restructure fix (#458)

* Added cache to gitlab-ci.yml

* Restructured seed

* GRN2-99 -> GRN2-106: UI cleanup and refactoring (#478)

* GRN2-98: Change Fullname to Full name

* GRN2-105: Changed View Users to Manage Users

* GRN2-101/103: Updated email to match branding

* GRN2-100: Updated Email Sent flash to be more descriptive

* GRN2-104: Redirect user to sign in page w/ flash after clicking activation link

* GRN2-102: Changed the wording in the verification email

* GRN2-99: Added email form validation

* GRN2-106: Cleaned up Users list front end

* Fixes to rake and admin password validator for passing rubocop

* GRN2-113: Fixed issues with admin panel (#479)

* GRN2-116: Code clean up after restructure of views (#482)

* Removed unused references

* Rubocop

* Added pagination to admin view (#483)

* GRN2-114: Added the ability for admins to ban/unban users (#487)

* Added the ability for admins to ban and unban users

* Update sessions_helper.rb

*  Merge branch 'master' into admin-panel  (#492)

* Updated rubocop gem

* Updated rubocop and fixed issues (#490)

* Rubocop fixes

* GRN2-122: Updated sign in flow for admins and switch design tab to site settings (#489)

* Switched design tab to site settings

* Update _header with spaces instead of tabs

* Added more test cases to increase coverage (#494)
2019-05-03 13:05:12 -04:00
farhatahmad a0c99dde47 Updated rubocop and fixed issues (#490) 2019-05-02 15:44:00 -04:00
farhatahmad 4896133d58 Added signup_url to list of urls not to redirect to (#481) 2019-05-01 16:53:47 -04:00
farhatahmad 57c49ca8f4 Fixed #486: Allow users to sign in if ALLOW_GREENLIGHT_ACCOUNTS=false (#480)
* Allow local users to sign in when sign up is turned off

* Update _header.html.erb
2019-05-01 16:29:53 -04:00
Rafael Baldasso Audibert 32bbc80415 Added Record type/format I18n (#471)
* 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

* Added I18n for recording types/formats
2019-04-22 09:17:37 -04:00
Jesus Federico 9b2424cde0
GRN2-112: Default language fallback fails with a 500 error (#469)
* GRN2-112: Default language fallback fails with a 500 error

* Updates for passing rspec tests

* Added cache for gitlab ci

* Updated cache for gitlab

* Restored Dockerfile

* Fixed glitch in filter for build and deployment
2019-04-17 15:33:38 -04:00
Jesus Federico c8a799bce8
HOT-FIX: Issue with changes with the language file name (#466)
* HOT-FIX: Issue with changes with the language file name

* Rubocop!
2019-04-16 17:08:17 -04:00
Jesus Federico 5ff41d0590
Allow multiple as host_url (#465) 2019-04-16 09:28:30 -04:00
farhatahmad 6bd5d81697 Fix issue with flash messages and activation link (#454) 2019-04-11 14:31:45 -04:00
farhatahmad a14007743f Users are redirected to the url they clicked login/signup from (#446) 2019-04-11 12:45:43 -04:00
farhatahmad d39a11059e Fixed #366: Changed how GreenLight handles LDAP jpegPhoto (GRN-92) (#445)
* Fixed issue with LDAP jpegPhoto

* Update _header.html.erb
2019-04-11 11:53:32 -04:00
Rafael Baldasso Audibert 822dd27509 Added mailer i18n (#436)
* Added mailer i18n

* Added translation to mailer in the JS

Also added a generic way to add JS translation through a javascript entry in the locale file

* Moved line-breaks from translations to JS file
2019-04-11 11:30:50 -04:00
farhatahmad 88776eaadb GRN-88: Fixed some things that Scrutinizer was complaining about (#433)
* Scrutinizer fixes

* Moved helper code to concern

* Another scrutinizer fix

* User controller conflict fix

* Another user controller fix

* Added include verifier
2019-04-11 10:25:49 -04:00
farhatahmad f6715b83ae Join meeting name is now stored in a session cookie (#432) 2019-04-10 17:06:19 -04:00
farhatahmad 4d648534f7 Fixed #398 Fixed issue with recording length and sort (GRN-83) (#426)
* Fixed issue with recording length and sort

* Made js run on any page with a table element on it

* Scrutinizer fix
2019-04-10 16:32:28 -04:00
Jesus Federico dd4629908c
GRN-93: Get rid of false positive exception in production logs (#450) 2019-04-10 15:10:55 -04:00
Jesus Federico a7d307aec1
GRN-93: Get rid of false positive exception in production logs (#449) 2019-04-10 13:55:34 -04:00
Jesus Federico 3dea09ee9b
GRN-94: Make sure reset-password also works on non-verified accounts (#448)
* Fix for issue with excesive requests to lb

* Fixed issue with rspec on users not passing when run alone

* Include dotenv in production

* GRN-94: Make sure reset-password also works on non-verified accounts
2019-04-10 10:56:01 -04:00
Jesus Federico 2b0301da38
GRN-93: Fix for issue with excesive requests to LB (#447)
* Fix for issue with excesive requests to lb

* Fixed issue with rspec on users not passing when run alone

* Include dotenv in production
2019-04-10 10:12:32 -04:00
Jesus Federico c07cfd0d93
GRN-80: Patch for fixing the added function in a production environment (#444)
* Patch for fixing the added function in a production environment

* Rubocop!
2019-04-09 11:22:55 -04:00
Jesus Federico b15868fb3c
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
2019-04-05 14:54:36 -04:00
Jesus Federico 5ba5b663ac
GRN-86: Change the way the locales are handled (#417)
* Changed the way locales are shown

* Updated the rest of the locales

* Changed the way available_locales are defined

* Updated locales in Russian

* Updated locaales for German
2019-03-28 11:02:36 -04:00
farhatahmad 5daa5bab45 Fixed issue with api_concern (#406) 2019-03-25 13:12:33 -04:00
farhatahmad c0b46be547 Added fix for multitenant error (#394)
* Added fix for multitenant error

* Fixed issue with room lock when using ldap

* Fixed test cases

* Fixed rubocop issue

* Included internal documentation for LDAP ENV variables
2019-03-13 15:56:57 -04:00
Jesus Federico 08f6f32779
Persist password (#393)
* never hold the owner of the room on the waiting screen

* persist room passwords so we can always call create meeting, even if it's already running, to avoid any inconsistency or race condition when joining a meeting

* Fixed issues in migration, room attribute updates, random_password and tests
2019-03-12 17:54:57 -04:00
farhatahmad 3195bb4429 GRN-59: Implemented pagination on the API call (#370)
* Added the env variable and functionality to paginate the call to the bbbapi

* Update user.rb
2019-03-12 13:50:20 -04:00
farhatahmad ab6655554c Added javascript needed to rename from all recordings (#390) 2019-03-05 17:04:14 -05:00
farhatahmad ef8fc2c0e4 GRN-69: Fixed javascript bug related to room validation (#388)
* Fixed javascript bug related to room validation

* More javascript bugs

* Removed room name length error

* Fixed issue with room post url
2019-03-05 15:07:14 -05:00
Jesus Federico 37af17fae1
Revert "Redirecting the user to the referrer on login success/fail (#374)" (#389)
This reverts commit 404134aa8d.
2019-03-05 14:45:42 -05:00
farhatahmad 79bb782319 Fixed issues with application js order and flash messages (#387) 2019-03-04 16:29:07 -05:00
farhatahmad 404134aa8d Redirecting the user to the referrer on login success/fail (#374) 2019-03-04 15:51:53 -05:00
farhatahmad 6f2eef7437 Updated application.js to call require jquery before tabler (#373) 2019-02-28 10:29:51 -05:00
farhatahmad 532c7bd2af Refactored flash messages code (#372) 2019-02-27 15:21:52 -05:00
farhatahmad c60e25f71c GRN-56: Correctly implemented the account verification flow (#367)
* Correctly implemented the account verification flow

* Fixed issues with redirect locations
2019-02-22 16:47:02 -05:00
farhatahmad 9c23c88735 Added a env variable to toggle visibilty of the customize tab in user settings (#369) 2019-02-15 12:15:29 -05:00
farhatahmad c38032ac20 Fixed styling on cookie warning (#368) 2019-02-15 12:07:10 -05:00
farhatahmad 0b90e130c6 Fixed issue with form post action url (#364) 2019-02-06 17:07:36 -05:00
farhatahmad d24e8fad14 Added the ability to choose which room settings are available using env variable (#363) 2019-02-06 16:13:53 -05:00