merenber
/
greenlight
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,061 Commits 2 Branches 0 Tags 12 MiB
Commit Graph

505 Commits

Author SHA1 Message Date
farhatahmad 63b6bb7407 Added tests 2020-04-16 15:50:23 -04:00
farhatahmad 5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -04:00
Ahmad Farhat 5aa1868f63
Local account email is now downcased to match the downcased value stored in db (#1319) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 15:21:27 -04:00
Ahmad Farhat f4990b4523
GRN2-xx: Replaced bbb_id field with a better string generator (#1250) 
* Replaced bbb_id field with a better string generator

* Update room.rb

How about this instead @farhatahmad ?

* Update room.rb

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 15:06:56 -04:00
Lars Kiesow 10ef20363a
Additional LDAP Authentication Methods (#1287) 
This patch allows anonymous and user based authentication to LDAP
servers. This change is based on a patch against bn-ldap-authentication:

-  https://github.com/blindsidenetworks/bn-ldap-authentication/pull/2

The patch introduces a new environment variable `LDAP_AUTH` which
controls the authentication method used against the LDAP server:

- `anonymous` enables an anonymous bind to the LDAP with no password
  being used.

- `user` uses the user's own credentials to search for his data,
  enabling authenticated login to LDAP without the need for a user with
  global read privileges.

The default still remains at using a bind user, allowing for a seamless
upgrade path from the previous version.

This fixes #1082

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 14:10:14 -04:00
Ahmad Farhat 37decd9b43
Fixed role permissin check for update_recording and delete_recording (#1308) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 12:52:04 -04:00
Lars Kiesow 311806faa7
Color Configuration for Cookie Banner (#1302) 
* Color Configuration for Cookie Banner

Right now, the colors of the cookie banner are hard-coded which can
easily clash with the configured site colors in site settings.

This patch switches to using the configured colors instead.

* Update application.scss

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 12:46:46 -04:00
Ahmad Farhat 7738499978
Add check to make sure ldap username isn't blank (#1252) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 12:42:27 -04:00
Ahmad Farhat 2f41b02e72
Fixed server recordings 500 if user doesn't have an email (#1254) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 12:31:57 -04:00
Klaus e7e0c7624c
room block enhancements (#1203) 
* highlight current room block

* fix duplicated ids

* remove inline js

* remove some trailing whitespaces

* Fixed Server Rooms room settings name

Co-authored-by: farhatahmad <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 11:21:57 -04:00
Klaus 21cb768fc4
make help link configurable (#1161) 
* make help link configurable

* change default help url

* use default help url in setups without env var

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 10:56:34 -04:00
Klaus a06da481db
fix cookie banner height (#1202) 2020-04-16 10:45:16 -04:00
Ahmad Farhat 509215ae8d
Added fallback message if image url is invalid (#1149) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-01 17:26:16 -04:00
Ahmad Farhat 6dc0ffc5c1
Remove hardcoded role value (#1152) 2020-04-01 17:18:27 -04:00
Ahmad Farhat 348713d4df
GRN2-xx: Admin actions are now dictated by the correct role permission (#1140) 
* Admin actions are now dictated by the correct role permission

* Rspec fix

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-01 10:58:13 -04:00
Ahmad Farhat c72d77dbcb
Prevented LDAP sign in without password (#1092) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-01 10:45:45 -04:00
Ahmad Farhat fab3b479c9
Fixed issue with duplicate roles from LDAP sigin (#1090) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-01 10:43:27 -04:00
Ahmad Farhat a82526736b
Fixed issue with adding roles (#1051) 2020-03-20 14:07:39 -04:00
Ahmad Farhat 7fa7d2f525
Removed placeholder text for maintenance window (#1049) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-20 11:48:54 -04:00
Ahmad Farhat b23c1d11b3
Added log line when BigBlueButton exception occurs (#1048) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-20 11:40:13 -04:00
Ahmad Farhat 03cdbd6b69
Fixed bugs in administrator panel (#1047) 2020-03-20 11:18:05 -04:00
etiennevvv 4cc45ab017
Fixed issue with users not being muted on join (#1027) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-20 11:10:31 -04:00
etiennevvv 73061bdba9
GRN2-284: Fixed bug where admin rights emails was sent multiple times (#996) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-19 11:17:33 -04:00
etiennevvv 84fb615005
GRN2-283: Fixed bug where users can't join a shared room (Fixed #989) (#995) 
* GRN2-283: Fixed bug where users can't join a shared room

* GRN2-283: Fixed bug where users can't join a shared room

* GRN2-283: Fixed bug where users can't join a shared room

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
 2020-03-18 15:19:16 -04:00
Ahmad Farhat 43911b9fd5
Fixed order of rooms in postgres (#979) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-04 09:50:06 -05:00
Ahmad Farhat 037e4f1c43
Scoped reset password to provider (#978) 2020-03-03 14:43:10 -05:00
etiennevvv edcda54f89
GRN2-268: Fixed redirection after executing an action in Manage Users (#967) 
* GRN2-268: Fixed redirection after executing an action in Manage Users

* GRN2-268: rubocop fix
 2020-02-28 11:32:32 -05:00
Ahmad Farhat 50f4d5e4f8
Small fixes to shared access (#966) 2020-02-28 10:13:51 -05:00
Ahmad Farhat 2c1472daff
Admins can no longer delete a users home room (#965) 2020-02-25 09:53:08 -05:00
Ahmad Farhat 54234ef54b
Admins that are not signed in are redirected to the signin page when doing admin actions (#964) 2020-02-24 17:30:39 -05:00
Ahmad Farhat 475374090a
Fixed issue with rooms not correctly ordering (#963) 2020-02-24 16:48:51 -05:00
etiennevvv 03266730e8
GRN2-233: Made account activation & password reset links based on tokens only (#959) 
* GRN2-233: Hiding email in verification link and password reset link

* updating tests

* removing uid from email verificaiton link

* GRN2-233: modifying test cases

* GRN2-233: Removing uid from password reset link

* GRN2-233: Removed email_params and fixed "authenticated?" method

* GRN2-233: Fixed error when trying to sign in unverified

* GRN2-233: Changed how activation tokens are generated
 2020-02-24 13:05:09 -05:00
etiennevvv b7aa5406ea
GRN2-273: Fixed bug where incorrect recording length returned when "Notes" format was included (#961) 
* GRN2-273: Fixed bug where incorrect recording length returned

* GRN2-273: Changing iteration variable name   in recording_length method
 2020-02-24 12:58:28 -05:00
Ahmad Farhat 4093a89b4a
Added dropdown for dynamically changing the log level (#962) 2020-02-24 12:51:27 -05:00
Ahmad Farhat 2cc1fdf281
Refactored code to reduce number of database queries (#960) 2020-02-24 12:31:30 -05:00
etiennevvv 92da1f6f87
GRN2-269: Pulling room settings using GET instead of data-attributes (#953) 
* GRN2-269: Pulling room settings using GET instead of data-attributes

* GRN2-269: added test case and fixed documentation

* GRN2:269: rubocop fix

* GRN2-269: Fixed test case
 2020-02-21 09:20:22 -05:00
Ahmad Farhat c75c624a1a
GRN2-xx: Made role priority unique scoped to provider (#942) 
* Made role priority unique scoped to provider

* Fixed issues related to update_role after making role priority unique
 2020-02-19 13:38:16 -05:00
Ahmad Farhat 005c738e4d
GRN2-260: Added the ability to merge user accounts (#938) 
* Added the ability to merge user accounts

* Styling fixes
 2020-02-14 10:24:06 -05:00
Ahmad Farhat 31258272c2
GRN2-265: No longer throws 500 if provider not included (#944) 
* No longer throws 500 if provider not included

* Rubocop fix
 2020-02-14 10:03:16 -05:00
etiennevvv 3641f1b953
GRN2-270: Hiding delete button in room dropdown for Home Room (#956) 2020-02-14 09:47:17 -05:00
etiennevvv 9fa79bcc16
GRN2-271: Removing redirection to "#" in invite participants copy button (#957) 2020-02-14 09:47:02 -05:00
etiennevvv b67bee2638 GRN2-264: Allow users to change the room settings on Home Room (#951) 
* GRN2-264: Allow users to change the room settings on Home Room

* fixing inconsistencies

* removing 'secondary_rooms' method and adjusting looping
 2020-02-12 17:49:35 -05:00
etiennevvv 01c93b1f67 GRN2-268: Redirecting user back to page they came from in Manage Users (#950) 
* GRN2-268: Redirecting user back to page they come from in Manage Users

* re-factoring
 2020-02-12 17:49:35 -05:00
etiennevvv 68b231dbdb GRN2-266: Autofocus room name when create room modal appears (#945) 
* added autofocus to the Room Name field

* added autofocus to Room Name text field

* added autofocus to Room Name text field

* GRN2-266 Fixing autofocus for Room name when creating room

* removing whitespace

* fixing whitespace

* fixing whitespace
 2020-02-12 17:49:35 -05:00
etiennevvv eb8cc9b17f GRN2-267 Redirect admin link when approving a new user to the "pending" tab (#947) 
* GRN2-267 redirect admin to 'pending' tab when approving a new user

* changes after robocop failed

* robocop changes
 2020-02-12 17:49:35 -05:00
Ahmad Farhat d6b7e975b0 Final fix for vendor assets (#940) 2020-02-12 17:49:35 -05:00
Ahmad Farhat e15e119d5d Included missing assets and fixed room delete 404 (#939) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 5949a6e243 GRN2-xx: Removed unnecessary log lines (#930) 
* Removed unnecessary log lines

* Removed empty function
 2020-02-12 17:49:35 -05:00
Ahmad Farhat 397b4b742f GRN2-128: Fixed issue with manage rooms permissions (#929) 
* Fixed issue with manage rooms permissions

* Improved server rooms efficiency
 2020-02-12 17:49:35 -05:00
Ahmad Farhat 967130e57c GRN2-253: Added the ability to share rooms across multiple users (#912) 
* Added ability to share rooms with other users

* Fixed testcases
 2020-02-12 17:49:35 -05:00
Ahmad Farhat 8cbfc3f730 GRN2-xx: Users can no longer join a room whose owner is banned or pending (Fixed #902) (#922) 
* Users can no longer join a room whose owner is banned or pending

* Changed flash message

* rubocop fix
 2020-02-12 17:49:35 -05:00
Ahmad Farhat df1705d9ea Join button now expands to fit text (#921) 2020-02-12 17:49:35 -05:00
Ahmad Farhat eb965e5c52 Added data-disable to all button_to to fix double click issue (#923) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 8a8eee52fe Fixed issue with ldap images (#926) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 005ec84c73 GRN2-252: Change to how sign ins are processed (#869) 
* Social to local

* Social/Local to Social

* Rubocop fixes

* Added test cases

* Added the ability to clear social uids

* Update admins_controller.rb

* Update admins_controller.rb
 2020-02-12 17:49:35 -05:00
Ahmad Farhat 734f7a757e GRN2-241: Switched Docker base image to Alpine (#853) 
* Switched to alpine image

* Switch Docker base image to alpine

* Removed uneeded code

* Slimmed it down even further
 2020-02-12 17:49:35 -05:00
Ahmad Farhat c13a83a3f3 Fixed issues with rubocop (#916) 2020-02-12 17:49:35 -05:00
Ahmad Farhat 09de6b6739 GRN2-128: Added the ability to manage rooms (#848) 
* Added the ability to manage rooms

* Small fixes

* Fixed travis complaints

* Fixed issues with role permissions

* Fixed issue with delete room

* Fixed rubocop and added testcases
 2020-02-12 17:49:35 -05:00
Ahmad Farhat 984e5cc085 Fixed 500 caused by 1 provider (#937) 2020-01-28 11:34:46 -05:00
Ahmad Farhat 079d64795b Redirect authenticated users to main room when accessing ldap signin (#856) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-22 16:32:26 -05:00
Ahmad Farhat ebff9d3625 GRN2-xx: Fixed issue with rooms not being ordered correctly (#897) 
* Fixed issue with rooms not being ordered correctly

* removed home room from list

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-08 10:34:01 -05:00
Ahmad Farhat 8a4118a9c1 Added back cache clear function (#867) 2019-11-28 17:36:49 +01:00
Ahmad Farhat d35a554199 Fixed small issue with sign in to prevent error pages from appearing (#868) 2019-11-15 10:49:52 -05:00
farhatahmad 2b9ab05e1e Fixed signin bug 2019-11-14 11:59:37 -05:00
Ahmad Farhat da80fb55c7 Errors with recordings no longer cause the page to 500 (#849) 2019-11-01 14:37:38 -04:00
Ahmad Farhat e61946a0f4 GRN2-132: Fixed visual issues with mobile (Fixed #325) (#844) 
* Fixed visual issues with mobile

* Fixed spacing above room name
 2019-11-01 11:51:22 -04:00
Ahmad Farhat 933408f68b GRN2-xx: Removed Health Check Gem (#840) 
* Initial work on removing health check gem

* Added health checks

* Fixed gemfile
 2019-10-21 12:09:31 -04:00
Ahmad Farhat 9c9867b4e7 GRN2-xx: Fixed scaling issue on mobile (#843) 
* Disabled browser auto zoom

* Fixed spacing

* Removed unnecessary file
 2019-10-18 14:53:13 -04:00
Ahmad Farhat 628790733e GRN2-xx: Replaced language files with the updated versions (Fixed #813) (#814) 
* Updated language files

* Added fix for javascript languages
 2019-10-11 08:53:40 -04:00
Ahmad Farhat c1de7f8f70 GRN2-xx: Replaced google fonts api call with local font load (Fixed #830) (#831) 
* Replaced google fonts api call with local font load

* Removed references to Roboto
 2019-10-10 16:28:46 -04:00
Ahmad Farhat b9dcaa1b18 Fixed issue with return to cookie (#828) 2019-10-10 16:24:35 -04:00
Ahmad Farhat 49def8f405 GRN2-247: Added Active Pending Banned Deleted tabs to manage users (#816) 
* Added Active Pending Banned Deleted tabs to manage users

* Removed hard coded strings

* Fixed issues with sign in flow

* Fixed issues with rooms not deleting
 2019-10-10 16:10:23 -04:00
Ahmad Farhat 3f5affd116 Only render 1 delete room modal (#819) 2019-10-10 15:45:42 -04:00
Ahmad Farhat e0a4d485bf Added Open Graph attributes to layout (#815) 2019-10-10 15:29:02 -04:00
Ahmad Farhat c14f4dc31c Fixed issue with migration running on empty db (#812) 2019-10-10 15:17:52 -04:00
Ahmad Farhat 4a791ae0b5 Email recording now translates correctly (#809) 2019-10-10 15:08:55 -04:00
Ahmad Farhat 091b548e90 Fixed issue with Room Settings (#807) 2019-09-20 15:33:08 -04:00
Ahmad Farhat 6d29422c31 Default to EN if language is not recognized (#805) 2019-09-20 09:02:55 -04:00
Ahmad Farhat e13e762349 GRN2-243: Added a report issue button to the 500 error page (#796) 
* Added a report issue button to the 500 error page

* Removed unused code

* Removed unused quotes
 2019-09-19 10:03:44 -04:00
Ahmad Farhat 7c6ad6d903 Improve code quality to increase scrut score (#789) 2019-09-19 10:03:44 -04:00
Ahmad Farhat 55d4a21dcb Fixes after merge (#786) 2019-09-19 10:03:44 -04:00
Ahmad Farhat 666ee12988 GRN2-xx: Cleaning up bugs that appeared after refactoring (#780) 
* First step

* Fixed issues with update room
 2019-09-19 10:03:44 -04:00
farhatahmad d3b669d552 GRN2-xx: Users, Room and Recordings are now no longer permanently deleted (#773) 
* Bug fixes for 2.4

* Removed accidental code add

* Switched from deleting to tombstoning

* Fixed bug with login
 2019-09-19 10:03:44 -04:00
shawn-higgins1 666231db6c Change permissions from columns to table entries (#762) 2019-09-19 10:03:44 -04:00
farhatahmad 01b8dbbd0e GRN2-196: Fixed issues that scrutinizer is complaining about (#765) 
* Refactored code to improve scrutinizer score

* Bug fixes
 2019-09-19 10:03:44 -04:00
farhatahmad fd6077696d GRN2-180: First stages of refactoring code for v2.4 (#748) 
* Email rescues and authenticator concern

* Application controller and helper clean up

* Moved controller code out of helpers

* More helper and email clean up

* Cleaned up remaining helpers and create omniauth_options

* Controller code clean up

* restructured views structure

* Restructured role code

* Restructured profile and code clean up

* Master merge

* Added bbb server concern to deal with bbb calls

* Bug fixes and changes after changes

* rspec

* More rubocop fixes
 2019-09-19 10:03:44 -04:00
Ahmad Farhat b590a5a264 GRN2-xx: Added fallback language to locales (#788) 
* Added fallback language to locales

* Added comments
 2019-09-06 14:28:47 -04:00
Ahmad Farhat 390ccf71c2 Localized js is now served as json (#784) 2019-09-06 10:56:53 -04:00
Ahmad Farhat 061b69f962 GRN2-xx: Fixed issue with room join (#779) 
* Fixed issue with room join

* Rspec fix
 2019-09-05 15:50:19 -04:00
Ahmad Farhat 201a394813 Added the ability to invite multiple users at once (#778) 2019-09-05 12:55:23 -04:00
Ahmad Farhat 843d42a1d8 Allowed room access text to be translated (#777) 2019-08-30 16:25:43 -04:00
farhatahmad 02413cefb2 GRN2-xx: Migration Error now returns 500 and added the option to disable cache (#776) 
* Added the option to disable cache

* Remove put statements
 2019-08-30 11:57:11 -04:00
jfederico 459d0ed582 Reverted 500 error on migration failed 2019-08-29 14:03:07 +00:00
farhatahmad 9bd5a659d5 GRN2-xx: Migration Error now returns 500 and added the option to disable cache (#770) 
* Added the option to disable cache

* Remove put statements
 2019-08-28 17:00:07 -04:00
farhatahmad 9ddc057589 Added a Maintenance Window flash (#758) 2019-08-22 12:15:01 -04:00
farhatahmad 177bf4d595 Cached request to provider to increase application performance (#755) 2019-08-21 14:45:22 -04:00
shawn-higgins1 3d2a0a060b GRN2-225, GRN2-227: Images sent by Office365 Institutional accounts break the rooms (#753) 
* Validate profile image url

* Add rake task to migrate old office365 accounts
 2019-08-21 14:23:00 -04:00
farhatahmad 96ace3265e Added Google Analytics (#749) 2019-08-19 08:51:57 -04:00
farhatahmad ea8acaff4c Added extra check for reset password (#745) 2019-08-15 13:20:55 -04:00
shawn-higgins1 de81223413 Display launcher errors in Greenlight (#742) 2019-08-15 10:17:32 -04:00
farhatahmad 4d14c5fc23 Asset fixes (#740) 2019-08-14 17:05:14 -04:00
farhatahmad 89f36c1766 GRN2-224: Added event logs and production caching (#739) 
* Added event logs and production caching

* Added Support: before logs for easy identification

* Added more Support for log errors

* Reverted change to assets precompile check

* Added vendor assets to precompile list

* Travis fix
 2019-08-14 14:25:52 -04:00
farhatahmad 7e3c44575e Added the ability for admins to send a reset password email for users (#737) 2019-08-14 10:21:57 -04:00
farhatahmad 853e712a43 Refactored code related to all recordings pagination (#736) 2019-08-14 10:04:23 -04:00
farhatahmad 98405c7d86 GRN2-xx: General bug fixes and performance upgrades (#734) 
* General bug fixes and performance upgrades

* Removed unused lines
 2019-08-14 09:59:34 -04:00
Jesus Federico 4d69d06ba1
GRN2-ZZZ: Added messages for debugging actioncable (#731) 
* GRN2-ZZZ: Added messages for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* Log unsubscribe
 2019-08-09 12:07:38 -04:00
shawn-higgins1 6d6ac3efdd Bug fixes for roles (#729) 2019-08-07 11:19:16 -04:00
farhatahmad a5fd4a08b5 GRN2-xx: Fixed issue with room settings not showing updated values (#727) 
* Fixed issue with room settings not showing updated values

* Updated rake task to take provider
 2019-08-06 14:03:12 -04:00
farhatahmad 7bafd41a56 Fixed issue with invalid csrf token (#724) 2019-08-02 16:11:45 -04:00
shawn-higgins1 46e0595e3a Improve can't create room view (#723) 
* Improve cant create room view

* Translate role names in the promoted/demoted emails
 2019-08-02 16:07:15 -04:00
shawn-higgins1 e1fdc8f58b Roles editor bug fix (#721) 
* Allow users with just the manage users permission to edit roles

* Allow users with just the manage users permission to edit roles

* Fix update recordings bug
 2019-08-01 16:53:55 -04:00
farhatahmad 60f5cd5c81 GRN2-xx: Fixed issue with recording row and added small fix to roles migration (Fixed #717, #718) (#719) 
* Fixed issue with recording row and added small fix to roles migration

* Fixed issue with edit user avatar

* Small bug fixes for user settings

* Added autofocus on name field when joining

* Added extra check for admin password check

* Rubocop fixes
 2019-08-01 16:53:26 -04:00
shawn-higgins1 4fc1714db8 GRN2-176: Create a role editor that allows admins to specify what permissions each role has (#709) 
* Add roles editor

* Add colour selection ability to roles

* Add ability to assign roles to users in the UI

* Remove rolify and replace it with our own custom roles implemenation

* - Fix all existing roles functionality
- Fix super admins

* Fix bugs with new customers not have default roles

* Add can't create room setting

* Code improvements

* Fix migration

* Add tests for new methods

* Translate reserved role names

* Pull roles from saml/ldap

* Fix rspec

* Fix scrutinizer issues

* Fix email promoted/demoted tests

* Apply comments

* Redirect directly to the main room

* Add comments
 2019-07-31 11:53:32 -04:00
farhatahmad 02b342b157 GRN2-217: Fixes issues with recording rows and localization (fixed #703-#705) (#707) 
* Fixes issues with recording rows

* Fixed small typo related to logs
 2019-07-31 11:45:15 -04:00
farhatahmad e0afcdec23 GRN2-xx: Added back fix for ldap image and fixed issue with ldap redirect (Fixed #712) (#711) 
* Added back fix for ldap image

* Fixed issue with ldap redirect
 2019-07-31 11:35:43 -04:00
farhatahmad 973c95339c Added All Join as Moderator room setting (#696) 2019-07-31 11:34:31 -04:00
farhatahmad 5f237194b1 GRN2-xx: General bug fixes and improvements for 2.3 (#701) 
* General bug fixes and improvements for 2.3

* Removed mins change

* Removed mins change rspec
 2019-07-31 11:33:29 -04:00
farhatahmad 58201d5763 Email recording now includes all urls (#697) 2019-07-31 11:33:06 -04:00
jfederico 2775b18993 Merge branch 'v2' 2019-07-29 14:30:30 +00:00
farhatahmad 403a7c4e40 GRN2-xx: Removed readonly maintenance mode (#699) 
* Removed readonly maintenance mode

* Removed full reference
 2019-07-29 10:23:18 -04:00
farhatahmad c472f751a1 GRN2-xx: Switched to Lograge for logging and increased log level to info (#694) 
* Switched to Lograge for logging and increased log level to info

* Travis fixes

* Travis fixes 2
 2019-07-25 15:07:55 -04:00
farhatahmad a080d3dd62 Fixed delete user modal in Manage Users (#693) 2019-07-25 10:27:29 -04:00
farhatahmad 453e6b7c96 Updated strings and added a bit of styling (#692) 2019-07-24 13:42:46 -04:00
shawn-higgins1 79188a6cae Add support for roles (#656) 
* Add support for ldap roles

* Remove debugger

* Remove bundled with

* Update omniauth-bn-launcher version
 2019-07-24 13:40:09 -04:00
shawn-higgins1 0934919e44 GRN2-206: Remove support for the flash client Fixes(#654) (#661) 
* Remove ability to specify flash client

* Always join via html5

* Fix styling and tests
 2019-07-24 09:37:59 -04:00
farhatahmad ee0a339e2b Fixed issue with image being replaced on every sign in (#687) 2019-07-24 09:14:56 -04:00
shawn-higgins1 7b96d5ae41 Add room setting to require moderator approval (#660) 2019-07-23 16:16:14 -04:00
Jesus Federico f7c88cfc6a
Merge branch 'v2.2.1-alpha' into master 2019-07-23 15:57:08 -04:00
shawn-higgins1 81aea827ba GRN2-210: Add ability to search by role (#659) 
* Add ability to search by role

* Fix role search to work with select
 2019-07-23 14:57:01 -04:00
shawn-higgins1 68eb67752c Widen invite url field (#651) 2019-07-23 14:56:21 -04:00
shawn-higgins1 d3a9ae32a9 GRN2-202: Create a room in which everyone joins as Moderator (Fixed #628) (#650) 
* Room setting to allow anyone to start a room

* Update sample.env

* merge v2.2.1
 2019-07-23 14:54:46 -04:00
shawn-higgins1 b23f94dfb5 Single sign on for super admins (#648) 2019-07-23 14:53:48 -04:00
farhatahmad 0b64acaecf Fixed issues with maintenance mode (#683) 2019-07-23 13:52:39 -04:00
shawn-higgins1 42f7d4f8d2 If a user only has one configured provider redirect them to that provider (#647) 2019-07-23 11:08:38 -04:00
farhatahmad d1e50f2ef6 GRN2-213: Cleaned up omniauth user create (#682) 
* Fixed omniauth user create

* Added readonly exception
 2019-07-23 11:02:25 -04:00
farhatahmad 4e16e99758 Allowed users to start rooms if database is in readonly (#680) 
* Allowed users to start rooms if database is in readonly

* Travis fix
 2019-07-22 17:02:49 -04:00
farhatahmad 02c0d577f8 Added an env variable that allows maitenance mode (#679) 2019-07-22 16:45:56 -04:00
shawn-higgins1 0e4adc0049 Add watchtower metadata (#635) 2019-07-22 16:28:09 -04:00
shawn-higgins1 1e75f5e822 Don't sent email if there are no admins (#664) 2019-07-22 15:58:40 -04:00
shawn-higgins1 c4eeee3d40 Add setting for recording visibility (#634) 2019-07-22 15:39:49 -04:00
farhatahmad 8b2c472536 GRN2-211: Added a maintenance mode (#675) 
* Added a maintenance mode

* Cleaned up dockerignore file

* Added branding to maintenance page

* Fixed branding
 2019-07-22 15:25:43 -04:00
shawn-higgins1 7d1c9e87a9 Allow rooms to have an optional access code (#646) 2019-07-22 13:12:44 -04:00
farhatahmad a055b88eb7 GRN2-129: Added server recordings and refactored adminsitrator panel (#662) 
* Added server recordings and refactored adminsitrator panel

* Fixed some issues

* Fixed issue with owner email search

* Fixed issue with edit user
 2019-07-22 12:46:47 -04:00
shawn-higgins1 ee26036105 Unify error pages (#674) 
* Unify error pages

* Start travis
 2019-07-22 12:33:53 -04:00
farhatahmad 56be3a5b13 Removed left over testing code 2019-07-17 14:08:30 -04:00
farhatahmad 347ed2bdc1 Fixed issue with https redirect 2019-07-17 14:05:28 -04:00
shawn-higgins1 8c63f793a5 Reduce number of roles queries for the admin controller (#631) 2019-07-15 14:45:06 -04:00
farhatahmad 5a3ad3159c
GRN2-45, GRN2-197: Upgrade Rails to 5.2.3 and removed sass-rails gem (#636) 
* Removed deprecate sass-rails and replace with sassc-rails

* Upgraded to Rails 5.2.3

* Fixed travis

* Added back Spring code

* Fixed travis again
 2019-07-15 10:13:41 -04:00
shawn-higgins1 c410c0b8ef Change default recording sort order to descending (#630) 2019-07-12 16:34:47 -04:00
shawn-higgins1 85da83f8b0 Fix office365 if hd environment variable isn't set (#629) 2019-07-11 11:14:43 -04:00