Skip to content

refactor: replace dedicated login page with a modal integrated into t…#111

Merged
lukepring merged 2 commits into
mainfrom
Updated-Styles
Apr 29, 2026
Merged

refactor: replace dedicated login page with a modal integrated into t…#111
lukepring merged 2 commits into
mainfrom
Updated-Styles

Conversation

@lukepring
Copy link
Copy Markdown
Collaborator

…he main layout

@lukepring
Copy link
Copy Markdown
Collaborator Author

@copilot resolve the merge conflicts in this pull request

Co-authored-by: lukepring <68820847+lukepring@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 29, 2026

@copilot resolve the merge conflicts in this pull request

Merged origin/main into this branch and resolved the conflict in app/views/layout.pug. The only conflict was at the end of the review modal — kept the login modal additions from this branch and incorporated all the new commits from main (CI workflow, DB config, nearest-pub routing, crash fixes). Resolved in commit 79171f3.

@lukepring lukepring merged commit d83aafd into main Apr 29, 2026
1 check passed
@lukepring lukepring deleted the Updated-Styles branch April 29, 2026 20:17
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.

2 participants