Commit Graph

  • 1cd0a55305 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Stephanos A 2026-06-14 10:31:27 +03:00
  • 20d483ed00 Backoffice portal updates: dashboard, seat management, pricing, audit logging, reporting Stephanos A 2026-06-14 10:26:22 +03:00
  • c03d0ef3ab Merge branch 'feat/payment-microservice' of github.com:Tria-plc/edr-platform into freight_feature/payments marshal 2026-06-14 02:38:19 +03:00
  • 614b4ab16b Merge pull request #151 from Tria-plc/freight_feature/payments marshal 2026-06-14 02:35:55 +03:00
  • 52c0639c8f Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/payments marshal 2026-06-14 02:27:56 +03:00
  • 91f5c7fe40 Merge pull request #147 from Tria-plc/freight/feature/user_management marshal 2026-06-14 02:25:31 +03:00
  • 87b0ce6339 Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI marshal 2026-06-14 01:32:39 +03:00
  • b73bf2154e add detail batch and allocation monitoring page Marshal 2026-06-13 18:28:39 +00:00
  • 2b90e793c3 Merge branch 'dev' into feat/payment-microservice Abubeker Yasin 2026-06-13 20:45:04 +03:00
  • c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event Abubeker Yasin 2026-06-13 20:19:23 +03:00
  • b417ed2fc8 fix conflict yaschalew 2026-06-13 14:37:13 +03:00
  • eee7b719b0 user management yaschalew 2026-06-13 14:32:26 +03:00
  • a1f493d12c Update docker-compose.yaml Yonas Tewabe 2026-06-13 12:05:29 +03:00
  • e3cd369b01 ui fix Marshal 2026-06-13 08:51:57 +00:00
  • b2f13c95c5 update window range Marshal 2026-06-13 07:59:48 +00:00
  • 962ef17803 Merge pull request #146 from Tria-plc/feat/payment-microservice Abubeker Yasin 2026-06-13 10:49:10 +03:00
  • eb94d58a4e Update payment-client.service.ts Abubeker Yasin 2026-06-13 10:48:19 +03:00
  • 12b6406d23 fix conflict yaschalew 2026-06-13 10:45:26 +03:00
  • 282b555fae Merge pull request #145 from Tria-plc/feat/payment-microservice Eyob T. 2026-06-13 10:32:08 +03:00
  • b6ece3dd6f Add scan report SennayT 2026-06-13 10:27:37 +03:00
  • 377492c2ae add new malware detection script SennayT 2026-06-13 10:16:25 +03:00
  • 0b12d9552c Merge branch 'dev' into feat/payment-microservice Abubeker Yasin 2026-06-13 10:03:55 +03:00
  • d2f1afebda chore: ( malware) remove malicious code Abubeker Yasin 2026-06-13 09:47:42 +03:00
  • e558912ab7 chore: ( payment ) add log Abubeker Yasin 2026-06-13 09:42:43 +03:00
  • 2d70f892a4 Merge pull request #144 from Tria-plc/freight_feature/schedule marshal 2026-06-13 09:39:17 +03:00
  • cccb06b32d remove critical severity code SennayT 2026-06-13 09:15:08 +03:00
  • 4b7a5990d7 Update .gitignore to remove malicious entries Sennay 2026-06-13 09:13:39 +03:00
  • de828b3d0b Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-12 19:06:19 +03:00
  • fef50e4641 Updated booking widget Roba Boru 2026-06-12 19:05:59 +03:00
  • d3a479c142 ui fix Marshal 2026-06-12 14:21:07 +00:00
  • 6b79348074 ui fix Marshal 2026-06-12 12:59:01 +00:00
  • db39e77e90 fix batch page ui Marshal 2026-06-12 12:46:51 +00:00
  • 95c6a71438 feat(warehouse): batch 3 — loading, dispatch & train-departure visibility Hagernesh 2026-06-12 12:44:40 +00:00
  • 9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration yaschalew10 2026-06-12 15:24:46 +03:00
  • da387fd310 fix merge conflict marshal 2026-06-12 14:58:39 +03:00
  • c2f44198d6 Merge pull request #141 from Tria-plc/freight_feature/schedule marshal 2026-06-12 14:46:47 +03:00
  • 1288a18bbf fix merge conflict marshal 2026-06-12 14:44:52 +03:00
  • 5c535f8f8a Update Dockerfile Yonas Tewabe 2026-06-12 14:29:32 +03:00
  • 8ce8a80a51 Update Dockerfile Yonas Tewabe 2026-06-12 14:19:56 +03:00
  • 3b0025e7e7 Update docker-entrypoint.sh Yonas Tewabe 2026-06-12 14:11:19 +03:00
  • a2eb9a8c73 Update package.json Yonas Tewabe 2026-06-12 14:00:14 +03:00
  • 3e4ea65184 Update Dockerfile Yonas Tewabe 2026-06-12 13:56:36 +03:00
  • 88197d19f3 Update Dockerfile Yonas Tewabe 2026-06-12 13:45:45 +03:00
  • 4b4e37a21b Create docker-entrypoint.sh Yonas Tewabe 2026-06-12 13:45:29 +03:00
  • be7d54d878 Update Dockerfile Yonas Tewabe 2026-06-12 13:31:28 +03:00
  • 6635b19d84 Update sync-env-from-server.sh Yonas Tewabe 2026-06-12 13:05:44 +03:00
  • 7a4056a450 Update deploy.yml Yonas Tewabe 2026-06-12 13:01:44 +03:00
  • e917b02467 Delete .github/workflows/malware-scan.yml Yonas Tewabe 2026-06-12 13:00:43 +03:00
  • 4e5afcbf72 Update docker-compose.yaml Yonas Tewabe 2026-06-12 13:00:15 +03:00
  • f6647eb02e Update Dockerfile Yonas Tewabe 2026-06-12 12:59:47 +03:00
  • bc18b8bfd7 Add Dockerfile for EDR Payment API Yonas Tewabe 2026-06-12 12:54:01 +03:00
  • f175d43d3e Merge pull request #140 from Tria-plc/feat/payment-microservice Sennay 2026-06-12 12:21:32 +03:00
  • fa6233923c Update internal-payments.dto.ts Abubeker Yasin 2026-06-12 12:20:05 +03:00
  • b93a47450b Merge pull request #139 from Tria-plc/feat/payment-microservice Eyob T. 2026-06-12 11:53:49 +03:00
  • ef7b85c8cb feat: ( payment ) integrate the passenger to payment microservice Abubeker Yasin 2026-06-12 11:47:11 +03:00
  • ef0abf1c41 auto allocation and batch managemnt, tracking the train marshal 2026-06-12 11:42:46 +03:00
  • 72e2e3c985 Recieved invontory detals Hagernesh 2026-06-12 06:58:21 +00:00
  • 8618ea2aa8 add cron jobs and aslo Marshal 2026-06-11 20:59:24 +00:00
  • 132f2150a8 add cron jobs and aslo Marshal 2026-06-11 20:59:19 +00:00
  • cde3e462ba automate the schedule Marshal 2026-06-11 19:42:23 +00:00
  • c2b5b3b926 Merge freight/develop into Warehouses Hagernesh 2026-06-11 19:26:21 +00:00
  • c86118cd8d feat(warehouse): add warehouse management module (batch 1) Hagernesh 2026-06-11 15:54:56 +00:00
  • 7c5dfa3ae1 fix: edit booking docs and prefill Nathnael 2026-06-11 12:32:23 +00:00
  • 2b430f8e76 feat: ( payment ) create payment microservice Abubeker Yasin 2026-06-11 15:25:24 +03:00
  • e8ad0aa327 Merge pull request #136 from Tria-plc/dev-fix Eyob T. 2026-06-11 14:26:50 +03:00
  • 556c2dc1f8 Update seed.ts Abubeker Yasin 2026-06-11 14:24:56 +03:00
  • f85c13ce8c Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule Marshal 2026-06-11 11:15:29 +00:00
  • 2fa2ed6bb2 ui fix Marshal 2026-06-11 11:12:41 +00:00
  • ecb519db6b Merge pull request #135 from Tria-plc/alpha-fix Sennay 2026-06-11 14:04:14 +03:00
  • dfcf2ab656 Merge branch 'dev' into alpha-fix Sennay 2026-06-11 14:02:38 +03:00
  • 727f6e6787 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Abubeker Yasin 2026-06-11 13:56:54 +03:00
  • a4baaaea1d Remove obfuscated code from tailwind.config.js Sennay 2026-06-11 13:56:29 +03:00
  • 00f4c03b60 Remove obfuscated code from tailwind.config.js Sennay 2026-06-11 13:56:02 +03:00
  • 4c1169f6fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Abubeker Yasin 2026-06-11 13:54:03 +03:00
  • 4270cdb2a5 Change deploy workflow trigger to push events Sennay 2026-06-11 13:41:51 +03:00
  • 103ff53fe0 feat: add document upload to booking creation form Nathnael 2026-06-11 09:11:35 +00:00
  • 3fa09ec644 style: booking detail pages fix Nathnael 2026-06-11 08:27:38 +00:00
  • e01a7faa20 style: auth pages fix Nathnael 2026-06-11 08:27:14 +00:00
  • 16f506062a feat: enhance auth guard Nathnael 2026-06-11 08:22:39 +00:00
  • 20289621f3 fix ui Marshal 2026-06-11 08:19:16 +00:00
  • c871330f7f resolve merge conflict marshal 2026-06-11 10:52:37 +03:00
  • ce38a5cca1 remove critical severity code SennayT 2026-06-11 10:21:47 +03:00
  • 707f552c2e skip checking scan-malware.js SennayT 2026-06-11 10:17:17 +03:00
  • cc342ddff7 always run malware scan first SennayT 2026-06-11 10:15:39 +03:00
  • 2cd585a3ac style: ui fixes to booking detail page Nathnael 2026-06-11 07:11:43 +00:00
  • 4bc2caf4c2 add malware scan script SennayT 2026-06-11 10:10:56 +03:00
  • 83edb1e063 refactor: booking page refactor Nathnael 2026-06-11 06:54:38 +00:00
  • 2250a468cb style: ui fixes ghost2023 2026-06-11 09:24:06 +03:00
  • 216dd11d2f fix: ( seed ) add try catch Abubeker Yasin 2026-06-11 08:45:32 +03:00
  • d53e9eba07 Merge pull request #133 from Tria-plc/alpha Eyob T. 2026-06-10 19:14:08 +03:00
  • 1e129de010 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-10 18:51:18 +03:00
  • 82c7c25527 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-10 18:49:50 +03:00
  • ac3aa348ce Update booking portal UI/UX Roba Boru 2026-06-10 18:49:40 +03:00
  • 10b011de8f merge conflict marshal 2026-06-10 16:45:45 +03:00
  • 3235567b41 feat( waafi ): wire Waafi HPP into passenger API Abubeker Yasin 2026-06-10 16:23:33 +03:00
  • 12b1e54563 style: rebuild the booking detail page Nathnael 2026-06-10 12:18:31 +00:00
  • 38b3f747fb style: enhance UI components for New Booking page and Step Indicator Nathnael 2026-06-10 11:07:02 +00:00
  • b37e0cf7a7 style: rebuild the my bookings page with new ui Nathnael 2026-06-10 10:43:48 +00:00
  • 3f1a673356 Merge branch 'alpha' into feat/telebirr-integration Abubeker Yasin 2026-06-10 13:22:47 +03:00
  • 088295d81f schedule logic Marshal 2026-06-10 09:22:57 +00:00