Skip to content

Fix/qrcode hardening#16

Merged
raskitoma merged 3 commits into
masterfrom
fix/qrcode-hardening
Apr 15, 2026
Merged

Fix/qrcode hardening#16
raskitoma merged 3 commits into
masterfrom
fix/qrcode-hardening

Conversation

@raskitoma
Copy link
Copy Markdown
Owner

No description provided.

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 69ae29fbeb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread app/qrcoderesponse.py
DEFAULT_BG_COLOR = "#ffffff"
MIN_PIXEL_WIDTH = 1
MAX_PIXEL_WIDTH = 100
<<<<<<< Updated upstream
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P0 Badge Remove unresolved merge marker from Python module

The <<<<<<< conflict marker committed in app/qrcoderesponse.py makes the module invalid Python, so importing qrcoderesponse raises a SyntaxError and the app cannot start (including /qr handling and tests that import this module). This is a release-blocking runtime failure until the conflict is resolved and a single constant set is kept.

Useful? React with 👍 / 👎.

Comment thread app/templates/index.html

<label class="form-label mt-3" for="logo_scale">Logo size:</label>
<div class="logo-slider-wrap">
<<<<<<< Updated upstream
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Resolve unresolved conflict block in template

The committed conflict block in app/templates/index.html ships merge-marker text and both slider variants, which duplicates id="logo_scale" and id="logo-scale-value" in the DOM while the script uses document.getElementById for a single element. In browsers this makes the logo-size UI inconsistent (only the first node is wired/updated) and exposes raw conflict markers to users.

Useful? React with 👍 / 👎.

@raskitoma raskitoma merged commit 0b368e4 into master Apr 15, 2026
1 check failed
@raskitoma raskitoma deleted the fix/qrcode-hardening branch April 15, 2026 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant