Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,216 Commits 96 Branches 0 Tags
export-train-loading
Commit Graph

205 Commits

Author SHA1 Message Date
marshal
10364fe924 ass signature on the profile 2026-06-16 17:30:22 +03:00
Nathnael Wondisha
b82e4ac46e Merge branch 'dev' into freight/develop 2026-06-16 16:22:38 +03:00
Stephanos A
a61130cd51 Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.1.24 and its dependencies 2026-06-16 14:56:35 +03:00
marshal
3ca564f073 simplify build script and add tinymce dependency 2026-06-16 14:26:47 +03:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00
ghost2023
9aecbb6508 feat(booking): Implement train schedule selection and update booking data structures 2026-06-15 09:56:59 +03:00
marshal
484151d909 payments 2026-06-14 15:59:52 +03:00
Eyob T.
39e32f4e0a Merge pull request #154 from Tria-plc/alpha 
Merge request for lock file and lint issues resolution
 2026-06-14 15:36:39 +03:00
Stephanos A
9c7f42982f Lockfile and lint issues resolution 2026-06-14 15:29:37 +03:00
marshal
c03d0ef3ab Merge branch 'feat/payment-microservice' of github.com:Tria-plc/edr-platform into freight_feature/payments 2026-06-14 02:38:19 +03:00
Abubeker Yasin
c35b5089ce refactor: ( payment ) use rabbitmq for webhooks event 2026-06-13 20:19:23 +03:00
yaschalew
eee7b719b0 user management 2026-06-13 14:32:26 +03:00
yaschalew
12b6406d23 fix conflict 2026-06-13 10:45:26 +03:00
yaschalew10
9076664545 Merge pull request #142 from Tria-plc/freight/feat/ui-migration 
UI migration Again
 2026-06-12 15:24:46 +03:00
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