Commit Graph

  • 3ca04ed630 Merge branch 'dev' of github.com:Tria-plc/edr-platform into dev hagiye 2026-06-26 23:48:28 +03:00
  • d5e8abcf62 get clearance fix hagiye 2026-06-26 23:37:09 +03:00
  • 15c37fea99 chore: setup repos for invoice Nathnael 2026-06-26 13:42:48 +00:00
  • aa59e30ea7 feat: setup invoice entityt Nathnael 2026-06-26 13:38:48 +00:00
  • 9c9348d12d fix: unused imports Nathnael 2026-06-26 13:07:29 +00:00
  • 1c076e0694 fix: rm the global approve Nathnael 2026-06-26 13:05:34 +00:00
  • 723c403699 fix: finish cleaning up the file syncing Nathnael 2026-06-26 13:00:11 +00:00
  • 8678258157 feat: ( permission ) add permission guard Abubeker Yasin 2026-06-26 15:49:14 +03:00
  • f51488e989 fix: the use person x button to checkbox Nathnael 2026-06-26 12:41:52 +00:00
  • 552e6bcd16 fix: make the file sync work on onboarding Nathnael 2026-06-26 12:31:08 +00:00
  • 0b013e91ef Merge pull request #305 from Tria-plc/alpha Abubeker Yasin 2026-06-26 14:42:37 +03:00
  • e2dbd27222 Update pnpm-lock.yaml Abubeker Yasin 2026-06-26 14:41:31 +03:00
  • cdfe2617f6 Merge pull request #304 from Tria-plc/alpha Abubeker Yasin 2026-06-26 14:34:12 +03:00
  • b490e2581f Merge branch 'dev' into alpha Abubeker Yasin 2026-06-26 14:32:30 +03:00
  • e7b0b95a10 Merge branch 'passenger/feat/iam' into alpha Abubeker Yasin 2026-06-26 14:31:40 +03:00
  • 9c664ccce6 feat(auth): add post-Fayda password setup flow Abubeker Yasin 2026-06-26 14:20:32 +03:00
  • 49b3adf31a Merge pull request #303 from Tria-plc/alpha Eyob T. 2026-06-26 14:17:40 +03:00
  • 86c7b2e4eb Package inquiry, UAT related update Stephanos A 2026-06-26 13:57:26 +03:00
  • f86bdb1c36 Merge branch 'dev' of github.com:Tria-plc/edr-platform into dev hagiye 2026-06-26 13:21:18 +03:00
  • 4efef9bab3 inspection status column fix hagiye 2026-06-26 13:20:26 +03:00
  • 6f04aa1f3c Merge pull request #302 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-26 12:49:24 +03:00
  • f21d7ec523 fix conflict yaschalew 2026-06-26 12:48:21 +03:00
  • 1713a0a212 Merge pull request #301 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-26 12:47:50 +03:00
  • 29af8d76f9 fix conflict yaschalew 2026-06-26 12:47:20 +03:00
  • d1c099c70b Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-26 12:39:24 +03:00
  • ed496b72ae add iam package yaschalew 2026-06-26 12:38:31 +03:00
  • 0556ca7966 inspection status column fix hagiye 2026-06-26 12:33:22 +03:00
  • 7bcf7bf3e3 Autounload on train arrival and inspection status column fix hagiye 2026-06-26 12:24:46 +03:00
  • 411244ae28 Merge pull request #300 from Tria-plc/alpha Eyob T. 2026-06-26 12:23:46 +03:00
  • fa4a4e2397 Autounload on train arrival and inspection status column fix hagiye 2026-06-26 12:19:38 +03:00
  • 75d4c9b7c1 Autounload on train arrival hagiye 2026-06-26 12:17:31 +03:00
  • eefbe6e8ed Throttling configuration from the backoffice added Stephanos A 2026-06-26 12:17:01 +03:00
  • 3fb4413069 Merge pull request #299 from Tria-plc/dev marshal 2026-06-26 11:53:17 +03:00
  • 327040f371 Merge pull request #298 from Tria-plc/freight_feature/profile marshal 2026-06-26 11:45:26 +03:00
  • f7428df664 Add Document Clearance pages and sidebar section with permissions Marshal 2026-06-26 08:29:34 +00:00
  • 8c024fd35c Update deploy.yml Yonas Tewabe 2026-06-26 10:42:35 +03:00
  • 5a638935fc Fix regex for exporting environment variables Yonas Tewabe 2026-06-26 10:21:12 +03:00
  • 83594b0d6f Update Dockerfile.web Yonas Tewabe 2026-06-26 10:03:59 +03:00
  • d49c084d3a Merge pull request #297 from Tria-plc/alpha Eyob T. 2026-06-26 07:25:09 +03:00
  • 84a14b7312 Build issues resolution Stephanos A 2026-06-26 06:42:19 +03:00
  • 91e5f7dccf Merge pull request #296 from Tria-plc/alpha Eyob T. 2026-06-25 23:38:28 +03:00
  • 533bbc0047 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-25 22:24:02 +03:00
  • 380ca4219e Build issues resolution Stephanos A 2026-06-25 22:23:44 +03:00
  • fb3ce4c9af Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-25 20:37:45 +03:00
  • 48968c3685 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-25 20:37:21 +03:00
  • b2111b3695 Update coachtype id for seat map Roba Boru 2026-06-25 20:36:51 +03:00
  • 5a1ae88397 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-25 20:10:54 +03:00
  • cfbbd437e9 Backoffice UAT results addressed, packages and other updates Stephanos A 2026-06-25 20:10:36 +03:00
  • 09a2e63035 Merge pull request #295 from Tria-plc/alpha Eyob T. 2026-06-25 20:02:55 +03:00
  • b6f8e36603 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-25 20:00:05 +03:00
  • 4556509316 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-25 19:59:31 +03:00
  • bd82e95f9f Fix test findings Roba Boru 2026-06-25 19:58:47 +03:00
  • c66e1b5dd5 Merge pull request #294 from Tria-plc/alpha Abubeker Yasin 2026-06-25 16:31:01 +03:00
  • b9fce9505b Merge branch 'passenger/feat/iam' into alpha Abubeker Yasin 2026-06-25 16:29:18 +03:00
  • 61f62be31d feat: ( fayda ) register user after fayda verification Abubeker Yasin 2026-06-25 16:27:29 +03:00
  • c3a08dbd31 Merge pull request #293 from Tria-plc/alpha Eyob T. 2026-06-25 15:53:29 +03:00
  • 1a152b0e75 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-25 15:51:01 +03:00
  • a51494d4f4 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-25 15:50:44 +03:00
  • 1af5d6d310 Update seatmap and add cron job for payment status Roba Boru 2026-06-25 15:50:27 +03:00
  • e983179519 Update bookings.controller.ts Abubeker Yasin 2026-06-25 14:49:57 +03:00
  • 29fd5cec34 refactor: ( d-money ) update trade_type and business_type Abubeker Yasin 2026-06-25 14:46:07 +03:00
  • 5b89c5852d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-06-25 14:33:50 +03:00
  • a0a02b473d fix: ( my booking ) add get passenger id from the iamuserid Abubeker Yasin 2026-06-25 14:20:17 +03:00
  • 671dc854f3 fix yaschalew 2026-06-25 13:18:25 +03:00
  • acec3d2540 Merge pull request #292 from Tria-plc/dev yaschalew10 2026-06-25 13:15:46 +03:00
  • ee9f3fa394 Fix inventory status column hagiye 2026-06-25 13:07:50 +03:00
  • e6c2735f9b Fix inventory status column hagiye 2026-06-25 13:06:11 +03:00
  • 73de29f7c5 Merge pull request #291 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-25 12:28:40 +03:00
  • f85a6a2196 fix natib21 2026-06-25 09:25:50 +00:00
  • a00a9281fd Merge pull request #290 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-25 12:04:12 +03:00
  • a8f9fc0445 fix last mile yaschalew 2026-06-25 12:02:27 +03:00
  • a09961c36a Merge pull request #274 from Tria-plc/Release_order yaschalew10 2026-06-25 11:42:23 +03:00
  • 2b7959fc82 fix conflict hagiye 2026-06-25 11:31:50 +03:00
  • c1aa7ed8d7 Update docker-compose.yaml Yonas Tewabe 2026-06-25 11:25:57 +03:00
  • 1c841f549f Update docker-compose.yaml Yonas Tewabe 2026-06-25 11:22:56 +03:00
  • 1ff304611a Update docker-compose.yaml Yonas Tewabe 2026-06-25 11:17:03 +03:00
  • 4e22c4372f Update Dockerfile.web Yonas Tewabe 2026-06-25 11:16:58 +03:00
  • f4a90755c2 api hagiye 2026-06-25 11:00:40 +03:00
  • 6a84a6a2d6 Merge pull request #289 from Tria-plc/freight/fix/type-errors Nathnael Wondisha 2026-06-25 10:43:12 +03:00
  • 1147f0553b Merge pull request #288 from Tria-plc/freight_feature/profile marshal 2026-06-25 10:42:42 +03:00
  • 4b13894ef5 remove unused imports from MyBookings component Marshal 2026-06-25 07:41:42 +00:00
  • 6fd9b6d519 chore: setup sms rabbit mq Nathnael 2026-06-25 07:41:33 +00:00
  • e98624d56f merge marshal 2026-06-25 10:39:21 +03:00
  • 99a29ada51 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile marshal 2026-06-25 10:37:34 +03:00
  • f8036a617a merge marshal 2026-06-25 10:37:21 +03:00
  • 97060e78fb Merge pull request #287 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-25 10:36:16 +03:00
  • 859e16c2be enhance onNavigate prop to accept options for navigation state Marshal 2026-06-25 07:35:07 +00:00
  • 31fbca23d6 fix yaschalew 2026-06-25 10:34:40 +03:00
  • 19c17e94b8 Merge pull request #286 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-25 10:31:33 +03:00
  • 8d7517b6af health yaschalew 2026-06-25 10:29:51 +03:00
  • b201861f1f Merge pull request #285 from Tria-plc/freight/fix/type-errors Nathnael Wondisha 2026-06-25 10:15:33 +03:00
  • ce5c69acb3 fix: rm email and phone on exteranl profile Nathnael 2026-06-25 07:14:29 +00:00
  • 0c461273c8 fix: merge issues Nathnael 2026-06-25 07:10:14 +00:00
  • 44c3e84182 update API_BASE_URL marshal 2026-06-25 10:11:24 +03:00
  • f4b02501bb Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile marshal 2026-06-25 10:09:45 +03:00
  • 861b8dc38a feat: Refactor general contract handling and introduce drawdown orders Marshal 2026-06-25 07:06:48 +00:00
  • 33684b6489 Merge pull request #284 from Tria-plc/freight/feature/vehicle_2 yaschalew10 2026-06-25 09:48:11 +03:00
  • db667ccf80 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 yaschalew 2026-06-25 09:46:34 +03:00
  • 84675f953e health yaschalew 2026-06-25 09:45:59 +03:00
  • de81ee1239 last mile yaschalew 2026-06-25 09:41:49 +03:00