Commit Graph

20 Commits

Author SHA1 Message Date
Ahmad Farhat 09ab074aaf
Complete refactor of Gemfile and upgraded gems (#2553) 2021-02-26 17:34:07 -05:00
Toni Förster a27884733d
fixes #2082 proper link in mail (#2083)
* fixes #2082 proper link in mail

only send the promoted user a link to the admin page if their role 
allows them to.

* addressed review

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
2020-09-15 16:08:32 -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
shawn-higgins1 6d6ac3efdd Bug fixes for roles (#729) 2019-08-07 11:19:16 -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 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 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
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
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
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
John Ma 8fe66d81f1 Fixed #332 Allow users to reset their password (#335)
* <Added password reset system>

* <Added rspec tests>

* <Fixed code style>

* <Added rescue for invalid smtp configuration>
2018-12-21 11:56:52 -05:00
John Ma f94678627c Allow for specification of email sender (#311)
* <Allow for configuration of email sender>

* <Configure for localization>

* <Added a change in verify_mail>
2018-11-08 10:27:26 -05:00
John Ma 967c805836 Fixed #267 Email verification feature (#268)
* <Implemented basic welcome email upon signup>

* <Added config option to enable>

* <Added verification link routing>

* <Added views for verify/resend and reconfigured routes>

* <Finished Verification System minus Rspec changes>

* <Fixed code style>

* <Modified dome rspec tests>

* <Switched sample env back to default>

* <Added test cases to increase code coverage>

* <Added test_helper>

* <Minor code changes>

* <Added requested changes>

* <Added requested changes>

* <see if this fixes migration>

* <see if this fixes migration>

* <fixed migrations>

* Delete .rake_tasks~

* Update _confirm_button.html.erb

* Update _resend_button.html.erb

* Update verify_email.html.erb

* Update verify_email.text.erb

* <Fixed bugs>

* <Added validation of verification link and fixed some code style>

* <Disabled updating email for omniauth>
2018-10-09 14:22:02 -04:00
Joshua Arts 162c7a3085 add LGPL 3.0 headers 2018-08-01 09:45:12 -04:00
Josh ad5f218f23 adhere to rubocop guidelines 2018-06-26 10:29:46 -04:00
Josh 4037b6304e initial commit 2018-05-07 16:06:01 -04:00