Commit Graph

1622 Commits

Author SHA1 Message Date
yaschalew
bee842bac5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 11:47:04 +03:00
natib21
0d922a132f fix 2026-06-29 08:46:03 +00:00
yaschalew
fcad1b7fac Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 11:40:42 +03:00
yaschalew
18fb16f741 fix 2026-06-29 11:40:14 +03:00
natib21
40320d247a fix 2026-06-29 08:37:48 +00:00
Yonas Tewabe
86c51574b9 Update deploy.yml 2026-06-29 10:36:33 +03:00
Yonas Tewabe
0f33076b4c Update Dockerfile 2026-06-29 10:35:28 +03:00
Yonas Tewabe
6e3d2bc0d2 Refactor Dockerfile for separate migration and seed process
Updated Dockerfile to change the startup process for the API. Migrations and seeding now run separately in CI before deployment.
2026-06-29 10:34:47 +03:00
yaschalew10
3a0b34d3b6 Merge pull request #325 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-29 10:11:21 +03:00
yaschalew
fadc98056d Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 10:10:43 +03:00
yaschalew
a64e335be6 fix ui 2026-06-29 10:09:26 +03:00
yaschalew
3b380a5bb3 fix um 2026-06-29 10:08:33 +03:00
yaschalew10
82a249e582 Merge pull request #324 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-29 09:50:49 +03:00
yaschalew
48a3dbb12c Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-29 09:49:08 +03:00
yaschalew
382c9c4b80 fix 2026-06-29 09:48:41 +03:00
Eyob T.
334755432d Merge pull request #323 from Tria-plc/alpha
Boarding, payment methods, journey direction on seat hold, and more updates
2026-06-29 08:52:28 +03:00
Stephanos A
c6e56d1c4f Boarding, payment methods, journey direction on seat hold, and more updates 2026-06-29 08:44:38 +03:00
Hagernesh Tadesse
7740252891 Merge pull request #321 from Tria-plc/Interchange
Interchange
2026-06-27 21:23:11 +03:00
hagiye
2a038c59db Import operation gate pass 2026-06-27 21:22:18 +03:00
hagiye
19e395abf6 Import operation gate pass 2026-06-27 21:13:53 +03:00
hagiye
9112e70400 Merge branch 'dev' of github.com:Tria-plc/edr-platform into Interchange 2026-06-27 21:05:20 +03:00
hagiye
fee4365b70 Import operation gate pass 2026-06-27 21:04:27 +03:00
yaschalew10
5c94a8648e Merge pull request #320 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 18:09:19 +03:00
natib21
9d3faf450f fix 2026-06-27 15:06:49 +00:00
natib21
970d02c8db fix 2026-06-27 15:02:04 +00:00
natib21
8c7f03c722 fix 2026-06-27 14:57:17 +00:00
natib21
8c82699699 fix 2026-06-27 14:40:29 +00:00
natib21
f5eaa87564 fix ui 2026-06-27 14:15:14 +00:00
natib21
df34a91e61 fix 2026-06-27 13:32:09 +00:00
yaschalew10
0d6d394fca Merge pull request #319 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 16:21:05 +03:00
natib21
2d962d79d8 fix 2026-06-27 11:00:28 +00:00
Hagernesh Tadesse
f47aa5fd83 Merge pull request #318 from Tria-plc/Interchange
Interchange
2026-06-27 13:55:58 +03:00
hagiye
3441ee4a0a interchange document generation and acknowledgement 2026-06-27 13:49:41 +03:00
hagiye
3decc9aeea interchange document generation and acknowledgement 2026-06-27 13:39:42 +03:00
natib21
de0e9e8c9c fix status update 2026-06-27 10:29:16 +00:00
yaschalew10
6c5e1637a9 Merge pull request #317 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 13:05:13 +03:00
yaschalew
278c579fe0 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 12:55:21 +03:00
yaschalew
421806e282 fix um 2026-06-27 12:54:57 +03:00
natib21
92df6c427c fix 2026-06-27 09:07:28 +00:00
natib21
cc0e6e7d87 :Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 08:30:29 +00:00
natib21
657e0bffc3 fix ui 2026-06-27 08:30:01 +00:00
Sennay
faf3ea6914 Update .gitignore to include emacs temporary files 2026-06-27 11:17:32 +03:00
yaschalew10
73b9db7c9d Merge pull request #316 from Tria-plc/freight/feature/vehicle_2
fix
2026-06-27 10:02:51 +03:00
yaschalew
f8aa3b3968 fix 2026-06-27 10:02:05 +03:00
yaschalew10
a492db32fe Merge pull request #315 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
2026-06-27 09:31:24 +03:00
yaschalew
9ba520b6d8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-27 09:30:09 +03:00
yaschalew
9f85d45b17 add package 2026-06-27 09:29:48 +03:00
Nathnael Wondisha
a652a0f2a1 Merge pull request #306 from Tria-plc/freight/fix/file-syncing
file syncing and some improvement to the onboarding
2026-06-27 09:29:19 +03:00
yaschalew10
08659272bf Merge pull request #314 from Tria-plc/freight/feature/vehicle_2
fix: repair pnpm-lock.yaml after bad merge conflict resolution
2026-06-27 08:31:38 +03:00
natib21
b069c53176 fix: repair pnpm-lock.yaml after bad merge conflict resolution 2026-06-27 05:30:08 +00:00