Commit Graph

160 Commits

Author SHA1 Message Date
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
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
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 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
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
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
farhatahmad 6bd5d81697 Fix issue with flash messages and activation link (#454) 2019-04-11 14:31:45 -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
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 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
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 404134aa8d Redirecting the user to the referrer on login success/fail (#374) 2019-03-04 15:51:53 -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 9883616f9c Fixed issue with visibility redirected and changed the 'no recordings' string for the recordings page (#361) 2019-02-06 12:02:53 -05:00
farhatahmad 2e8670a8ab GRN-11: Ability to configure room specific settings (#348)
* Added the ability to set room settings on create or update

* Added room settings alerts and made fixes to other alerts

* Small bug fixes related to rubocop and the create room modal

* Update test case and fixed issue with small edge case

* Update room.js
2019-02-06 11:08:18 -05:00
farhatahmad 8ff05643dc Added a Recordings page where the user can see all recordings (#352) 2019-02-04 11:21:42 -05:00
farhatahmad c73064a70a GRN-45: Fixed the URL being sent in the password reset email (#351)
* Fixed the url used in the reset password emails and added the ability to preview emails in the dev environment

* Replaced localhost with example.com in email previews

* Update password_reset.html.erb
2019-02-01 15:00:10 -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 b3f37cd3b3 Fixed #323 Allow users to select a language in settings (GRN-17) (#324)
* <Added ui for language setting and migration>

* <Option to choose languages added>

* <Fixed code style>

* <Added Rspec tests>

* <sync db>

* <Sync db>

* <Generalized language settings>

* <Fixed flash message>

* Fixed las issue with i18n fallback

* <Modified fallback config>

* <Fixed code style>
2018-12-06 16:00:22 -05:00
John Ma 895af7494e Fixed #280 Search/Paginate recordings (GRN-12) (#281)
* <Added Pagination>

* <Created search bar in Room>

* <Fixed search bar UI>

* <Fixed searching>

* <Modified search>

* <Fixed code style>

* <fixed changes>

* <Added pagination and search for public recordings>

* <added rspec tests>

* <Added and Updated search.js>

* <Fixed live searching for current user room>

* <Fixed live searching for current user room>

* <Added live search for join>

* <Fixed errors>

* <fixed gemfile>

* <Fix gems>

* <>

* <Fixed rspec tests>

* <Removed commented code>

* Update search.js
2018-12-06 10:24:22 -05:00
John Ma 41a543f6b8 Fixed #303 Add the ability to rename rooms and recordings (GRN-18) (#304)
* <Added modal for rename>

* <Commit changes and switch branch>

* <Javascript Scaffolding for rename room feature>

* <Created room_block.js>

* <update changes>

* <Updating rename branch>

* <Update rename.js>

* <Update branch>

* <Update branch>

* <Implemented renaming of room blocks>

* <Refactoring code>

* Remove modal due to new design

* <Finished renaming of rooms>

* <Updated renaming of recordings>

* <updating branch>

* <added renaming of recordings>

* <update branch>

* <>

* <Fixed code style>

* <Fixed rspec tests>

* Update application.js
2018-12-04 10:48:51 -05:00
John Ma de98fd0a3c Display notification that max concurrent sessions has been reached (GRN-41) (#317)
* <Added max concurrent sessions check>

* <Refactored some exception logic>

* <Fixed code style>

* <Generalized BBBException error message>
2018-11-15 14:20:46 -05:00
John Ma b8785a3bf8 Fixed loading of error pages (#310)
* <Fixed loading of error pages>

* <Remove not_found from application folder>
2018-10-23 13:10:54 -04:00
John Ma 1bb5be68a5 Fix for email verification issue (GRN-36) (#300)
* <incorrect smtp settings no longer crashes the application>

* <Added rspec tests>

* <>

* Delete env

* Update development.rb
2018-10-17 11:42:50 -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 5c281a1a3f Fixes #278 (#282)
* <Fixed the main ui glitch>

* <Fixed issue>

* <Fixed code style>

* <Some more code style fixes>

* Update sessions_helper.rb
2018-10-03 11:42:14 -04:00
John Ma f0f0638be3 500 internal server error (fixes #277) (#279)
* <Fixed bug>

* <Fixed some errors>

* <fixed rspec tests>

* <Made requested changes>

* Delete search.js
2018-10-02 17:48:01 -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
Joshua Arts 81d460f1c2 fix before_filter deprecation warning 2018-08-21 14:54:52 -04:00
Joshua Arts a6fc8f0f2f fix stats format being removed 2018-08-20 14:53:14 -04:00
Joshua Arts 0cf5baddb2 add option to disable recording thumbnails 2018-08-17 16:31:16 -04:00
Joshua Arts f58d76c5ef prevent from grabbing length from stats format 2018-08-16 14:30:49 -04:00
bruckwubete 0d252add03 linting 2018-08-15 11:49:13 -04:00
bruckwubete 66ff9c7a2f fix force ssl logic for lb configuration 2018-08-15 11:45:37 -04:00
Joshua Arts 162c7a3085 add LGPL 3.0 headers 2018-08-01 09:45:12 -04:00
Joshua Arts c7fbaa3f80 fix recordings lengths 2018-07-30 11:48:11 -04:00
Joshua Arts 5e5f31c375 add option in settings to delete account 2018-07-27 11:36:28 -04:00
Joshua Arts fd2dc3abec fix bug with single thumbnails erroring 2018-07-25 16:16:25 -04:00
Joshua Arts d6aee4d2d1 bump max name length to 32 characters 2018-07-24 11:05:25 -04:00
Joshua Arts 00a3deec29 explicitly call #omniauth_fail 2018-07-23 12:07:26 -04:00
Joshua Arts 40cb48a10a remove unneeded redirect 2018-07-20 17:09:03 -04:00
Joshua Arts 775285bba9 add ldap authentication 2018-07-20 14:20:14 -04:00
Joshua Arts c5cfc621ca localize controllers 2018-07-19 16:04:08 -04:00
Joshua Arts 55b83226c9 detect users preferred language 2018-07-13 11:04:32 -04:00
Joshua Arts a6b05f5fd3 fix gl accounts unable to update settings 2018-07-13 10:21:32 -04:00
Joshua Arts 1412b39620 skip cleanup and minor fixes 2018-07-11 10:23:16 -04:00
Joshua Arts e2ad6e7715 make upgrading from 1.0 easier 2018-07-05 17:25:59 -04:00
Joshua Arts 21e0a3558d add delete confirmation modal 2018-07-04 15:20:12 -04:00
Joshua Arts dcf199c0aa fix chat join message 2018-07-03 13:11:39 -04:00
Joshua Arts efcc312e9e remove ability to change home room 2018-07-03 11:57:45 -04:00
Joshua Arts efbf42f698 remove unused launch route 2018-06-29 16:18:00 -04:00
Joshua Arts 1acf901c68 finish controller tests 2018-06-28 16:55:56 -04:00
Joshua Arts 63cdbdc874 Merge branch master into tests 2018-06-28 11:29:30 -04:00
Joshua Arts c802e4806a fix waiting to join retry logic 2018-06-28 10:39:39 -04:00
Joshua Arts d9c5d37810 correctly handle failed login 2018-06-28 09:35:36 -04:00
Joshua Arts a6b313f38e test sessions controller and fix style 2018-06-27 17:00:37 -04:00
Joshua Arts 60d8a595f0 always join owners ad moderators 2018-06-26 16:20:04 -04:00
Josh ad5f218f23 adhere to rubocop guidelines 2018-06-26 10:29:46 -04:00
Josh f0011a564e raise when user not found 2018-06-25 15:51:23 -04:00
Josh c16197670b add ability to configure terms and conditions 2018-06-21 16:17:18 -04:00
Josh ad7aaa1a11 dynamically select websocket protocol 2018-06-21 10:57:20 -04:00
Josh e1eca134fc minor fixes 2018-06-19 16:43:27 -04:00
Josh 5d5cfd1b7d add ability to change recording visibility 2018-06-18 14:25:30 -04:00
Josh b2b2c641da add support for deploying to a subdirectory 2018-06-18 10:28:47 -04:00
Josh ce6ec0acfb fix logout route to not conflict with BBB 2018-06-15 16:21:00 -04:00
Josh 086a39ca3d rework tests 2018-06-15 14:41:07 -04:00
Josh 37d9ae4136 add readme 2018-06-13 16:33:23 -04:00
Josh 83642f22c1 minor fixes 2018-06-13 13:27:29 -04:00
Josh 8390e075e1 finish settings and public recordings 2018-06-12 17:28:02 -04:00
Josh 39b687a58f recording management 2018-06-12 14:36:35 -04:00
Josh 46bb456063 error pages and rec row 2018-06-11 17:32:08 -04:00
Josh 2b065eb7fa handle errors and fix join form 2018-06-11 13:05:54 -04:00
Josh 2b0f75e62b join page tweaks 2018-06-08 16:59:09 -04:00
Josh 4f70c9a8e5 validate passwords and fix home 2018-06-08 14:44:08 -04:00
Josh 520c489e62 change /start to post 2018-06-07 16:57:56 -04:00
Josh 2b28c750a8 in progress button 2018-06-07 16:39:25 -04:00
Josh 657feb777f signup and room waiting 2018-06-07 15:52:42 -04:00
Josh d9a95ffc18 work on user settings 2018-06-04 15:58:59 -04:00
joshua-arts 79949b4aa6 join with specific id 2018-06-03 14:57:30 -04:00
Josh 11a61180ed show all rooms 2018-06-01 17:28:39 -04:00
Josh a9d5215d2b styling again 2018-06-01 14:20:40 -04:00
Josh 45fb18e609 add room functionality 2018-06-01 11:55:52 -04:00
joshua-arts 1bcd176285 styling 2018-05-31 22:15:18 -04:00
Josh ede80075c1 redo rooms page 2018-05-31 15:04:18 -04:00
Josh 9e5250353b add room post 2018-05-29 17:08:38 -04:00
Josh de44d8024b room resources 2018-05-29 16:51:18 -04:00
Josh 32ec2bacce restructure app 2018-05-29 15:28:29 -04:00
joshua-arts 79d63e7b70 settings and sessions UI 2018-05-28 18:10:20 -04:00