PostERG/xamxam
1
0
Fork 0
mirror of https://codeberg.org/PostERG/xamxam.git synced 2026-06-25 16:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve rebase conflict markers in acces.php (no functional changes)

Browse Source
This commit is contained in:
Pontoporeia
2026-05-10 20:10:15 +02:00
parent 11e6eed980
commit 223a15b397
4 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
TODO.md
View File

@@ -12,3 +12,11 @@
- [x] Deduplicate getPredefinedLanguages() query - [x] Deduplicate getPredefinedLanguages() query
- [x] Accent-tolerant getOrCreateLanguage() to prevent future duplicates - [x] Accent-tolerant getOrCreateLanguage() to prevent future duplicates
- [x] Delete orphan non-accented language rows from DB - [x] Delete orphan non-accented language rows from DB
- [ ] Migrate file upload queues to FilePond
- [x] Download filepond.min.js + filepond.min.css as local assets
- [ ] Create file-upload-filepond.js (init script for FilePond instances)
- [ ] Rewrite fichiers-fragment.php: replace custom picker/queue DOM with FilePond targets
- [ ] Rewrite fieldset-files.php: same migration (used by admin add page)
- [ ] Update head.php / admin/add.php / edit.php / partage/index.php: swap sortable+file-upload-queue for filepond
- [ ] Remove file-upload-queue.js and sortable.min.js
- [ ] Clean up CSS: remove .fq-*, .tfe-file-queue styles, add filepond.css ref

8
app/public/assets/css/filepond.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
app/public/assets/js/filepond.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

13
app/templates/admin/acces.php
View File

@@ -298,6 +298,19 @@
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision) +%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
+\\\\\\\ to: urrtosru e83a3728 "fix: stop checkbox click in admin index from navigating to recapitulatif" (rebased revision) +\\\\\\\ to: urrtosru e83a3728 "fix: stop checkbox click in admin index from navigating to recapitulatif" (rebased revision)
++ $linkName = $link['name'] ?? ''; ++ $linkName = $link['name'] ?? '';
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: urrtosru e83a3728 "fix: stop checkbox click in admin index from navigating to recapitulatif" (rebased revision)
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
- $linkName = $link['name'] ?? '';
- $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ to: pnotuyzv a365f68a (rebased revision)
$linkName = $link['name'] ?? '';
$linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
$linkLockedYear = $link['locked_year'] ?? null;
+%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
+\\\\\\\ to: pnotuyzv d7107da4 (rebased revision)
++ $linkName = $link['name'] ?? '';
++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : ''; ++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
?> ?>
<tr class="admin-table-row" onclick="event.stopPropagation(); window.open('/partage/<?= urlencode($link['slug']) ?>', '_blank')" style="cursor:pointer"> <tr class="admin-table-row" onclick="event.stopPropagation(); window.open('/partage/<?= urlencode($link['slug']) ?>', '_blank')" style="cursor:pointer">