stackchain/stackchain-dashboard
1
0
Fork 0
Code Issues 9 Pull Requests 1 Actions Packages Projects Releases 713 Wiki Activity

Reconcile concurrent Week Ahead edits per day #1185

Merged
timmy merged 1 commits from timmy/1184-reconcile-week-ahead-per-day into main 2026-08-20 15:54:53 +00:00
Conversation 0 Commits 1 Files Changed 18 +344 -52
timmy commented 2026-08-20 15:44:53 +00:00
Owner
Copy Link

Closes #1184

What changed

  • three-way merge Week Ahead snapshots and automatically preserve edits made to different dates
  • show only same-date conflicts with touch-safe phone/account choices
  • persist per-day recovery choices and retain legacy whole-week fallback
  • roll the offline shell and exercise the packaged flow at 320×568 and 390×844

Verification

  • pytest -q tests/ — 2243 passed, 11 skipped
  • packaged tests/e2e/test_mobile_week_ahead_release.py — 4 passed
  • frontend gzip budgets and syntax checks pass
Closes #1184 ## What changed - three-way merge Week Ahead snapshots and automatically preserve edits made to different dates - show only same-date conflicts with touch-safe phone/account choices - persist per-day recovery choices and retain legacy whole-week fallback - roll the offline shell and exercise the packaged flow at 320×568 and 390×844 ## Verification - `pytest -q tests/` — 2243 passed, 11 skipped - packaged `tests/e2e/test_mobile_week_ahead_release.py` — 4 passed - frontend gzip budgets and syntax checks pass
timmy added 1 commit 2026-08-20 15:44:54 +00:00
feat: reconcile Week Ahead edits per day (Closes #1184)
All checks were successful
CI / lint (pull_request) Successful in 3m52s
Details
CI / build-release (pull_request) Successful in 10s
Details
CI / browser-journey (pull_request) Successful in 5m36s
Details
CI / release-candidate (pull_request) Has been skipped
Details
e0f7c711ed
timmy merged commit 6718160381 into main 2026-08-20 15:54:53 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
P0

Drop everything

  
P1

High priority

  
P2

Medium priority

  
agent:nightprowl

Assignments routed to the LongCat NightProwl evaluation worker

  
backend

Backend service

  
ci

Continuous integration / actions

  
frontend

Frontend / UI

  
meta

Meta / planning

  
pages

Gitea Pages

  
template

Repo template / standards

No Label
P0
P1
P2
agent:nightprowl
backend
ci
frontend
meta
pages
template
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: stackchain/stackchain-dashboard#1185
No description provided.
Delete Branch "timmy/1184-reconcile-week-ahead-per-day"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?