Repository navigation
Land parked local edits: ftb tax dir, root-ubuntu marker, feedback sites.d - #237
Merged
Merged
Conversation
Found uncommitted in the dev2 checkout ~/src/profullstack/cli-tools, blocking a fast-forward to master (they predate 32 newer master commits). Parked here unchanged so nothing is lost; review and merge or drop. Includes icon changes (src/icon*.ts, new src/icon-service-brands.ts), a src/mail.ts change + test, small README/ftb/edge/root-ubuntu edits, two sites.d files (the local net-gateway.w3bs.org.json differs from master's e1d3627 version) and bun.lock. Backup files (*.dev2-final-orig-*) were left untracked. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Resolved: dev2/edge/edge.json and dev2/sites.d/net-gateway.w3bs.org.json take master (both are supersets of the local edits). Kept: ftb's default tax dir moves off ~/dottemplates to ~/Documents/taxes (FTB_TAX_DIR overrides); root-ubuntu.sh also recognises the old dotfiles landing-page marker (+ test); new sites.d/feedback.profullstack.com.json; bin/submitfleet.ts executable. Left out (unfinished): the profullstack-service brand icon set. It references 81 service-source/* logo files that were never added, and fails test/icon.test.ts. It stays in commit 61d0254 for whoever finishes it. bun.lock is not tracked on master and is dropped. vitest: 72 files, 1729 passed, 1 skipped, 0 failed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ThreatCrush Security Scan41 finding(s) HIGH/CRITICAL: 15 | MEDIUM: 12 | LOW: 14
Snippets are redacted; ThreatCrush never prints matched credential material. |
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
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.
These are the finished parts of the uncommitted dev2 edits from the Oct 19–31 sessions.
What lands:
~/dottemplates/...to~/Documents/taxes/years;FTB_TAX_DIRoverrides it.dotfileslanding-page marker, with a test.sites.d/feedback.profullstack.com.json.Conflicts:
edge.jsonandnet-gateway.w3bs.org.jsontake master's version, because master's is a superset of the local edits in both.Not included: the unfinished first-party brand icon set. It references 81 logo assets that were never added and it fails
icon.test.ts. It is preserved in commit 61d0254.Tests: vitest, 72 files and 1729 passed, 0 failed.
🤖 Generated with Claude Code