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

124 Commits

Author SHA1 Message Date
Ahmad Farhat f4990b4523
GRN2-xx: Replaced bbb_id field with a better string generator (#1250) 
* Replaced bbb_id field with a better string generator

* Update room.rb

How about this instead @farhatahmad ?

* Update room.rb

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 15:06:56 -04:00
Ahmad Farhat 6dc0ffc5c1
Remove hardcoded role value (#1152) 2020-04-01 17:18:27 -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 fab3b479c9
Fixed issue with duplicate roles from LDAP sigin (#1090) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-01 10:43:27 -04:00
Ahmad Farhat 03cdbd6b69
Fixed bugs in administrator panel (#1047) 2020-03-20 11:18:05 -04:00
Ahmad Farhat 43911b9fd5
Fixed order of rooms in postgres (#979) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-03-04 09:50:06 -05:00
Ahmad Farhat 50f4d5e4f8
Small fixes to shared access (#966) 2020-02-28 10:13:51 -05:00
Ahmad Farhat 475374090a
Fixed issue with rooms not correctly ordering (#963) 2020-02-24 16:48:51 -05: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 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 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 8a8eee52fe Fixed issue with ldap images (#926) 2020-02-12 17:49:35 -05:00
Ahmad Farhat c13a83a3f3 Fixed issues with rubocop (#916) 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 ebff9d3625 GRN2-xx: Fixed issue with rooms not being ordered correctly (#897) 
* Fixed issue with rooms not being ordered correctly

* removed home room from list

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-01-08 10:34:01 -05: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 c14f4dc31c Fixed issue with migration running on empty db (#812) 2019-10-10 15:17:52 -04:00
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
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 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
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
farhatahmad ee0a339e2b Fixed issue with image being replaced on every sign in (#687) 2019-07-24 09:14:56 -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 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 4e16e99758 Allowed users to start rooms if database is in readonly (#680) 
* Allowed users to start rooms if database is in readonly

* Travis fix
 2019-07-22 17:02:49 -04:00
farhatahmad 02c0d577f8 Added an env variable that allows maitenance mode (#679) 2019-07-22 16:45:56 -04:00
shawn-higgins1 0e4adc0049 Add watchtower metadata (#635) 2019-07-22 16:28:09 -04:00
shawn-higgins1 c4eeee3d40 Add setting for recording visibility (#634) 2019-07-22 15:39:49 -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 c410c0b8ef Change default recording sort order to descending (#630) 2019-07-12 16:34:47 -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 e4f50026f1 Added setting for admin to limit the number of rooms for the user (#607) 2019-07-09 10:56:06 -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
farhatahmad 996518eea7 Added filter for user role (#540) 2019-05-22 13:39:34 -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