Eyob T.
|
e3ac57dfb2
|
Merge pull request #130 from Tria-plc/alpha
Update seed.ts
|
2026-06-10 12:09:28 +03:00 |
|
Nathnael
|
97ed1c4b85
|
fix the layout style
|
2026-06-10 09:03:33 +00:00 |
|
Nathnael
|
f423fc2e6f
|
style: update
|
2026-06-10 08:48:05 +00:00 |
|
Abubeker Yasin
|
214feaedb5
|
Update seed.ts
|
2026-06-10 11:21:34 +03:00 |
|
Sennay
|
e5bf4dd111
|
Merge pull request #129 from Tria-plc/alpha
Alpha
|
2026-06-10 11:10:02 +03:00 |
|
Abubeker Yasin
|
310c0a0bc8
|
Update seed.ts
|
2026-06-10 11:04:57 +03:00 |
|
Marshal
|
0335555892
|
overview, booking and train scheduling ui
|
2026-06-10 07:53:15 +00:00 |
|
ghost2023
|
02621d05d8
|
chore: migrate to mantine from shadcn for datatable
|
2026-06-10 10:02:09 +03:00 |
|
Abubeker Yasin
|
66b45ce22c
|
feat(payment-providers): implement Waafi in provider package
|
2026-06-10 09:14:18 +03:00 |
|
Marshal
|
2b5a0f4e96
|
ui design for schedule
|
2026-06-10 00:12:52 +00:00 |
|
Marshal
|
257428be18
|
ui design for schedule
|
2026-06-09 23:25:52 +00:00 |
|
marshal
|
5774d7db9d
|
booking operations and trains scheduling also allocations
|
2026-06-10 00:48:32 +03:00 |
|
Roba Boru
|
dc1443207e
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-09 21:44:13 +03:00 |
|
Stephanos A
|
ceb7f17e88
|
refactor: replace static IDs with UUIDs in seed functions for improved uniqueness
|
2026-06-09 21:43:24 +03:00 |
|
Roba Boru
|
4d52009bd7
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-09 21:00:37 +03:00 |
|
Eyob T.
|
61c1ea64c9
|
Merge pull request #128 from Tria-plc/alpha
seed fix: update last station code and correct route reference in seedTrips and seedFareRules functions
|
2026-06-09 20:38:24 +03:00 |
|
Stephanos A
|
df75c68bf6
|
seed fix: update last station code and correct route reference in seedTrips and seedFareRules functions
|
2026-06-09 20:32:24 +03:00 |
|
Roba Boru
|
98c6914991
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-09 19:13:49 +03:00 |
|
Eyob T.
|
579498aa71
|
Merge pull request #127 from Tria-plc/alpha
EventEmitterModule build issue resolved
|
2026-06-09 17:03:28 +03:00 |
|
Stephanos A
|
89c29e5e90
|
Resolved EventEmitterModule build issue
|
2026-06-09 17:00:17 +03:00 |
|
Stephanos A.
|
983dbde868
|
Merge pull request #126 from Tria-plc/dev
Pull from dev to alpha to get latest changes
|
2026-06-09 16:53:54 +03:00 |
|
Eyob T.
|
dcfb6d6a62
|
Merge pull request #125 from Tria-plc/freigh/fix/dmoney
fix
|
2026-06-09 16:48:13 +03:00 |
|
ghost2023
|
4afe07c19b
|
fix
|
2026-06-09 16:37:11 +03:00 |
|
Stephanos A.
|
9219119ad1
|
Merge pull request #124 from Tria-plc/dev
Pull changes from dev
|
2026-06-09 15:54:06 +03:00 |
|
Eyob T.
|
409870c2f0
|
Merge pull request #123 from Tria-plc/alpha
Seat rendering and other updates
|
2026-06-09 15:34:28 +03:00 |
|
Stephanos A
|
c2bab6cae8
|
Seatmap rendering and other updates
|
2026-06-09 15:22:27 +03:00 |
|
Nathnael Wondisha
|
1440c42f1e
|
Merge branch 'freight/develop' into freight/feat/ui-migration
|
2026-06-09 12:13:03 +03:00 |
|
Nathnael
|
c70c10b0df
|
fixes
|
2026-06-09 08:29:09 +00:00 |
|
ghost2023
|
4566033046
|
style: ui revamp
|
2026-06-09 09:27:14 +03:00 |
|
Hagernesh Tadesse
|
8f99069fb6
|
Merge pull request #121 from Tria-plc/freight/develop
Freight/develop
|
2026-06-08 16:55:57 +03:00 |
|
hagiye
|
eda21e22d8
|
Resolve merge conflicts from Train-Scheduling
|
2026-06-08 16:51:29 +03:00 |
|
Eyosiyas Girma
|
5786952ede
|
Merge pull request #120 from Tria-plc/freight/feature/telebirr-integration
Freight/feature/telebirr integration
|
2026-06-08 16:35:33 +03:00 |
|
Eyosiyas Girma
|
7c5e7408b0
|
Merge branch 'freight/develop' into freight/feature/telebirr-integration
|
2026-06-08 16:35:18 +03:00 |
|
Eyosiyas
|
3a66242f8b
|
working on dmoney
|
2026-06-08 16:29:20 +03:00 |
|
Stephanos A.
|
bf8cc7e6cf
|
Merge pull request #119 from Tria-plc/dev
From dev to alpha
|
2026-06-08 16:23:02 +03:00 |
|
Stephanos A.
|
edcb1b6fb1
|
Update tailwind.config.js (removed malicious code)
|
2026-06-08 16:20:59 +03:00 |
|
Stephanos A.
|
28e9203ccb
|
Update tailwind.config.js (removed malicious code)
|
2026-06-08 16:20:57 +03:00 |
|
Stephanos A.
|
c54aeb5040
|
Merge pull request #118 from Tria-plc/revert-117-dev
Revert "From dev to alpha"
|
2026-06-08 16:12:53 +03:00 |
|
Stephanos A.
|
383b630407
|
Revert "From dev to alpha"
|
2026-06-08 16:11:59 +03:00 |
|
ghost2023
|
41061462ff
|
feat(ui): Integrate Mantine UI library, introduce AppLayout, and refactor dashboard
|
2026-06-08 16:05:03 +03:00 |
|
Stephanos A.
|
00553b7959
|
Merge pull request #117 from Tria-plc/dev
From dev to alpha
|
2026-06-08 16:01:11 +03:00 |
|
Abubeker Yasin
|
1d9c8d5d0d
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev
|
2026-06-08 12:01:59 +03:00 |
|
Abubeker Yasin
|
d07f522a60
|
fix(passenger-api): fix seed errors and add missing stop times
|
2026-06-08 12:00:01 +03:00 |
|
Eyosiyas
|
a1940c4901
|
telebirr out in the payment
|
2026-06-08 11:49:50 +03:00 |
|
Abubeker Yasin
|
f5c9a72521
|
fix(passenger-api): fix seed TypeScript errors for dev
|
2026-06-08 01:35:12 -07:00 |
|
Abubeker Yasin
|
11192b6d49
|
fix(passenger-api): fix seed TypeScript errors for dev
|
2026-06-08 11:35:12 +03:00 |
|
Abubeker Yasin
|
72f8441a2b
|
fix: ( prisma ) remove orphaned TicketSeat migration
|
2026-06-08 10:17:22 +03:00 |
|
marshal
|
675975bc08
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine
|
2026-06-08 10:05:48 +03:00 |
|
marshal
|
88df20be6b
|
change price logic on the ,rule engine ui, auto generate the contrat
|
2026-06-08 10:04:23 +03:00 |
|
Nathnael Wondisha
|
95fb544ec2
|
Merge pull request #116 from Tria-plc/freight/feat/payment
freight/feat/payment
|
2026-06-08 08:52:39 +03:00 |
|