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

148 Commits

Author SHA1 Message Date
Lars Kiesow
311806faa7 Color Configuration for Cookie Banner (#1302) 
* Color Configuration for Cookie Banner

Right now, the colors of the cookie banner are hard-coded which can
easily clash with the configured site colors in site settings.

This patch switches to using the configured colors instead.

* Update application.scss

Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 12:46:46 -04:00
Klaus
e7e0c7624c room block enhancements (#1203) 
* highlight current room block

* fix duplicated ids

* remove inline js

* remove some trailing whitespaces

* Fixed Server Rooms room settings name

Co-authored-by: farhatahmad <ahmad.af.farhat@gmail.com>
Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 11:21:57 -04:00
Klaus
21cb768fc4 make help link configurable (#1161) 
* make help link configurable

* change default help url

* use default help url in setups without env var

Co-authored-by: Jesus Federico <jesus@123it.ca>
 2020-04-16 10:56:34 -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
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
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
eb965e5c52 Added data-disable to all button_to to fix double click issue (#923) 2020-02-12 17:49:35 -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
e61946a0f4 GRN2-132: Fixed visual issues with mobile (Fixed #325) (#844) 
* Fixed visual issues with mobile

* Fixed spacing above room name
 2019-11-01 11:51:22 -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
3f5affd116 Only render 1 delete room modal (#819) 2019-10-10 15:45:42 -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
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
9ddc057589 Added a Maintenance Window flash (#758) 2019-08-22 12:15:01 -04:00
shawn-higgins1
3d2a0a060b GRN2-225, GRN2-227: Images sent by Office365 Institutional accounts break the rooms (#753) 
* Validate profile image url

* Add rake task to migrate old office365 accounts
 2019-08-21 14:23:00 -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
Jesus Federico
4d69d06ba1 GRN2-ZZZ: Added messages for debugging actioncable (#731) 
* GRN2-ZZZ: Added messages for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* GRN2-ZZZ: Added data to the js message for debugging actioncable

* Log unsubscribe
 2019-08-09 12:07:38 -04:00
shawn-higgins1
6d6ac3efdd Bug fixes for roles (#729) 2019-08-07 11:19:16 -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
farhatahmad
60f5cd5c81 GRN2-xx: Fixed issue with recording row and added small fix to roles migration (Fixed #717, #718) (#719) 
* Fixed issue with recording row and added small fix to roles migration

* Fixed issue with edit user avatar

* Small bug fixes for user settings

* Added autofocus on name field when joining

* Added extra check for admin password check

* Rubocop fixes
 2019-08-01 16:53:26 -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
58201d5763 Email recording now includes all urls (#697) 2019-07-31 11:33:06 -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
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
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
8c63f793a5 Reduce number of roles queries for the admin controller (#631) 2019-07-15 14:45:06 -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
farhatahmad
338953d728 Replaced old colour picker with a cleaner one (#617) 2019-07-09 17:03:18 -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
e4f50026f1 Added setting for admin to limit the number of rooms for the user (#607) 2019-07-09 10:56:06 -04:00
farhatahmad
315bb1af1c Added a max-width to the email column in the manage users table (#611) 2019-07-08 09:12:46 -04:00
farhatahmad
7828c15286 GRN2-166: Fixed issue with language fallback not working (Fixed #593) (#602) 
* Fixed issue with language fallback not working

* Rubocop fixes
 2019-07-08 09:02:34 -04:00
farhatahmad
bb17771a03 Removed recording warning on room delete if there are no recordings (#577) 2019-06-25 22:34:16 -04:00
farhatahmad
3e0238eb0c Replaced checkbox with dropdown (#552) 2019-05-23 13:21:43 -04:00
shawn-higgins1
c3d1ce3a04 Fix checkbox styling (#547) 2019-05-22 15:23:31 -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
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
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
4a4fcec6fb Add a colour picker that is consistent across all browsers (GRN2-96) (#518) 
* sync

* Fix corruption

* Add back room.rb

* Line endings

* More line endings

* Add jQuery colour picker

* Remove inline styling
 2019-05-17 12:28:58 -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