slothful-vassal b5739cb72e merge trails function added (#627) ...

* merge trails function added

* fix conflict resolve issues

* avoid incorrect authorship when merging trail comments

* require edit access for all selected trails before merge

* fix likes checkbox binding in trail merge modal

* improve error handling

* require editable target and deletable sources for merge

* avoid duplicate trail fetch during merge

* prevent duplicate likes when merging trails

* check photo download responses during trail merge

* add merge completion toast notifications

* cleanup

* small fixes

* move merge code to backend, option to merge single trail selection with similar one, automatic merge for integrations add as option, maintenance page to find and merge similar trails added

* fix build error

* fix

* docu, beautifying, refactoring

---------

Co-authored-by: Flomp <Flomp@users.noreply.github.com>

2026-05-09 13:09:26 +02:00

..

commands

adds dedup command

2025-09-13 13:27:23 +02:00

federation

Fix mentions when username != preferred_username (#885)

2026-03-20 19:35:34 +01:00

integrations

merge trails function added (#627)

2026-05-09 13:09:26 +02:00

migrations

merge trails function added (#627)

2026-05-09 13:09:26 +02:00

templates/mail

fixes mail notifications

2025-06-27 11:51:23 +02:00

tests

Fix for double encryption of secrets (#216)

2025-03-28 19:54:43 +01:00

trailmerge

merge trails function added (#627)

2026-05-09 13:09:26 +02:00

util

merge trails function added (#627)

2026-05-09 13:09:26 +02:00

waypointcluster

Trail Edit / Waypoints from photos: prevent creating different waypoints for near-by locations (#457)

2026-04-29 11:15:06 +02:00

.dockerignore

merge trails function added (#627)

2026-05-09 13:09:26 +02:00

.gitignore

updates gitignore

2025-03-17 14:57:52 +01:00

Dockerfile

chore: dockerfile build optimizations (#959)

2026-05-07 21:33:46 +02:00

go.mod

chore/pocketbase v0.38.0 (#972)

2026-05-09 13:02:31 +02:00

go.sum

chore/pocketbase v0.38.0 (#972)

2026-05-09 13:02:31 +02:00

main.go

merge trails function added (#627)

2026-05-09 13:09:26 +02:00

package-lock.json

Migrates to svelte 5

2025-01-24 17:46:13 +01:00

trail_merge_routes.go

merge trails function added (#627)

2026-05-09 13:09:26 +02:00