Commit Graph

2937 Commits

Author SHA1 Message Date
Abubeker Yasin
500699d65f refactor: ( auth ) comment out the auth 2026-07-14 12:41:12 +03:00
Roba Boru
8ade28f70d pass baseurl to header 2026-07-14 12:26:29 +03:00
Roba Boru
8cc2ad969f Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 12:23:17 +03:00
yaschalew10
61ed332599 Merge pull request #667 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 12:14:19 +03:00
natib21
8a2da09500 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 09:13:29 +00:00
natib21
1b9b4ebb77 fix ui 2026-07-14 09:12:22 +00:00
Abubeker Yasin
149c668e23 Merge pull request #666 from Tria-plc/alpha
refactor: ( sign ) remove auth
2026-07-14 12:03:42 +03:00
Abubeker Yasin
cf7bad1606 Merge pull request #665 from Tria-plc/alpha
refactor: ( sign ) remove auth
2026-07-14 12:02:59 +03:00
Abubeker Yasin
a2465977e0 refactor: ( sign ) remove auth 2026-07-14 12:01:36 +03:00
yaschalew10
0071e43182 Merge pull request #664 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 11:52:01 +03:00
natib21
263195da34 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 08:49:39 +00:00
natib21
246bf940b2 fix ui 2026-07-14 08:49:20 +00:00
natib21
e63e6a2fc0 fix ui 2026-07-14 08:47:46 +00:00
Yonas Tewabe
36849584b0 Add gps-tracker environment configuration 2026-07-14 11:31:24 +03:00
Abubeker Yasin
ebb67679a8 Merge pull request #663 from Tria-plc/dev
m
2026-07-14 11:21:03 +03:00
Abubeker Yasin
17570e9900 Merge pull request #662 from Tria-plc/alpha
Alpha
2026-07-14 11:19:36 +03:00
Abubeker Yasin
4cce471ebe feat: ( cors ) update cors 2026-07-14 11:16:58 +03:00
yaschalew10
e93e2ffd74 Merge pull request #661 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 11:03:37 +03:00
yaschalew
790d3a6286 fix 2026-07-14 11:02:41 +03:00
Stephanos A
68f9dd878d Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha 2026-07-14 11:00:54 +03:00
Stephanos A
6b0f2728f0 Passenger back office support page link restored 2026-07-14 11:00:37 +03:00
natib21
22cf8eabd1 fix ui 2026-07-14 07:59:17 +00:00
Roba Boru
47fdb07019 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 10:47:22 +03:00
Roba Boru
7cb6d028cf Remove rate time 2026-07-14 10:46:27 +03:00
natib21
bf9520ece4 fix ui 2026-07-14 07:45:33 +00:00
SennayT
799d15bf41 Revert "remove throttler again and increase limits"
This reverts commit fdb5e0f74c.
2026-07-14 10:44:21 +03:00
Roba Boru
e7aed5a6e4 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 10:41:59 +03:00
SennayT
fdb5e0f74c remove throttler again and increase limits 2026-07-14 10:40:11 +03:00
SennayT
8f45d7ae1f remove throttler 2026-07-14 10:30:22 +03:00
natib21
0396b6474f fix ui 2026-07-14 07:30:09 +00:00
natib21
359d1091f7 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 07:20:19 +00:00
natib21
1d18248795 ui 2026-07-14 07:20:01 +00:00
yonastewabe
173aad7b5c feat(seo): Add metadata and SEO improvements to passenger portal 2026-07-14 10:16:44 +03:00
robiman
f2e2eab6b4 Merge pull request #660 from Tria-plc/alpha
Fix error message on passenger information
2026-07-14 10:16:10 +03:00
Roba Boru
08950f09c4 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 10:15:30 +03:00
Roba Boru
1f34c06130 Fix error message on passenger information 2026-07-14 10:14:42 +03:00
Yonas Tewabe
3aa4451e00 Merge pull request #658 from Tria-plc/resolve-conflict
Merge to prod
2026-07-14 09:55:52 +03:00
Yonas Tewabe
d980d0dc40 Merge branch 'main' into resolve-conflict 2026-07-14 09:55:18 +03:00
marshal
42f948b835 Merge pull request #659 from Tria-plc/freight_feature/usermanagement
enhance contract clearance and train scheduling logic; add filters fo…
2026-07-14 09:54:00 +03:00
Yonas Tewabe
c361092588 Merge pull request #657 from Tria-plc/seo-enhancement
feat(seo): Add metadata and SEO improvements to passenger portal
2026-07-14 09:07:38 +03:00
yonastewabe
35eb4b37ac feat(seo): Add metadata and SEO improvements to passenger portal 2026-07-14 09:06:43 +03:00
robiman
2ac9f16dcc Merge pull request #656 from Tria-plc/alpha
Updated sms text
2026-07-14 09:04:08 +03:00
Roba Boru
0e18df6ad9 Updated sms text 2026-07-14 09:03:10 +03:00
Marshal
957a185a4d enhance contract clearance and train scheduling logic; add filters for clearance documents and improve booking validation 2026-07-13 21:40:10 +00:00
SennayT
1896c8d36c remove skip for now button 2026-07-14 00:16:06 +03:00
robiman
fe133e3d7f Merge pull request #655 from Tria-plc/alpha
Removed skip for now button from passenger information
2026-07-14 00:15:44 +03:00
Roba Boru
a2f234a128 Removed skip for now button from passenger information 2026-07-14 00:14:54 +03:00
Sennay
b9646be8f1 Merge pull request #654 from Tria-plc/dev
dev to main
2026-07-14 00:13:26 +03:00
robiman
2e558b00c0 Merge pull request #653 from Tria-plc/alpha
Fix voucher alignment
2026-07-13 22:55:30 +03:00
Roba Boru
4ed6fc389e Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-13 22:54:44 +03:00