Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-27 15:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,216 Commits 96 Branches 0 Tags
fix/security_patch
Commit Graph

4216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Abubeker Yasin
254d2a171c refactor( iam ): remove local auth service delegate OTP and password reset to IAM 2026-06-06 10:23:53 +03:00
marshal
3e3841cf6f changes 2026-06-06 10:08:55 +03:00
marshal
0794a77678 changes 2026-06-06 10:01:40 +03:00
SennayT
5a4f5969d4 fix port mapping 2026-06-06 09:56:57 +03:00
Michael Abebe
c8768ba70b Merge remote-tracking branch 'origin/freight/develop' into freight/develop 2026-06-06 09:45:10 +03:00
Michael Abebe
c31d87fc35 dep(freight): updated iam imports 2026-06-06 09:45:00 +03:00
SennayT
4b223fc02b remove paths in github actions 2026-06-06 09:40:39 +03:00
marshal
347774b7f6 change shadcn to mantine 2026-06-06 09:39:52 +03:00
Sennay
ae8fb3f639 Merge pull request #106 from Tria-plc/feat/nextjs-fixes 
fix passenger frontend bug
 2026-06-06 09:37:35 +03:00
SennayT
2ea87fff64 fix passenger frontend bug 2026-06-06 06:36:50 +00:00
Marshal
053b4f35c5 changes 2026-06-06 06:32:04 +00:00
Nathnael Wondisha
bf36e55040 Merge pull request #105 from Tria-plc/freight/feat/contract-signuture 
freight/feat/contract signuture
 2026-06-06 09:12:46 +03:00
ghost2023
da0f1e4cc9 feat(bookings): enhance contract viewer and backoffice UI consistency 2026-06-06 09:11:30 +03:00
ghost2023
7a19a161e1 fix: redirects 2026-06-06 09:11:30 +03:00
ghost2023
f356c00ba2 fix: booking api url s 2026-06-06 09:11:30 +03:00
Abubeker Yasin
023522c3fb refactor( iam ): migrate session, logout, and guards to IAM 2026-06-06 08:58:42 +03:00
Abubeker Yasin
d06debf1ca feat( iam ): integrate IAM for auth — register, login, lazy provisioning 2026-06-06 08:29:26 +03:00
Eyosiyas Girma
06276764e0 Merge pull request #104 from Tria-plc/freight/feature/payment 
minor update
 2026-06-06 08:17:29 +03:00
Eyosiyas Girma
10f3c517f3 Merge branch 'freight/develop' into freight/feature/payment 2026-06-06 08:17:17 +03:00
Tria
828f93d160 minor update 2026-06-06 08:13:38 +03:00
Hagernesh Tadesse
08fc53899a Merge pull request #103 from Tria-plc/feature/trains-management 
feat: complete train scheduling integration
 2026-06-06 05:56:22 +03:00
hagiye
788de5381e feat: complete train scheduling integration 2026-06-06 05:52:47 +03:00
Roba Boru
052676b934 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-05 22:01:29 +03:00
Abubeker Yasin
1d11cbda4d feat: ( payment ) create payment microservice 2026-06-05 21:29:55 +03:00
Hagernesh Tadesse
29247d4140 Merge pull request #102 from Tria-plc/feature/trains-management 
Feature/trains management
 2026-06-05 21:15:15 +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
Marshal
f8270175a2 fix the seed for rules 2026-06-05 17:25:44 +00:00
Marshal
67037ba748 fix the seed for rules 2026-06-05 17:25:16 +00:00
Eyosiyas Girma
04d79cd568 Merge pull request #101 from Tria-plc/freight/feature/payment 
Freight/feature/payment
 2026-06-05 17:36:19 +03:00
Tria
ebe59f491a payment | webhook 2026-06-05 17:34:33 +03:00
Tria
6786bdd210 receipt template 2026-06-05 17:23:21 +03:00
Tria
620607e50c add fan number 2026-06-05 15:59:12 +03:00
Tria
21bc6948e8 receipt 2026-06-05 15:56:29 +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
Sennay
c4348986d1 Merge pull request #100 from Tria-plc/feat/nextjs-fixes 
Feat/nextjs fixes
 2026-06-05 14:51:54 +03:00
SennayT
aa7d655a2d use next start for deployment 2026-06-05 11:41:11 +00:00
SennayT
b233fc42a6 add a pnpm deploy step 2026-06-05 11:33:18 +00:00
SennayT
b6136b0a65 modify nextjs deployment 2026-06-05 11:28:33 +00: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
marshal
55a1d45f58 Merge pull request #99 from Tria-plc/freight_feature/booking_flow 
Freight feature/booking flow
 2026-06-05 14:08:03 +03:00
marshal
35c9bdfce4 resolve confilict 2026-06-05 14:07:26 +03:00
Abubeker Yasin
04765bdd78 fix: ( migration ) Create migration.sql 2026-06-05 14:01:56 +03:00
marshal
d59c192137 resolve confilict 2026-06-05 13:06:16 +03:00
Eyosiyas Girma
21d443db15 Merge pull request #98 from Tria-plc/freight/feature/payment 
Freight/feature/payment
 2026-06-05 13:02:06 +03:00
Eyosiyas Girma
03a997fad2 Merge branch 'freight/develop' into freight/feature/payment 2026-06-05 13:01:42 +03:00
Tria
02018c339d payment 2026-06-05 12:57:44 +03:00
Tria
c0dc9f5fc5 payment 2026-06-05 12:54:35 +03:00
ghost2023
2760e715c7 feat: add more statuses to the booking deailt page and added handling of request approval 2026-06-05 11:40:44 +03:00