Commit Graph

  • 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
  • e3ac57dfb2 Merge pull request #130 from Tria-plc/alpha Eyob T. 2026-06-10 12:09:28 +03:00
  • 97ed1c4b85 fix the layout style Nathnael 2026-06-10 09:03:33 +00:00
  • f423fc2e6f style: update Nathnael 2026-06-10 07:27:42 +00:00
  • 214feaedb5 Update seed.ts Abubeker Yasin 2026-06-10 11:21:34 +03:00
  • e5bf4dd111 Merge pull request #129 from Tria-plc/alpha Sennay 2026-06-10 11:10:02 +03:00
  • 310c0a0bc8 Update seed.ts Abubeker Yasin 2026-06-10 11:04:57 +03:00
  • 0335555892 overview, booking and train scheduling ui Marshal 2026-06-10 07:53:15 +00:00
  • 02621d05d8 chore: migrate to mantine from shadcn for datatable ghost2023 2026-06-10 10:02:09 +03:00
  • 66b45ce22c feat(payment-providers): implement Waafi in provider package Abubeker Yasin 2026-06-10 09:14:18 +03:00
  • 2b5a0f4e96 ui design for schedule Marshal 2026-06-10 00:12:52 +00:00
  • 257428be18 ui design for schedule Marshal 2026-06-09 23:25:52 +00:00
  • 5774d7db9d booking operations and trains scheduling also allocations marshal 2026-06-10 00:48:32 +03:00
  • dc1443207e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-09 21:44:13 +03:00
  • ceb7f17e88 refactor: replace static IDs with UUIDs in seed functions for improved uniqueness Stephanos A 2026-06-09 21:43:24 +03:00
  • 4d52009bd7 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-09 21:00:37 +03:00
  • 61c1ea64c9 Merge pull request #128 from Tria-plc/alpha Eyob T. 2026-06-09 20:38:24 +03:00
  • df75c68bf6 seed fix: update last station code and correct route reference in seedTrips and seedFareRules functions Stephanos A 2026-06-09 20:32:24 +03:00
  • 98c6914991 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha Roba Boru 2026-06-09 19:13:49 +03:00
  • 579498aa71 Merge pull request #127 from Tria-plc/alpha Eyob T. 2026-06-09 17:03:28 +03:00
  • 89c29e5e90 Resolved EventEmitterModule build issue Stephanos A 2026-06-09 17:00:17 +03:00
  • 983dbde868 Merge pull request #126 from Tria-plc/dev Stephanos A. 2026-06-09 16:53:54 +03:00
  • dcfb6d6a62 Merge pull request #125 from Tria-plc/freigh/fix/dmoney Eyob T. 2026-06-09 16:48:13 +03:00
  • 4afe07c19b fix ghost2023 2026-06-09 16:37:11 +03:00
  • 9219119ad1 Merge pull request #124 from Tria-plc/dev Stephanos A. 2026-06-09 15:54:06 +03:00
  • 409870c2f0 Merge pull request #123 from Tria-plc/alpha Eyob T. 2026-06-09 15:34:28 +03:00
  • c2bab6cae8 Seatmap rendering and other updates Stephanos A 2026-06-09 15:22:27 +03:00
  • fc5024c6f3 chore: ( iam ) update iam package Abubeker Yasin 2026-06-09 14:29:27 +03:00
  • 431b1c4f3c refactor( iam ): replace prisma.user joins with batch IAM fetch in bookings, tickets, and payments e2e Abubeker Yasin 2026-06-09 13:54:38 +03:00
  • 1440c42f1e Merge branch 'freight/develop' into freight/feat/ui-migration Nathnael Wondisha 2026-06-09 12:13:03 +03:00
  • 5ae6d9600a refactor(iam): remove remaining prisma.user refs from passenger side align RegisterDto to IAM body Abubeker Yasin 2026-06-09 11:53:46 +03:00
  • c70c10b0df fixes Nathnael 2026-06-09 08:29:09 +00:00
  • 1d35453338 refactor( iam ): remove prisma.user references from passenger-side services Abubeker Yasin 2026-06-09 10:31:49 +03:00
  • 4566033046 style: ui revamp ghost2023 2026-06-09 09:27:14 +03:00
  • 8f99069fb6 Merge pull request #121 from Tria-plc/freight/develop Hagernesh Tadesse 2026-06-08 16:55:57 +03:00
  • eda21e22d8 Resolve merge conflicts from Train-Scheduling hagiye 2026-06-08 16:51:29 +03:00
  • 5786952ede Merge pull request #120 from Tria-plc/freight/feature/telebirr-integration Eyosiyas Girma 2026-06-08 16:35:33 +03:00
  • 7c5e7408b0 Merge branch 'freight/develop' into freight/feature/telebirr-integration Eyosiyas Girma 2026-06-08 16:35:18 +03:00
  • 7facbeda22 Train scheduling API,Routes and UI hagiye 2026-06-08 16:31:28 +03:00
  • 3a66242f8b working on dmoney Eyosiyas 2026-06-08 16:29:20 +03:00
  • 32f2f4b917 refactor( iam ): rename AuditLog.userId to iamUserId; drop FaydaVerificationSession.userId Abubeker Yasin 2026-06-08 16:26:59 +03:00
  • bf8cc7e6cf Merge pull request #119 from Tria-plc/dev Stephanos A. 2026-06-08 16:23:02 +03:00
  • edcb1b6fb1 Update tailwind.config.js (removed malicious code) Stephanos A. 2026-06-08 16:20:59 +03:00
  • 28e9203ccb Update tailwind.config.js (removed malicious code) Stephanos A. 2026-06-08 16:20:57 +03:00
  • c54aeb5040 Merge pull request #118 from Tria-plc/revert-117-dev Stephanos A. 2026-06-08 16:12:53 +03:00
  • 383b630407 Revert "From dev to alpha" Stephanos A. 2026-06-08 16:11:59 +03:00
  • 41061462ff feat(ui): Integrate Mantine UI library, introduce AppLayout, and refactor dashboard ghost2023 2026-06-08 16:05:03 +03:00
  • 00553b7959 Merge pull request #117 from Tria-plc/dev Stephanos A. 2026-06-08 16:01:11 +03:00
  • 8c377e86d8 refactor( iam ): replace userId FK with iamUserId on UserPreferences, Device, FraudAlert Abubeker Yasin 2026-06-08 15:49:42 +03:00
  • c1dcfb04c3 refactor( iam ): migrate guest booking to IAM; make Passenger.userId nullable Abubeker Yasin 2026-06-08 15:27:32 +03:00
  • 1d9c8d5d0d Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev Abubeker Yasin 2026-06-08 12:01:59 +03:00
  • d07f522a60 fix(passenger-api): fix seed errors and add missing stop times Abubeker Yasin 2026-06-08 12:00:01 +03:00
  • a1940c4901 telebirr out in the payment Eyosiyas 2026-06-08 11:49:50 +03:00
  • f5c9a72521 fix(passenger-api): fix seed TypeScript errors for dev Abubeker Yasin 2026-06-08 11:35:12 +03:00
  • 11192b6d49 fix(passenger-api): fix seed TypeScript errors for dev Abubeker Yasin 2026-06-08 11:35:12 +03:00
  • 72f8441a2b fix: ( prisma ) remove orphaned TicketSeat migration Abubeker Yasin 2026-06-08 10:17:22 +03:00
  • 675975bc08 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine marshal 2026-06-08 10:05:48 +03:00
  • 88df20be6b change price logic on the ,rule engine ui, auto generate the contrat marshal 2026-06-08 10:04:23 +03:00
  • 3d1f972e52 Merge freight/develop into wagon-types hagiye 2026-06-08 09:34:02 +03:00
  • b78796d76b mantine added to Train, wagon, containers and cargoes hagiye 2026-06-08 09:29:34 +03:00
  • ac153fb0d0 chore( iam ): remove dead auth DTOs and @nestjs/jwt; migrate fayda/passenger to iamUserId Abubeker Yasin 2026-06-08 09:02:54 +03:00
  • 95fb544ec2 Merge pull request #116 from Tria-plc/freight/feat/payment Nathnael Wondisha 2026-06-08 08:52:39 +03:00
  • df725015a1 fix(api): improve payment status API handling and frontend user experience ghost2023 2026-06-08 08:51:54 +03:00
  • bffa5020ac wagon types added UI with API integrations hagiye 2026-06-07 21:56:33 +03:00
  • 67319a467e Merge pull request #115 from Tria-plc/alpha Stephanos A. 2026-06-07 19:43:50 +03:00
  • 193485d911 Update Prisma migration script to use deploy command Stephanos A 2026-06-07 19:43:02 +03:00
  • cfff533066 Merge pull request #114 from Tria-plc/alpha Stephanos A. 2026-06-07 19:26:46 +03:00
  • e3fb81317e Fix Prisma schema path in package.json Stephanos A 2026-06-07 19:24:46 +03:00
  • 0666fd06cf Merge pull request #113 from Tria-plc/alpha Stephanos A. 2026-06-07 19:11:09 +03:00
  • 09317a3d56 Add Prisma schema configuration to package.json Stephanos A 2026-06-07 19:10:00 +03:00
  • 12fabc3fa1 Merge pull request #112 from Tria-plc/alpha Stephanos A. 2026-06-07 18:58:15 +03:00
  • 75b7ec1baf Update PORT configuration in .env.example from 3002 to 4000 Stephanos A 2026-06-07 18:57:34 +03:00
  • f3400b36f2 Merge pull request #111 from Tria-plc/alpha Stephanos A. 2026-06-07 17:53:19 +03:00
  • bb10e7fdf2 Coaches, seats, schedules, and pricing related updates Stephanos A 2026-06-07 17:41:31 +03:00
  • b9cfce70fe Merge pull request #110 from Tria-plc/freight_feature/change_to_mantine marshal 2026-06-07 01:23:02 +03:00
  • 4993453993 generate contract by the system, add waggon type,fix ui marshal 2026-06-07 01:20:52 +03:00
  • 3fa1f54e3a fix ui marshal 2026-06-07 00:32:07 +03:00
  • 08b46c306f ui improvemnt Marshal 2026-06-06 21:17:20 +00:00
  • 2f798fb080 Merge pull request #109 from Tria-plc/freight/feature/add_train_routing Michael Abebe 2026-06-06 16:31:45 +03:00