-
Notifications
You must be signed in to change notification settings - Fork 4
Add: packages to generate OTP tokens & QR codes #53
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Al2Klimov
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- There are merge conflicts
- composer.lock is unchanged
- chillerlan/php-qrcode is under Apache-2.0 which is incompatible with GPL-2.0
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
|
I switched the library for QR code generation to This library requires the GD extension for php! |
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
Requires `endroid/qr-code` library in Icinga/icinga-php-thirdparty#53. Because we use **GPL-2.0** license for Icinga Web: - `chillerlan/php-qrcode: **Apache-2.0** (incompatible) - `endroid/qr-code`: **MIT** (compatible)
|
Please rebase and remove the vendor files. If you want to share a build with someone, please create a different branch. |
Switch from `chillerlan/php-qrcode` to `amirezaeb/heroqr`. For Icinga Web we are using **GPL-2.0** license: - `chillerlan/php-qrcode`: **Apache-2.0** (not compatible) - `amirezaeb/heroqr`: **MIT** (compatible)
`amirezaeb/heroqr` just uses `endroid/qr-code` so we can save some superfluous dependencies. `endroid/qr-code` also has **MIT** license.
Add the packages required by the icingaweb2 feature Two Factor Authentication V2.
Packages: