Commit Graph

4983 Commits

Author SHA1 Message Date
ghost2023
efdcb9a7c8 fix: signup am 2026-06-06 11:45:53 +03:00
ghost2023
5898634cd7 refactor(settings): decompose monolithic SettingsPage into modular tab components 2026-06-06 11:45:53 +03:00
ghost2023
ea040a40cf fix: wrong url 2026-06-06 11:45:53 +03:00
ghost2023
af6804eb91 feat(bookings): implement booking editing functionality 2026-06-06 11:45:53 +03:00
ghost2023
4994e19d57 signup update 2026-06-06 11:45:53 +03:00
Eyosiyas Girma
e067da29df Merge pull request #108 from Tria-plc/freight/feature/payment
providers
2026-06-06 11:45:19 +03:00
Eyosiyas
b5f64bc9ad providers 2026-06-06 11:32:14 +03:00
Abubeker Yasin
b509fccf93 Merge branch 'alpha' into passenger/feat/iam-integration 2026-06-06 11:17:53 +03:00
Michael Abebe
7625c31331 Merge pull request #107 from Tria-plc/freight/fix/train_scheduling
fix(freight): fixed some issues
2026-06-06 11:14:36 +03:00
Michael Abebe
e731051320 fix(freight): fixed some issues 2026-06-06 11:12:59 +03:00
SennayT
74efa96543 update deployment docs 2026-06-06 07:55:24 +00:00
SennayT
7390b6fc31 fix build time environment variables 2026-06-06 07:49:20 +00: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
a39366867a fix(freight): iam module import fix 2026-06-06 10:43:33 +03:00
Michael Abebe
4ae83896d3 dep(freight): iam module upgrade 2026-06-06 10:43:17 +03:00
SennayT
2ef05d2dd7 fix port mapping 2026-06-06 07:39:20 +00:00
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