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

96 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
6d29422c31 Default to EN if language is not recognized (#805) 2019-09-20 09:02:55 -04:00
Ahmad Farhat
55d4a21dcb Fixes after merge (#786) 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
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
farhatahmad
7e3c44575e Added the ability for admins to send a reset password email for users (#737) 2019-08-14 10:21:57 -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
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
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
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
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
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
shawn-higgins1
c4eeee3d40 Add setting for recording visibility (#634) 2019-07-22 15:39:49 -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
c7a0c6a463 GRN2-192: Made error pages more descriptive (#620) 
* GRN2-192

* Brought back error codes
 2019-07-10 11:51:19 -04:00
shawn-higgins1
523d9a38f2 GRN2-30: Add custom ldap sign in page (#619) 
* Add custom ldap signin page

* Remove old omniauth-ldap gem

* Use new bn gems
 2019-07-10 11:26:43 -04:00
shawn-higgins1
40b05b1626 GRN2-155: Begin preparing for removal of Twitter accounts (#615) 
* Add twitter deprecation message

* Fix rspec test

* Extract room switch to its own method

* update method name
 2019-07-09 13:06:07 -04:00
farhatahmad
5d4bd1b851 GRN2-174: Added 404 if user does not exist (#609) 
* Added 404 if user does not exist

* Differentiated between 404 and 500

* Rspec fixes
 2019-07-09 11:00:33 -04:00
farhatahmad
e4f50026f1 Added setting for admin to limit the number of rooms for the user (#607) 2019-07-09 10:56:06 -04:00
farhatahmad
3e0238eb0c Replaced checkbox with dropdown (#552) 2019-05-23 13:21:43 -04:00
farhatahmad
190fc57f5e Added a BigBlueButton error page (#548) 2019-05-23 09:36:28 -04:00
farhatahmad
e90ca9cf48 Rspec and rubocop fixes 2019-05-22 13:51:55 -04:00
shawn-higgins1
70acb9a7e1 GRN2-118: Create a setting to require authentication to join a room (#541) 
* Create a setting to require authentication to join a room

* Apply comments
 2019-05-22 13:44:40 -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
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