lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity
816 Commits 7 Branches 0 Tags
28302107bd10525860e2124c0b567b59cb8b2ecd
Commit Graph

42 Commits

Author SHA1 Message Date
Ahmad Farhat
28302107bd GRN2-xx: Restructured email verification and password reset (#1444) 
* Restructured email verification and password reset

* Fixed issue with password reset

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-29 17:56:46 -04:00
Ahmad Farhat
c81c6ab417 Update joiner.rb 2020-04-28 13:31:27 -04:00
Ahmad Farhat
44bd2315b2 Merge branch 'master' into room-settings 2020-04-28 13:12:20 -04:00
jfederico
aeaa1e7d45 Merge branch 'v2' 2020-04-22 23:40:28 -04:00
Ahmad Farhat
855694c716 Store a random user id for unauthenticated users as a cookie (#1364) 2020-04-22 09:46:21 -04:00
farhatahmad
5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -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
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
a82526736b Fixed issue with adding roles (#1051) 2020-03-20 14:07:39 -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
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
Ahmad Farhat
2cc1fdf281 Refactored code to reduce number of database queries (#960) 2020-02-24 12:31:30 -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
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
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
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
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
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
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
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
farhatahmad
853e712a43 Refactored code related to all recordings pagination (#736) 2019-08-14 10:04:23 -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
shawn-higgins1
1e75f5e822 Don't sent email if there are no admins (#664) 2019-07-22 15:58:40 -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
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
farhatahmad
3e0238eb0c Replaced checkbox with dropdown (#552) 2019-05-23 13:21:43 -04:00
farhatahmad
de1e75fbf8 Added check to emailer concern (#550) 2019-05-23 12:22:34 -04:00
shawn-higgins1
eac8290001 GRN2-148: Always check that email notifications are enabled before sending an email (#539) 
* Always check that email notificatiosn are enabled before sending an email

* Fix tests

* Fix formating

* Change to hardcoding the validation
 2019-05-22 13:38:34 -04:00
shawn-higgins1
f88d67f6fb GRN2-6: Notify admins when a approve/invite user signs up (#538) 
* Notify admins when a approve/invite user signs up

* Fix formating

* Uses admins_url variable
 2019-05-22 13:38:00 -04:00
shawn-higgins1
83a9edf81d GRN2-140: Added Email to inform user they've been promoted (#534) 
* Added Email to inform user they've been promoted

* Update user_mailer.rb

* Send email when a user is demoted

* Change more-info string
 2019-05-22 13:36:33 -04:00
farhatahmad
9638ebcbc5 GRN2-134: Added Color Input for lighten and darken (#529) 
* Added Color Input for lighten and darken

* rspec
 2019-05-22 13:34:37 -04:00
shawn-higgins1
0360c78219 Revert "Notify admins when a approval/invite user signs up" 
This reverts commit 251d85d88a.
 2019-05-21 14:37:27 -04:00
shawn-higgins1
251d85d88a Notify admins when a approval/invite user signs up 2019-05-21 14:25:28 -04:00
farhatahmad
720dac6012 GRN2-6: Added the ability for admins to specify registration method (#520) 
* Added the ability to invite users

* Small bug fix

* Added the ability to approve/decline users

* Small bug fixes

* More bug fixes

* More minor changes

* Final changes
 2019-05-17 16:26:49 -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
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
Josh
4037b6304e initial commit 2018-05-07 16:06:01 -04:00