Commit Graph

1089 Commits

Author SHA1 Message Date
Abubeker Yasin
1eaffa7ba0 feat: ( passenger ) wire IAM global guard, org seeder, and backoffice auth 2026-06-23 14:25:10 +03:00
Abubeker Yasin
707e32c43c feat: ( iam ) update the iam package 2026-06-23 09:43:12 +03:00
Abubeker Yasin
bb55194b54 Merge branch 'alpha' into passenger/feat/iam 2026-06-23 09:35:50 +03:00
Abubeker Yasin
fd0f1d27d8 remove malware 2026-06-23 08:50:34 +03:00
Abubeker Yasin
f15b6f6ed5 Merge pull request #245 from Tria-plc/feat/veriFayda-integration
feat: ( fayda ) implement verify with fayda
2026-06-23 06:00:49 +03:00
Abubeker Yasin
44ae3f8a67 feat: ( fayda ) implement verify with fayda 2026-06-23 05:52:41 +03:00
Abubeker Yasin
f0d9c95956 Merge branch 'dev' into passenger/feat/iam 2026-06-22 21:01:08 +03:00
Abubeker Yasin
aede976973 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev 2026-06-22 20:09:56 +03:00
Eyob T.
e6cdefdf69 Merge pull request #244 from Tria-plc/alpha
Added manage booking,voucher download options and fix email and phone number for guest user
2026-06-22 18:34:44 +03:00
Yonas Tewabe
be1461c792 Update deployment workflow to use dynamic runner 2026-06-22 17:00:57 +03:00
Muluhabt
ee90d178ae Adding local packages 2026-06-22 16:52:49 +03:00
Roba Boru
9cfd0fc2eb Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:55 +03:00
Roba Boru
aadf1644fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-22 16:46:44 +03:00
Roba Boru
1456ca7e9c Added download voucher option and manage booking 2026-06-22 16:46:24 +03:00
Eyob T.
25bba23579 Merge pull request #240 from Tria-plc/fix/security_patch
Fix/security patch
2026-06-22 15:12:33 +03:00
Eyob T.
f06526cfd6 Merge pull request #237 from Tria-plc/fix/security_patch
Fix/security patch
2026-06-22 15:07:19 +03:00
Eyob T.
6108e7bb67 Security patch
Remove specific temporary files from .gitignore.
2026-06-22 15:06:40 +03:00
Eyob T.
8d0080f074 Security patch 2026-06-22 15:06:08 +03:00
Abubeker Yasin
4b3c47ca03 refactor: ( iam ) remove user relations 2026-06-22 15:01:16 +03:00
Abubeker Yasin
a63b49d419 Revert "pass test"
This reverts commit 82900219d2.
2026-06-22 13:34:46 +03:00
Abubeker Yasin
82900219d2 pass test 2026-06-22 13:34:20 +03:00
Abubeker Yasin
e2071b4ff3 fix(iam): resolve post-merge type errors, migration drift, and IAM integration bugs 2026-06-22 12:12:35 +03:00
Abubeker Yasin
7108035f7e fix: ( iam ) resolve post-merge type errors and apply IAM column migrations 2026-06-22 11:22:57 +03:00
Abubeker Yasin
177e1cea8d Merge branch 'dev' into passenger/feat/iam 2026-06-22 10:12:39 +03:00
Yonas Tewabe
25d160d39e Update .gitignore 2026-06-22 09:16:58 +03:00
Abubeker Yasin
51a7651eb1 Merge pull request #226 from Tria-plc/alpha
fix: ( payment ) change the amount to number
2026-06-20 09:28:59 +03:00
Abubeker Yasin
45383a4f43 Merge pull request #226 from Tria-plc/alpha 2026-06-19 23:28:59 -07:00
Abubeker Yasin
77ab3cf632 fix: ( payment ) change the amount to number 2026-06-20 09:27:46 +03:00
marshal
93ec1fbdbb Merge pull request #225 from Tria-plc/freight/develop
Freight/develop
2026-06-19 16:13:54 +03:00
marshal
aaaa8eed4f Merge pull request #224 from Tria-plc/freight_feature/priority
Freight feature/priority
2026-06-19 16:11:36 +03:00
marshal
ca5877d25a Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-19 15:58:36 +03:00
marshal
85110adc3f Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-19 15:57:26 +03:00
Abubeker Yasin
ae26333dca Merge pull request #223 from Tria-plc/alpha
Alpha
2026-06-19 15:50:37 +03:00
Abubeker Yasin
2288a9efda feat: ( notifications ) add payment/cancellation events and ticket confirmation 2026-06-19 15:49:30 +03:00
Nathnael Wondisha
f8cb3ecd06 Merge pull request #222 from Tria-plc/freight/feat/company-profile
Freight/feat/company profile
2026-06-19 15:35:51 +03:00
Nathnael
653f39ec65 feat: add the company profile support to the ui 2026-06-19 12:32:55 +00:00
Nathnael
7ce5f23005 style: profile page ui improvment 2026-06-19 12:32:55 +00:00
Nathnael
9284e72c14 fix: document uploaded 2026-06-19 12:32:55 +00:00
Nathnael
8e278a3bd6 feat: add company selection to settings onboarding 2026-06-19 12:32:55 +00:00
Marshal
3591abd27f feat(bookings): enhance booking details with consolidation notices and streamline form handling 2026-06-19 10:45:11 +00:00
Abubeker Yasin
fcbc59e95b refactor: ( notifications ) remove dead SendGrid/Twilio adapters and legacy code 2026-06-19 11:41:31 +03:00
Abubeker Yasin
a2b2ed787e fix: ( sms ) change the key sms to text 2026-06-19 11:17:56 +03:00
Abubeker Yasin
525e724461 fix: ( payment ) pass major amount to the payment provider 2026-06-19 10:19:11 +03:00
yaschalew10
9de10fd3a6 Merge pull request #221 from Tria-plc/freight/hotfix_3
fix file upload
2026-06-19 08:49:42 +03:00
yaschalew
5e1d53b866 fix file upload 2026-06-19 08:48:58 +03:00
Abubeker Yasin
c8e6e4a326 Merge pull request #220 from Tria-plc/alpha
fix: ( notification ) add notification templet and fix issues
2026-06-19 06:13:37 +03:00
Abubeker Yasin
42c020c97a fix: ( notification ) add notification templet and fix issues 2026-06-19 06:12:46 +03:00
marshal
f1dfbbcc3f Replace EDR logo image with Train icon in FreightSidebar 2026-06-19 01:13:52 +03:00
marshal
72b63c319e - Fix shipping line mapping to use ID instead of name in EditBookingPage and NewBookingPage 2026-06-19 01:07:05 +03:00
marshal
1a3d85e46a Remove unused ArrowLeft icon import from PaymentFailurePage 2026-06-19 00:53:29 +03:00