Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,523 Commits 96 Branches 0 Tags
f21d7ec5230dd8c553a4a2411e0802274da60e38
Commit Graph

1523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yaschalew
f21d7ec523 fix conflict 2026-06-26 12:48:21 +03:00
yaschalew
29af8d76f9 fix conflict 2026-06-26 12:47:20 +03:00
yaschalew
d1c099c70b Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-26 12:39:24 +03:00
yaschalew
ed496b72ae add iam package 2026-06-26 12:38:31 +03:00
hagiye
0556ca7966 inspection status column fix 2026-06-26 12:33:22 +03:00
hagiye
7bcf7bf3e3 Autounload on train arrival and inspection status column fix 2026-06-26 12:24:46 +03:00
Eyob T.
411244ae28 Merge pull request #300 from Tria-plc/alpha 
Throttling configuration from the passenger back office app
 2026-06-26 12:23:46 +03:00
hagiye
fa4a4e2397 Autounload on train arrival and inspection status column fix 2026-06-26 12:19:38 +03:00
hagiye
75d4c9b7c1 Autounload on train arrival 2026-06-26 12:17:31 +03:00
Stephanos A
eefbe6e8ed Throttling configuration from the backoffice added 2026-06-26 12:17:01 +03:00
marshal
327040f371 Merge pull request #298 from Tria-plc/freight_feature/profile 
Add Document Clearance pages and sidebar section with permissions
 2026-06-26 11:45:26 +03:00
Marshal
f7428df664 Add Document Clearance pages and sidebar section with permissions 2026-06-26 08:29:34 +00:00
Yonas Tewabe
8c024fd35c Update deploy.yml 2026-06-26 10:42:35 +03:00
Yonas Tewabe
5a638935fc Fix regex for exporting environment variables 2026-06-26 10:21:12 +03:00
Yonas Tewabe
83594b0d6f Update Dockerfile.web 2026-06-26 10:03:59 +03:00
Eyob T.
d49c084d3a Merge pull request #297 from Tria-plc/alpha 
Build issues resolution
 2026-06-26 07:25:09 +03:00
Stephanos A
84a14b7312 Build issues resolution 2026-06-26 06:42:19 +03:00
Eyob T.
91e5f7dccf Merge pull request #296 from Tria-plc/alpha 
Merge request for UAT results resolutions
 2026-06-25 23:38:28 +03:00
Stephanos A
533bbc0047 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 22:24:02 +03:00
Stephanos A
380ca4219e Build issues resolution 2026-06-25 22:23:44 +03:00
Roba Boru
fb3ce4c9af Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 20:37:45 +03:00
Roba Boru
48968c3685 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 20:37:21 +03:00
Roba Boru
b2111b3695 Update coachtype id for seat map 2026-06-25 20:36:51 +03:00
Stephanos A
5a1ae88397 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 20:10:54 +03:00
Stephanos A
cfbbd437e9 Backoffice UAT results addressed, packages and other updates 2026-06-25 20:10:36 +03:00
Eyob T.
09a2e63035 Merge pull request #295 from Tria-plc/alpha 
Fix test findings
 2026-06-25 20:02:55 +03:00
Roba Boru
b6f8e36603 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 20:00:05 +03:00
Roba Boru
4556509316 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 19:59:31 +03:00
Roba Boru
bd82e95f9f Fix test findings 2026-06-25 19:58:47 +03:00
Abubeker Yasin
c66e1b5dd5 Merge pull request #294 from Tria-plc/alpha 
Alpha
 2026-06-25 16:31:01 +03:00
Abubeker Yasin
b9fce9505b Merge branch 'passenger/feat/iam' into alpha 2026-06-25 16:29:18 +03:00
Abubeker Yasin
61f62be31d feat: ( fayda ) register user after fayda verification 2026-06-25 16:27:29 +03:00
Eyob T.
c3a08dbd31 Merge pull request #293 from Tria-plc/alpha 
Add payment and booking status cron job and update seatmap
 2026-06-25 15:53:29 +03:00
Roba Boru
1a152b0e75 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 15:51:01 +03:00
Roba Boru
a51494d4f4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-25 15:50:44 +03:00
Roba Boru
1af5d6d310 Update seatmap and add cron job for payment status 2026-06-25 15:50:27 +03:00
Abubeker Yasin
e983179519 Update bookings.controller.ts 2026-06-25 14:49:57 +03:00
Abubeker Yasin
29fd5cec34 refactor: ( d-money ) update trade_type and business_type 2026-06-25 14:46:07 +03:00
Abubeker Yasin
5b89c5852d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-25 14:33:50 +03:00
Abubeker Yasin
a0a02b473d fix: ( my booking ) add get passenger id from the iamuserid 2026-06-25 14:20:17 +03:00
yaschalew
671dc854f3 fix 2026-06-25 13:18:25 +03:00
yaschalew10
acec3d2540 Merge pull request #292 from Tria-plc/dev 
Merge pull request #291 from Tria-plc/freight/feature/vehicle_2
 2026-06-25 13:15:46 +03:00
yaschalew10
73de29f7c5 Merge pull request #291 from Tria-plc/freight/feature/vehicle_2 
fix
 2026-06-25 12:28:40 +03:00
natib21
f85a6a2196 fix 2026-06-25 09:25:50 +00:00
yaschalew10
a00a9281fd Merge pull request #290 from Tria-plc/freight/feature/vehicle_2 
fix last mile
 2026-06-25 12:04:12 +03:00
yaschalew
a8f9fc0445 fix last mile 2026-06-25 12:02:27 +03:00
yaschalew10
a09961c36a Merge pull request #274 from Tria-plc/Release_order 
Release order
 2026-06-25 11:42:23 +03:00
hagiye
2b7959fc82 fix conflict 2026-06-25 11:31:50 +03:00
Yonas Tewabe
c1aa7ed8d7 Update docker-compose.yaml 2026-06-25 11:25:57 +03:00
Yonas Tewabe
1c841f549f Update docker-compose.yaml 2026-06-25 11:22:56 +03:00