yaschalew 47f87e8435 fix conflict

2026-07-03 17:31:29 +03:00

..

common

Add allocation management features and update permissions for container allocation

2026-07-03 04:15:16 +00:00

config

:wqMerge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice

2026-07-03 09:10:31 +00:00

contracts

Remove estimated shipment date from contract forms and related components

2026-07-01 02:42:05 +00:00

migrations

fix conflict

2026-07-03 17:31:29 +03:00

modules

fix conflict

2026-07-03 17:31:29 +03:00

scripts

Customer Truck Assignment and Portal Delivary Approval

2026-07-02 15:54:16 +03:00

seed

fix issues

2026-07-03 13:53:17 +00:00

types

Customer Truck Assignment and Portal Delivary Approval

2026-07-02 15:54:16 +03:00

app.module.ts

fix conflict

2026-07-03 17:31:29 +03:00

data-source.ts

Train scheduling API,Routes and UI

2026-06-08 16:31:28 +03:00

logger.middleware.ts

fix: logger

2026-07-03 17:21:26 +03:00

main.ts

fix fayda

2026-07-03 09:32:41 +00:00