Commit Graph

65 Commits

Author SHA1 Message Date
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
shawn-higgins1 6d6ac3efdd Bug fixes for roles (#729) 2019-08-07 11:19:16 -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 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
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 ee0a339e2b Fixed issue with image being replaced on every sign in (#687) 2019-07-24 09:14:56 -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
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 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 8c63f793a5 Reduce number of roles queries for the admin controller (#631) 2019-07-15 14:45:06 -04:00
shawn-higgins1 fc18976b6d GRN2-107: Add office365 auth (#616)
* add office365 auth

* Delete conflicting file
2019-07-09 13:54:15 -04:00
farhatahmad 996518eea7 Added filter for user role (#540) 2019-05-22 13:39:34 -04:00
farhatahmad c3ddb17514 GRN2-138: Fixed issue with admin rake task (#521)
* Fixed issue with admin rake task

* rspec
2019-05-17 12:49:42 -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
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
farhatahmad a0c99dde47 Updated rubocop and fixed issues (#490) 2019-05-02 15:44:00 -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
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 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
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 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
Jesus Federico 4d9d0ebb97
GRN-46: Scoped user email uniqueness validation (#342)
* Scoped user email uniqueness validation

* Scoped user email uniqueness validation

* Scoped user email uniqueness validation

* Extended User test for check email scope
2019-01-17 16:27:50 -05: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 ec250f3ed5 Fixed #291 Added OAuth2 for Office365 (GRN-32) (#293)
* <Added omniauth for office365>

* <Fixed code style>

* Update puma.rb

* <Inserted link to documentation>
2018-10-16 12:58:06 -04: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
John Ma dcd24d61be John fix issue#274 (#275)
* <fixed privacy policy errors>

* <Fixed code style>

* <Robustness changes>

* <redirect to 404 page if terms are disabled>

* <patched validation of accepted terms>

* <relaunching scrutinizer>
2018-10-02 10:23:09 -04:00
John Ma d83ec1a027 Fix #260 issues with privacy policy (#261)
* <fixed privacy policy workflow>

* <fixed privacy policy workflow>

* <changed rspec tests to handle new privacy flow>

* <changed rspec tests to handle new privacy flow>

* <deleted previous term validation due to changed workflow>

* <fixed code style>

* <reverted configuration settings>

* <Updated terms and conditions for existing users (not omniauth)>

* <Fix code style>

* <Fixed privacy policy for omniauth>

* <Fixed Travis C.I test>

* <Minor code changes>

* <Undo routes.rb change>

* <reconfigured routes.rb>
2018-09-14 14:33:58 -04:00
John Ma 4fb1a008ca Fixed #255
* <Fixed how uid was generated>

* <Fixed code style>

* <Removed unnecessary downcase call>
2018-09-12 17:03:01 -04:00
Joshua Arts 162c7a3085 add LGPL 3.0 headers 2018-08-01 09:45:12 -04:00
Joshua Arts 5e5f31c375 add option in settings to delete account 2018-07-27 11:36:28 -04:00
Joshua Arts 89b1afa470 fix missing locales and bump name/email max 2018-07-26 11:53:50 -04:00
Joshua Arts d6aee4d2d1 bump max name length to 32 characters 2018-07-24 11:05:25 -04:00
Joshua Arts 775285bba9 add ldap authentication 2018-07-20 14:20:14 -04:00
Joshua Arts a6b05f5fd3 fix gl accounts unable to update settings 2018-07-13 10:21:32 -04:00
bruckwubete 91644281c4 fixing rubocop errors 2018-07-10 15:05:50 -04:00
bruckwubete 0d2a5a4c90 small fixes 2018-07-09 16:00:10 -04:00
bruckwubete adeb844918 Merge branch 'bn_launcher_integration' of https://github.com/bigbluebutton/greenlight2 into bn_launcher_integration 2018-07-04 15:36:06 -04:00
Joshua Arts 8a9f2a3cc2 multiple fixes and tweaks 2018-07-04 15:22:59 -04:00
bruckwubete 3c11aca1aa able to handle launcher login with gem 2018-07-04 14:48:22 -04:00
bruckwubete e3e32365d0 able to handle launcher login 2018-06-29 10:07:06 -04:00
Josh ad5f218f23 adhere to rubocop guidelines 2018-06-26 10:29:46 -04:00
Josh 54adff3779 load Twitter image over https 2018-06-21 10:17:46 -04:00
Josh b2b2c641da add support for deploying to a subdirectory 2018-06-18 10:28:47 -04:00