Commit Graph

2955 Commits

Author SHA1 Message Date
Roba Boru
e785c117e4 Update arrival to terminal text 2026-07-14 16:08:33 +03:00
robiman
452355e292 Merge pull request #674 from Tria-plc/alpha
Fix datetime format
2026-07-14 14:40:40 +03:00
Roba Boru
c7ac6c590e Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:38:20 +03:00
Roba Boru
2b60004195 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:38:11 +03:00
Roba Boru
ec519e128e Fix datetime format 2026-07-14 14:37:57 +03:00
Abubeker Yasin
2d37e2dd17 Merge pull request #673 from Tria-plc/alpha
Alpha
2026-07-14 14:18:47 +03:00
Abubeker Yasin
ef5d643ba4 feat: ( redirect ) add redirect url based on the domain name 2026-07-14 14:16:48 +03:00
marshal
f7f311660b Merge pull request #672 from Tria-plc/freight_feature/usermanagement
train
2026-07-14 14:09:18 +03:00
Marshal
6d0cf50b4d train 2026-07-14 11:06:49 +00:00
Roba Boru
cee06775e1 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:06:02 +03:00
Roba Boru
84fc2ebb1d Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-14 14:05:50 +03:00
Abubeker Yasin
8904c00f6e Merge pull request #671 from Tria-plc/alpha
Update main.ts
2026-07-14 12:50:09 +03:00
Abubeker Yasin
1ace808b4a Update main.ts 2026-07-14 12:49:15 +03:00
Abubeker Yasin
8849c0959d Merge pull request #670 from Tria-plc/alpha
Alpha
2026-07-14 12:44:43 +03:00
Abubeker Yasin
500699d65f refactor: ( auth ) comment out the auth 2026-07-14 12:41:12 +03:00
yaschalew10
e56498a46f Merge pull request #669 from Tria-plc/freight/feature/user_management_UI
Freight/feature/user management UI
2026-07-14 12:30:11 +03:00
natib21
81bce1da31 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/user_management_UI 2026-07-14 09:29:11 +00:00
robiman
5c8e5cbbfe Merge pull request #668 from Tria-plc/alpha
pass baseurl to header
2026-07-14 12:28:36 +03:00
natib21
a48e830584 fix ui 2026-07-14 09:27:44 +00: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