Michael Abebe 25fa26e65d Fix merge conflict of Merge branch 'freight/develop' into freight/feature/edr_org_seeder

2026-06-01 17:28:07 +03:00

..

backoffice

feat(freight:backoffice): temp add user UI

2026-06-01 17:17:54 +03:00

billing

change the schema from public to freight

2026-05-23 10:00:40 +03:00

bookings

changes

2026-06-01 15:14:03 +03:00

consignments

change the schema from public to freight

2026-05-23 10:00:40 +03:00

customers

complete rule engine and booking flow

2026-05-30 11:52:50 +03:00

demo-permissions

feat(freight:backoffice): demo iam

2026-05-29 11:21:04 +03:00

dropdown-settings

add service-types and cargo-types CRUD modules with pagination, filtering

2026-05-28 11:52:29 +03:00

file-upload-settings

add service-types and cargo-types CRUD modules with pagination, filtering

2026-05-28 11:52:29 +03:00

files

implement file module and add files relation to booking entity and populate on fetch

2026-05-25 10:19:08 +03:00

minio

changes

2026-05-26 09:24:47 +03:00

notifications

chore: fmt

2026-05-12 16:50:18 +03:00

otp

user account create

2026-05-26 05:40:53 +03:00

rule-engine

Merge pull request #61 from Tria-plc/freight/rule_engine_ui

2026-06-01 16:09:37 +03:00

tracking

change the schema from public to freight

2026-05-23 10:00:40 +03:00

trains

change the schema from public to freight

2026-05-23 10:00:40 +03:00