From 41eebf8a02f2316171d3e9cc82c3f74ebccc909f Mon Sep 17 00:00:00 2001
From: Pontoporeia <pontoporeia@happyngreen.fr>
Date: Tue, 19 May 2026 00:06:45 +0200
Subject: [PATCH] cleanup: squash commit history from 177 to 98 commits,
 resolve acces.php conflict markers

---
 TODO.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/TODO.md b/TODO.md
index 1534a3c..600d9c1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,10 @@
 # Current tasks
 
+## Commit history cleanup
+- [x] Squash 177→98 commits by merging similar/iterative fixes and immediate follow-ups
+- [x] Resolve 206k lines of nested jj conflict markers in acces.php
+- [x] Update commit descriptions for squashed groups
+
 ## acces.php conflict marker cleanup
 - [x] Remove 206k lines of nested jj conflict markers from acces.php (resolved from clean nzllwsxo base)
 - [x] Restore missing features: create-result dialog, locked_year field, auto-generated password UI, file restrictions section, admin TOC wrapper