Commit Graph

1526 Commits

Author SHA1 Message Date
Abubeker Yasin
f16d687d8b Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-24 15:03:55 +03:00
Abubeker Yasin
e2e10e0a44 fix: ( seed ) add @InjectDataSource() to PassengerStaffUsersSeeder constructor 2026-06-24 15:03:48 +03:00
yaschalew
409d79fb6b Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:52:47 +03:00
natib21
23e47c7319 fix 2026-06-24 11:52:17 +00:00
Nathnael
9b48955eaf feat: centralized the user onboaridn requriements 2026-06-24 11:50:28 +00:00
Nathnael
43be6892aa fix: block the user from booking if not approved 2026-06-24 11:50:04 +00:00
yaschalew
66e45d2cd5 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 14:47:33 +03:00
natib21
f1b9989730 fix 2026-06-24 11:47:02 +00:00
Stephanos A
d94e0e9d35 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 14:41:44 +03:00
Stephanos A
3ed748234d fix duplicate entry from schema.prisma 2026-06-24 14:41:38 +03:00
Abubeker Yasin
7d48836f53 Merge pull request #271 from Tria-plc/alpha
fix: ( prisma ) remove duplicated passenger
2026-06-24 14:30:27 +03:00
Abubeker Yasin
cae90919f2 fix: ( prisma ) remove duplicated passenger 2026-06-24 14:29:48 +03:00
Abubeker Yasin
66797be97d Merge pull request #270 from Tria-plc/alpha
Alpha
2026-06-24 14:24:53 +03:00
Abubeker Yasin
0ca94fc4a0 Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-24 14:23:32 +03:00
Abubeker Yasin
dd966df5e9 fix ( lock file and seed ) 2026-06-24 14:23:08 +03:00
Stephanos A
755b8b2939 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 14:18:33 +03:00
Stephanos A
86760933e8 IAM, package, luggage, app health, rate limit, and more 2026-06-24 14:02:51 +03:00
Abubeker Yasin
2f56b3c793 Merge pull request #269 from Tria-plc/alpha
Update pnpm-lock.yaml file
2026-06-24 14:01:59 +03:00
Abubeker Yasin
51c400bb6e Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-06-24 14:01:00 +03:00
Abubeker Yasin
567ba29185 fix: ( migration ) 2026-06-24 14:00:01 +03:00
Roba Boru
ee8cba0e6d Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 13:53:50 +03:00
Roba Boru
3a99b182e0 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 13:53:32 +03:00
Roba Boru
350759ce25 Fix build errors 2026-06-24 13:49:27 +03:00
yaschalew
5eaab8164a Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 13:02:42 +03:00
natib21
0e351fa0b4 sms 2026-06-24 10:02:16 +00:00
yaschalew
967969af65 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:36:52 +03:00
natib21
9c7300dcac fix 2026-06-24 09:35:54 +00:00
yaschalew
86c4e37cc9 Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:34:08 +03:00
natib21
8c3827c70b fix 2026-06-24 09:33:37 +00:00
Abubeker Yasin
1dd141f5d7 Merge pull request #268 from Tria-plc/alpha
fix: ( seats ) remove IamModule reference from SeatsModule imports
2026-06-24 12:32:08 +03:00
hagiye
8ee31789c6 merge conflict fix 2026-06-24 12:31:59 +03:00
Abubeker Yasin
56c73cd337 fix: ( seats ) remove IamModule reference from SeatsModule imports 2026-06-24 12:31:34 +03:00
yaschalew
b455d81ede Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:30:57 +03:00
yaschalew
833e55385d fix 2026-06-24 12:30:43 +03:00
natib21
79860c807c fix 2026-06-24 09:30:11 +00:00
Abubeker Yasin
799e2f5e8d Merge pull request #267 from Tria-plc/alpha
fix: ( schema ) restore optional Passenger.user
2026-06-24 12:26:38 +03:00
Abubeker Yasin
e7bbc8112b fix: ( schema ) restore optional Passenger.user 2026-06-24 12:25:42 +03:00
Abubeker Yasin
2208454749 Merge pull request #266 from Tria-plc/alpha
fix: ( lock file )  missing @types/luxon entry)
2026-06-24 12:18:50 +03:00
yaschalew
d4578f215b Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 12:18:02 +03:00
Abubeker Yasin
a793950800 fix: ( lock file ) missing @types/luxon entry) 2026-06-24 12:17:59 +03:00
natib21
930fa9e9d9 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2 2026-06-24 09:17:40 +00:00
marshal
ee94833a9e Merge pull request #265 from Tria-plc/freight_feature/profile
Freight feature/profile
2026-06-24 12:16:57 +03:00
marshal
49ae46934a fix(freight-api): call acceptBooking after payment completion 2026-06-24 12:16:03 +03:00
Eyob T.
22c6b3d9ae Merge pull request #264 from Tria-plc/alpha
Update seatmap configuration
2026-06-24 12:07:09 +03:00
natib21
b1e0a403a6 fix 2026-06-24 09:02:09 +00:00
Roba Boru
4c9c5f7e2f Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 11:56:30 +03:00
Roba Boru
4ac72c3271 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-24 11:55:18 +03:00
Nathnael
c9694177d8 style: ui improvement to kpi in portal 2026-06-24 08:55:09 +00:00
Abubeker Yasin
3496a041ac Merge pull request #263 from Tria-plc/passenger/feat/iam
Passenger/feat/iam
2026-06-24 11:54:12 +03:00
Abubeker Yasin
c79e63231c Merge branch 'dev' into passenger/feat/iam 2026-06-24 11:53:33 +03:00