Abubeker Yasin
|
ef7b85c8cb
|
feat: ( payment ) integrate the passenger to payment microservice
|
2026-06-12 11:47:11 +03:00 |
|
Marshal
|
cde3e462ba
|
automate the schedule
|
2026-06-11 19:42:23 +00:00 |
|
Abubeker Yasin
|
2b430f8e76
|
feat: ( payment ) create payment microservice
|
2026-06-11 15:25:24 +03:00 |
|
ghost2023
|
2250a468cb
|
style: ui fixes
|
2026-06-11 09:24:06 +03:00 |
|
Abubeker Yasin
|
fc5024c6f3
|
chore: ( iam ) update iam package
|
2026-06-09 14:29:27 +03:00 |
|
Nathnael Wondisha
|
1440c42f1e
|
Merge branch 'freight/develop' into freight/feat/ui-migration
|
2026-06-09 12:13:03 +03:00 |
|
ghost2023
|
41061462ff
|
feat(ui): Integrate Mantine UI library, introduce AppLayout, and refactor dashboard
|
2026-06-08 16:05:03 +03:00 |
|
Abubeker Yasin
|
c1dcfb04c3
|
refactor( iam ): migrate guest booking to IAM; make Passenger.userId nullable
|
2026-06-08 15:27:32 +03:00 |
|
Eyosiyas
|
a1940c4901
|
telebirr out in the payment
|
2026-06-08 11:49:50 +03:00 |
|
Abubeker Yasin
|
ac153fb0d0
|
chore( iam ): remove dead auth DTOs and @nestjs/jwt; migrate fayda/passenger to iamUserId
|
2026-06-08 09:02:54 +03:00 |
|
Abubeker Yasin
|
b509fccf93
|
Merge branch 'alpha' into passenger/feat/iam-integration
|
2026-06-06 11:17:53 +03:00 |
|
marshal
|
b62ea3f95f
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine
|
2026-06-06 10:45:34 +03:00 |
|
marshal
|
7acca2345b
|
changes
|
2026-06-06 10:45:26 +03:00 |
|
Michael Abebe
|
4ae83896d3
|
dep(freight): iam module upgrade
|
2026-06-06 10:43:17 +03:00 |
|
marshal
|
3e3841cf6f
|
changes
|
2026-06-06 10:08:55 +03:00 |
|
marshal
|
0794a77678
|
changes
|
2026-06-06 10:01:40 +03:00 |
|
Michael Abebe
|
c31d87fc35
|
dep(freight): updated iam imports
|
2026-06-06 09:45:00 +03:00 |
|
marshal
|
347774b7f6
|
change shadcn to mantine
|
2026-06-06 09:39:52 +03:00 |
|
Marshal
|
053b4f35c5
|
changes
|
2026-06-06 06:32:04 +00:00 |
|
Abubeker Yasin
|
d06debf1ca
|
feat( iam ): integrate IAM for auth — register, login, lazy provisioning
|
2026-06-06 08:29:26 +03:00 |
|
Abubeker Yasin
|
1d11cbda4d
|
feat: ( payment ) create payment microservice
|
2026-06-05 21:29:55 +03:00 |
|
hagiye
|
55e6ca4a3f
|
Merge branch 'freight/develop' of https://github.com/Tria-plc/edr-platform into feature/trains-management
|
2026-06-05 21:07:36 +03:00 |
|
hagiye
|
dc42838a43
|
Trains management CRUD issues solved
|
2026-06-05 21:07:04 +03:00 |
|
Nathnael Wondisha
|
4a0dee9b7b
|
Merge pull request #97 from Tria-plc/freight/feat/booking-pricing
Booking request approval ui
|
2026-06-05 15:02:24 +03:00 |
|
hagiye
|
9676a6bb56
|
resolve conflict
|
2026-06-05 14:17:48 +03:00 |
|
hagiye
|
c3e92dbe70
|
resolve conflict
|
2026-06-05 14:13:35 +03:00 |
|
Eyosiyas Girma
|
03a997fad2
|
Merge branch 'freight/develop' into freight/feature/payment
|
2026-06-05 13:01:42 +03:00 |
|
Tria
|
c0dc9f5fc5
|
payment
|
2026-06-05 12:54:35 +03:00 |
|
ghost2023
|
6e4b70be34
|
chore: install date-fns
|
2026-06-05 11:28:43 +03:00 |
|
hagiye
|
b33517f47d
|
resolve conflict
|
2026-06-05 10:59:52 +03:00 |
|
hagiye
|
c66b57d599
|
Merge freight/develop into feature/trains-management
|
2026-06-05 10:21:39 +03:00 |
|
ghost2023
|
c7617b1b6e
|
chore: deps
|
2026-06-05 09:51:12 +03:00 |
|
hagiye
|
71ac89edc7
|
trains, wagons,containers and cargoes schema and API
|
2026-06-04 15:56:29 +03:00 |
|
marshal
|
324935a334
|
implement booking flow
|
2026-06-04 15:24:18 +03:00 |
|
marshal
|
125ee18308
|
implement booking flow
|
2026-06-04 15:16:27 +03:00 |
|
Stephanos A
|
87a27677d9
|
Passenger portal UI and UX updates: landing mini site added
|
2026-06-04 13:45:23 +03:00 |
|
Tria
|
da10d067f8
|
multiple notification strategies
|
2026-06-03 16:17:36 +03:00 |
|
Abubeker Yasin
|
106e69fb5c
|
Update pnpm-lock.yaml
|
2026-06-03 14:57:53 +03:00 |
|
Abubeker Yasin
|
785623fcbb
|
refactor: ( passenger-api.auth ) remove the existing auth module
|
2026-06-03 10:12:08 +03:00 |
|
Stephanos A.
|
03387fb226
|
Revert "Build related issues resolution"
|
2026-06-02 19:40:54 +03:00 |
|
Stephanos A
|
5c59ea8e76
|
Merge branch 'dev' into alpha
|
2026-06-02 19:32:11 +03:00 |
|
Stephanos A
|
dcba12993f
|
Build related issues resolution
|
2026-06-02 19:14:34 +03:00 |
|
SennayT
|
d21a040233
|
include freight api in workspace and fix pnpm lockfile
|
2026-06-02 11:28:33 +03:00 |
|
hagiye
|
d52a5715e0
|
Rate Matrix Rules user story
|
2026-06-02 10:47:36 +03:00 |
|
Abubeker Yasin
|
092199f536
|
feat(passenger-api): integrate @tria-plc IAM package (dual-ORM iam schema + package auth guard)
|
2026-06-02 09:30:46 +03:00 |
|
hagiye
|
3682bda85c
|
rule engine UI, services and API integration
|
2026-06-01 16:01:51 +03:00 |
|
Stephanos A
|
7b92983a13
|
Merge branch 'dev' into alpha
|
2026-05-31 14:01:14 +03:00 |
|
Stephanos A
|
5059a1fe58
|
First passenger and back office portal commit
|
2026-05-31 13:15:44 +03:00 |
|
hagiye
|
ccbc642075
|
rure engine
|
2026-05-30 11:19:40 +03:00 |
|
yaschalew
|
ac35218299
|
add docs settings to admin page
|
2026-05-29 16:50:55 +03:00 |
|