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

115 Commits

Author SHA1 Message Date
Ahmad Farhat 8f3ba8a038
Bumped LDAP gem version (#1443) 2020-04-29 17:45:37 -04:00
Ahmad Farhat 44bd2315b2
Merge branch 'master' into room-settings 2020-04-28 13:12:20 -04:00
Ahmad Farhat b08b1ff013
GRN2-xx: Fixed translation location for room status (#1378) 
* Fixed translation location for room status

* Added more missing translations
 2020-04-28 13:04:04 -04:00
farhatahmad 5c7062d7c9 Added room configuration tab to admin panel 2020-04-16 15:50:23 -04:00
Ahmad Farhat 509215ae8d
Added fallback message if image url is invalid (#1149) 
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-01 17:26:16 -04:00
Ahmad Farhat 4093a89b4a
Added dropdown for dynamically changing the log level (#962) 2020-02-24 12:51:27 -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
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 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 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 b291b0e409 Fixed statistics spelling mistake (#874) 2019-12-20 11:31:37 -05:00
Ahmad Farhat da80fb55c7 Errors with recordings no longer cause the page to 500 (#849) 2019-11-01 14:37:38 -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 e13e762349 GRN2-243: Added a report issue button to the 500 error page (#796) 
* Added a report issue button to the 500 error page

* Removed unused code

* Removed unused quotes
 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 9ddc057589 Added a Maintenance Window flash (#758) 2019-08-22 12:15:01 -04:00
farhatahmad 177bf4d595 Cached request to provider to increase application performance (#755) 2019-08-21 14:45:22 -04:00
shawn-higgins1 de81223413 Display launcher errors in Greenlight (#742) 2019-08-15 10:17:32 -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
farhatahmad 98405c7d86 GRN2-xx: General bug fixes and performance upgrades (#734) 
* General bug fixes and performance upgrades

* Removed unused lines
 2019-08-14 09:59:34 -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 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
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 453e6b7c96 Updated strings and added a bit of styling (#692) 2019-07-24 13:42:46 -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 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
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
farhatahmad 02c0d577f8 Added an env variable that allows maitenance mode (#679) 2019-07-22 16:45:56 -04:00
farhatahmad 744a21b244 Fixed localization bugs (#678) 2019-07-22 15:40:26 -04:00
shawn-higgins1 c4eeee3d40 Add setting for recording visibility (#634) 2019-07-22 15:39:49 -04:00
farhatahmad 8b2c472536 GRN2-211: Added a maintenance mode (#675) 
* Added a maintenance mode

* Cleaned up dockerignore file

* Added branding to maintenance page

* Fixed branding
 2019-07-22 15:25:43 -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
Jesus Federico 65270bdbb0
Update en.yml 2019-07-12 11:15:02 -04:00
farhatahmad ea759d551c GRN2-195: Fixed issues with turbolinks caching (#626) 
* Fixed issues with turbolinks caching

* Updated string for twitter flash
 2019-07-11 08:54:52 -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 fc18976b6d GRN2-107: Add office365 auth (#616) 
* add office365 auth

* Delete conflicting file
 2019-07-09 13:54:15 -04:00