PostERG/xamxam
1
0 Fork 0
mirror of https://codeberg.org/PostERG/xamxam.git synced 2026-11-09 19:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: squash commit history from 177 to 98 commits, resolve acces.php conflict markers

Browse Source
This commit is contained in:
Pontoporeia committed 2026-05-19 00:09:15 +02:00
1 parent 27e6abc7e4
commit 41eebf8a02
1 file changed
+5
Download Patch File Download Diff File Expand all files Collapse all files
TODO.md
+5
View File
@@ -1,5 +1,10 @@
# Current tasks # 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 ## acces.php conflict marker cleanup
- [x] Remove 206k lines of nested jj conflict markers from acces.php (resolved from clean nzllwsxo base) - [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 - [x] Restore missing features: create-result dialog, locked_year field, auto-generated password UI, file restrictions section, admin TOC wrapper