Commit Graph

  • cca822cab8 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-18 12:31:28 +03:00
  • 56057a1e16 Migration conflict issues resolution Stephanos A 2026-07-18 12:31:19 +03:00
  • 9ce669b6b5 Merge pull request #787 from Tria-plc/freight_feature/usermanagement marshal 2026-07-18 12:29:16 +03:00
  • a7041ee70f split export Marshal 2026-07-18 09:28:41 +00:00
  • 8f0670ff9c Passengers report Stephanos A 2026-07-18 12:27:59 +03:00
  • bc6999cd10 Merge pull request #786 from Tria-plc/freight_feature/usermanagement marshal 2026-07-18 12:20:48 +03:00
  • 406fbf6c45 split export Marshal 2026-07-18 09:12:52 +00:00
  • dc4512c15b gMerge branch 'dev' of github.com:Tria-plc/edr-platform into dev natib21 2026-07-18 09:04:52 +00:00
  • d5e87449b5 fix gps natib21 2026-07-18 09:04:34 +00:00
  • 5425379974 Merge branch 'dev' into freight/feat/chat-app Nathnael 2026-07-18 08:52:45 +00:00
  • 6126b55784 feat: setup attachment to the freight chat Nathnael 2026-07-18 08:52:06 +00:00
  • 2fcea650f4 Merge pull request #785 from Tria-plc/alpha Stephanos A. 2026-07-18 11:50:09 +03:00
  • ce95646479 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-18 11:49:42 +03:00
  • 19b1a8d13d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-18 11:47:45 +03:00
  • aecd02933c Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-18 11:46:29 +03:00
  • 282bb949ba Migration issue resolution Stephanos A 2026-07-18 11:45:35 +03:00
  • af39ab0394 Migration issue resolution Stephanos A 2026-07-18 11:44:11 +03:00
  • 20eb54521b fix natib21 2026-07-18 08:34:43 +00:00
  • 6ed6f82372 Merge pull request #784 from Tria-plc/alpha Stephanos A. 2026-07-18 11:32:48 +03:00
  • 854177c93b Seat reservation unique constrains, package totalMinor updates Stephanos A 2026-07-18 11:30:43 +03:00
  • 4806768cea Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Abubeker Yasin 2026-07-18 09:55:31 +03:00
  • 85de05cb40 feat: ( payments ) add merchant-order and booking/PNR payment status lookups Abubeker Yasin 2026-07-18 09:55:09 +03:00
  • 5702933870 Merge pull request #783 from Tria-plc/freight_feature/usermanagement marshal 2026-07-18 02:34:47 +03:00
  • 6100a121d2 fix Marshal 2026-07-17 23:33:47 +00:00
  • f8d5030e97 Merge pull request #782 from Tria-plc/freight_feature/usermanagement marshal 2026-07-18 02:27:50 +03:00
  • 3a1a08b1e1 add lashing surcharge for cargo types with hasLashing flag add lashing surcharge for cargo types with hasLashing flag Marshal 2026-07-17 23:25:53 +00:00
  • 8b84356988 Merge pull request #781 from Tria-plc/alpha Stephanos A. 2026-07-18 00:42:25 +03:00
  • 0669635095 Dashboard updates Stephanos A 2026-07-18 00:41:26 +03:00
  • 6135b8554d Merge pull request #780 from Tria-plc/alpha Stephanos A. 2026-07-18 00:35:38 +03:00
  • 8eb0582e4e Dashboard, seats report, package pricing updates Stephanos A 2026-07-18 00:34:12 +03:00
  • 19e8b666eb Merge pull request #779 from Tria-plc/alpha Stephanos A. 2026-07-17 23:51:49 +03:00
  • eee14a5051 Package pricing issue resolution, passenger report updates Stephanos A 2026-07-17 23:48:49 +03:00
  • 68e9ff8aa7 Merge pull request #778 from Tria-plc/alpha Stephanos A. 2026-07-17 23:23:30 +03:00
  • 1d9238fa39 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-17 23:20:10 +03:00
  • f2c037a5b7 Package pricing issue resolution, passenger report, tickets filter updates Stephanos A 2026-07-17 23:18:52 +03:00
  • 23ff122baf Merge pull request #777 from Tria-plc/alpha Eyob T. 2026-07-17 23:01:42 +03:00
  • d7a66cfac5 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-17 22:41:45 +03:00
  • b2e5f58119 Enable skip fayda for dev Roba Boru 2026-07-17 22:41:03 +03:00
  • 4863eff19f Merge pull request #776 from Tria-plc/alpha Eyob T. 2026-07-17 22:16:48 +03:00
  • ab500cd6f3 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-17 22:14:22 +03:00
  • 7e1966d469 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-17 22:13:31 +03:00
  • 4a4e58043f Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-07-17 22:13:13 +03:00
  • 738b7df5cf Added Checkin duration configuration Roba Boru 2026-07-17 22:12:54 +03:00
  • 5f000edbed Merge pull request #775 from Tria-plc/stephpaymentfix mulish77 2026-07-17 19:51:18 +03:00
  • ffafd9bcfc Steph payment isssues fix Muluhabt 2026-07-17 19:50:35 +03:00
  • 2567e25173 Supplementary amount issue resolution Stephanos A 2026-07-17 19:47:11 +03:00
  • 266331ec26 Merge pull request #774 from Tria-plc/stephpaymentfix mulish77 2026-07-17 19:26:12 +03:00
  • daeabe1d79 Steph payment isssues fix Muluhabt 2026-07-17 19:24:27 +03:00
  • e8c80378b8 Merge pull request #773 from Tria-plc/alpha Stephanos A. 2026-07-17 18:45:57 +03:00
  • c3f4ba1f4e Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha Stephanos A 2026-07-17 18:42:24 +03:00
  • 2e37bd7b4e Supplementary payments issue resolution Stephanos A 2026-07-17 18:41:59 +03:00
  • 312a4e8feb Merge pull request #772 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 18:02:42 +03:00
  • c8ec0be6b2 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 15:01:51 +00:00
  • 6ee771c953 fix search natib21 2026-07-17 15:01:30 +00:00
  • 2e3e5d20dd Merge pull request #771 from Tria-plc/freight_feature/usermanagement marshal 2026-07-17 16:59:36 +03:00
  • 6467173c76 fix Marshal 2026-07-17 13:57:59 +00:00
  • 38de82c37c Merge pull request #770 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 16:11:29 +03:00
  • a29689772b Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 13:10:40 +00:00
  • 0d98ccb04b fix natib21 2026-07-17 13:10:27 +00:00
  • 8d6ae99d4e Merge pull request #769 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 15:08:18 +03:00
  • 6f126a2345 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 12:01:39 +00:00
  • 41d7a04d2f Merge pull request #768 from Tria-plc/intercity-load-unload Hagernesh Tadesse 2026-07-17 15:00:15 +03:00
  • 30188c1031 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 11:59:13 +00:00
  • 47780c614a fix natib21 2026-07-17 11:59:00 +00:00
  • f690b635eb Merge pull request #767 from Tria-plc/freight_feature/usermanagement marshal 2026-07-17 14:40:59 +03:00
  • 3a697e12f2 changes Marshal 2026-07-17 11:40:25 +00:00
  • 221c49fcda fix issue Marshal 2026-07-17 11:38:54 +00:00
  • 7817961ef9 Merge pull request #766 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 14:38:44 +03:00
  • 838ea5efc8 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 11:30:49 +00:00
  • 149e4105f4 seed vehicle natib21 2026-07-17 11:30:25 +00:00
  • 30f48ea37f feat(intercity): show intercity cargo across every train Hagernesh 2026-07-17 11:17:45 +00:00
  • 4abc2aa7ae Merge pull request #765 from Tria-plc/freight/feat/chat-app Nathnael Wondisha 2026-07-17 14:12:05 +03:00
  • d0411f9da2 feat: add support page to the admin routes Nathnael 2026-07-17 11:06:44 +00:00
  • 7ab737f887 Merge pull request #764 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 14:05:10 +03:00
  • 35303ece58 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 11:03:37 +00:00
  • 57f49a9333 fix natib21 2026-07-17 11:03:23 +00:00
  • 031e5ab292 Merge branch 'dev' into freight/feat/chat-app Nathnael 2026-07-17 11:01:39 +00:00
  • e862a228d4 feat: add support to freight portal Nathnael 2026-07-17 11:00:17 +00:00
  • f278756d76 feat: add support to freight backoffice Nathnael 2026-07-17 11:00:09 +00:00
  • 1fd46afaaa fix: added chat to the freight api Nathnael 2026-07-17 10:59:25 +00:00
  • ae94cda2bd Merge pull request #763 from Tria-plc/intercity-load-unload Hagernesh Tadesse 2026-07-17 13:43:19 +03:00
  • c3ba9999c5 feat(yards): let staff mark a yard as a load/unload facility Hagernesh 2026-07-17 10:32:39 +00:00
  • a73faecbe3 feat(intercity): raise a GRN when a facility loads or unloads cargo Hagernesh 2026-07-17 10:24:53 +00:00
  • a411e0bdd0 feat(intercity): only load/unload where the yard has a facility Hagernesh 2026-07-17 09:55:06 +00:00
  • ce3ef15e7c feat(yards): record which yards can load/unload cargo Hagernesh 2026-07-17 09:52:28 +00:00
  • ebba7a6a37 Merge pull request #762 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 13:38:55 +03:00
  • 3376f106b7 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 10:37:46 +00:00
  • ef88240365 fix train build natib21 2026-07-17 10:37:20 +00:00
  • 39a48a2c30 Merge pull request #761 from Tria-plc/freight_feature/usermanagement marshal 2026-07-17 13:31:08 +03:00
  • ae49bdedf8 Merge pull request #760 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 13:30:34 +03:00
  • b3042225e5 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 10:29:39 +00:00
  • 3bb4c8fb42 fix build num natib21 2026-07-17 10:29:27 +00:00
  • 8671b982c5 fix null value natib21 2026-07-17 10:18:41 +00:00
  • 88e93652a6 Merge pull request #759 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 13:16:38 +03:00
  • 801872c106 fix rate edit Marshal 2026-07-17 10:15:26 +00:00
  • 99f67d6035 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 10:13:46 +00:00
  • a9d65e04fc fix number of wagon natib21 2026-07-17 10:12:43 +00:00
  • 17616af3db Merge pull request #758 from Tria-plc/freight/feature/user_management_UI yaschalew10 2026-07-17 12:51:48 +03:00
  • a2a20b4222 gti Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI natib21 2026-07-17 09:47:56 +00:00
  • 84d5add58e fix four digit natib21 2026-07-17 09:47:37 +00:00