mirror of
https://codeberg.org/PostERG/xamxam.git
synced 2026-06-25 16:19:19 +02:00
cleanup: squash commit history from 177 to 98 commits, resolve acces.php conflict markers
This commit is contained in:
5
TODO.md
5
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
|
||||
|
||||
Reference in New Issue
Block a user