Skip to content

Merge fixes into main: pinned magazines param, improvements, /overview cost fields - #36

Merged
tortortortortortor merged 3 commits into
mainfrom
fixes
Jun 9, 2026
Merged

Merge fixes into main: pinned magazines param, improvements, /overview cost fields#36
tortortortortortor merged 3 commits into
mainfrom
fixes

Conversation

@tortortortortortor

Copy link
Copy Markdown
Contributor

Brings the fixes working branch into main. These commits back already-merged frontend work (sks-dashboard-frontend PR #123 and the earlier SKS-292) but were never merged into the mock repo's main.

Commits:

  • SKS-299 — add grid_feed_cost_today, production_fee_today, personnel_cost_today, net_income_today (all MonetaryValue) to OverviewFinancials
  • Add ?pinned query param to /magazines (SKS-292)
  • Improvements

main is an ancestor of fixes, so this is a clean merge. Merging with a merge commit keeps 5ed2372 in main history, which the frontend submodule pins.

🤖 Generated with Claude Code

tortortortortortor and others added 3 commits April 21, 2026 11:28
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Add grid_feed_cost_today, production_fee_today, personnel_cost_today and
net_income_today (all MonetaryValue) to the /overview financials, to back
the production-value cost breakdown on the dashboard.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
@tortortortortortor
tortortortortortor merged commit f4997a8 into main Jun 9, 2026
1 check passed
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