feat(ui): inline conflict resolution with Keep This button

Browse Source

Replace the 'Go to Conflicts Page' link with inline conflict resolution.
Each conflict source now has a 'Keep This' button that resolves the
conflict directly from the book detail page.

- Conflict data now keyed by source name (koreader, web) instead of
  new/existing, with Source and Timestamp fields
- Display percentage scaled correctly (* 100)
- Fix page field name from current_page to page
- Add conflict resolution JavaScript in book-detail.ts
- Add 10-minute cooldown after resolution to prevent re-detection

...

This commit is contained in:

john-okeefe

2026-06-02 19:46:17 -04:00

parent f57d64563b

commit bc59159cde

4 changed files with 491 additions and 412 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

web/static/style.css

+1 -1

File diff suppressed because one or more lines are too long