Add: packages to generate OTP tokens & QR codes#53
Open
Jan-Schuppik wants to merge 3 commits intomainfrom
Open
Add: packages to generate OTP tokens & QR codes#53Jan-Schuppik wants to merge 3 commits intomainfrom
Jan-Schuppik wants to merge 3 commits intomainfrom
Conversation
Al2Klimov
previously requested changes
Oct 24, 2025
Member
Al2Klimov
left a comment
Al2Klimov
left a comment
There was a problem hiding this comment.
- There are merge conflicts
- composer.lock is unchanged
- chillerlan/php-qrcode is under Apache-2.0 which is incompatible with GPL-2.0
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 1, 2025
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)
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 2, 2025
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)
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 2, 2025
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! |
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 9, 2025
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)
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 9, 2025
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)
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 9, 2025
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)
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 11, 2025
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)
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 12, 2025
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)
jrauh01
added a commit
to Icinga/icingaweb2
that referenced
this pull request
Dec 12, 2025
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)
Member
|
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add the packages required by the icingaweb2 feature Two Factor Authentication V2.
Packages: