Commit Graph

3 Commits

Author SHA1 Message Date
Matthew Kilgore
e00cebb7fa Merge branch 'refs/heads/main' into mk/merge-entities
# Conflicts:
#	backend/app/api/static/docs/docs.go
#	backend/app/api/static/docs/swagger.json
#	backend/go.mod
#	backend/go.sum
#	backend/internal/data/ent/entity_predicates_test.go
#	backend/internal/data/repo/repo_items.go
#	docs/en/api/openapi-2.0.json
2025-09-02 14:54:20 -04:00
Matthew Kilgore
b107ab026a Refactor entity attachment handling and update API routes for entities 2025-07-27 18:20:34 -04:00
Matthew Kilgore
77b14f3a55 More merge fixing 2025-07-27 17:42:58 -04:00