Nathnael
|
3bc4514b04
|
feat: implemented the changes request to the company profile to backoffice
|
2026-07-08 08:07:10 +00:00 |
|
Nathnael
|
2cae451edc
|
feat: implemented the changes request to the company profile
|
2026-07-08 08:06:50 +00:00 |
|
Nathnael
|
1dba962502
|
Merge branch 'dev' into freight/feat/fixes-v1
|
2026-07-08 07:50:24 +00:00 |
|
Nathnael Wondisha
|
01cd8fcc3a
|
Merge pull request #534 from Tria-plc/freight/feat/chat-app
fix: backoffice socket
|
2026-07-08 10:26:49 +03:00 |
|
Nathnael
|
32aaa77d50
|
fix: backoffice socket
|
2026-07-08 07:25:34 +00:00 |
|
Hagernesh Tadesse
|
c32f34085a
|
Merge pull request #533 from Tria-plc/Truckdetantion
Truckdetantion
|
2026-07-08 10:19:09 +03:00 |
|
Hagernesh
|
9ffc8bfb0b
|
Notify customer on Sign handover, truck assignment, arrival and dispatch of train
|
2026-07-08 07:07:33 +00:00 |
|
Hagernesh
|
ba821b06ca
|
Warehouse and customer truck edit and KG to Tons
|
2026-07-08 07:00:23 +00:00 |
|
Nathnael Wondisha
|
22a2a770d2
|
Merge pull request #531 from Tria-plc/freight/feat/chat-app
chore: enable polling to the socket.io on the passenger clients
|
2026-07-08 09:52:27 +03:00 |
|
Nathnael
|
15b8068b9e
|
chore: enable polling to the socket.io on the passenger clients
|
2026-07-08 06:50:44 +00:00 |
|
Nathnael Wondisha
|
59b6f8d07a
|
Merge pull request #530 from Tria-plc/freight/feat/chat-app
fix: websocket fix attempt
|
2026-07-08 09:39:30 +03:00 |
|
Nathnael
|
972b1e973a
|
fix: websocket fix attempt
|
2026-07-08 06:38:24 +00:00 |
|
Abubeker Yasin
|
5ca01c546f
|
Merge pull request #529 from Tria-plc/alpha
refactor: ( iam ) revert deleted EDR-branded OTP SMS messages
|
2026-07-08 09:38:24 +03:00 |
|
Abubeker Yasin
|
9e208861c7
|
refactor: ( iam ) revert deleted EDR-branded OTP SMS messages
|
2026-07-08 09:33:24 +03:00 |
|
Stephanos A.
|
32c9518821
|
Merge pull request #527 from Tria-plc/alpha
Production cleanups
|
2026-07-08 09:02:00 +03:00 |
|
Stephanos A
|
c7403e1a1e
|
Production cleanups
|
2026-07-08 09:01:07 +03:00 |
|
Nathnael Wondisha
|
2c12f02862
|
Merge pull request #526 from Tria-plc/freight/feat/chat-app
feat: make the support require nothing
|
2026-07-08 08:41:08 +03:00 |
|
Nathnael
|
a817976db8
|
feat: make the support require nothing
|
2026-07-08 05:33:02 +00:00 |
|
Hagernesh Tadesse
|
7712340c51
|
Merge pull request #525 from Tria-plc/Truckdetantion
Container truck assignment on customer portal for import
|
2026-07-08 07:41:22 +03:00 |
|
Hagernesh
|
3f6b9ac974
|
Container truck assignment on customer portal for import
|
2026-07-08 04:36:03 +00:00 |
|
marshal
|
d1ef079705
|
Merge pull request #524 from Tria-plc/freight_feature/usermanagement
add reference field to train schedules and implement unique sequence …
|
2026-07-08 02:07:40 +03:00 |
|
Marshal
|
9dd9ace313
|
add reference field to train schedules and implement unique sequence generation
|
2026-07-07 23:06:44 +00:00 |
|
marshal
|
1d946a2fdc
|
Merge pull request #523 from Tria-plc/freight_feature/usermanagement
resolve conflict
|
2026-07-08 01:25:17 +03:00 |
|
Marshal
|
88b1e548a2
|
resolve conflict
|
2026-07-07 22:24:42 +00:00 |
|
marshal
|
719f017a82
|
Merge pull request #522 from Tria-plc/freight_feature/usermanagement
feat: add isGeneral flag to identify general contracts in NewContract…
|
2026-07-08 00:58:53 +03:00 |
|
Marshal
|
70a917510e
|
feat: add isGeneral flag to identify general contracts in NewContractPage
|
2026-07-07 21:58:06 +00:00 |
|
marshal
|
8128ae6164
|
Merge pull request #521 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
|
2026-07-08 00:47:23 +03:00 |
|
Stephanos A.
|
4693d0f17c
|
Merge pull request #520 from Tria-plc/alpha
Set nationality required on booking widget
|
2026-07-08 00:46:38 +03:00 |
|
Marshal
|
94904ea6d0
|
resolve conflict
|
2026-07-07 21:46:25 +00:00 |
|
Stephanos A
|
63fa6996b1
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-07-08 00:43:24 +03:00 |
|
Stephanos A
|
73e8dc19b3
|
Fare engine formula updates
|
2026-07-08 00:43:05 +03:00 |
|
Marshal
|
518eec6286
|
enhance train scheduling and booking management
|
2026-07-07 21:42:59 +00:00 |
|
Marshal
|
87a95b37bf
|
enhance train scheduling and booking management
|
2026-07-07 21:38:45 +00:00 |
|
Roba Boru
|
324c2c9360
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-07 23:57:04 +03:00 |
|
Roba Boru
|
88fca8a78e
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-07 23:56:51 +03:00 |
|
Roba Boru
|
8f23f85e63
|
Set nationality required on booking widget
|
2026-07-07 23:55:35 +03:00 |
|
Abubeker Yasin
|
d10f0c800b
|
Merge pull request #518 from Tria-plc/alpha
fix: ( telebirr ) remove hard coded private key
|
2026-07-07 23:43:12 +03:00 |
|
Abubeker Yasin
|
08fe2bfac6
|
fix: ( telebirr ) remove hard coded private key
|
2026-07-07 23:38:40 +03:00 |
|
Abubeker Yasin
|
4aafa6e08d
|
Merge pull request #517 from Tria-plc/alpha
Fix duplicate hold seat
|
2026-07-07 23:34:58 +03:00 |
|
Roba Boru
|
15d96ab2b4
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-07 23:06:58 +03:00 |
|
Roba Boru
|
18043de7a2
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-07 23:06:40 +03:00 |
|
Roba Boru
|
1970eb7b9c
|
Fix duplicate hold seat
|
2026-07-07 23:05:45 +03:00 |
|
Stephanos A.
|
8af7e66133
|
Merge pull request #516 from Tria-plc/alpha
Alpha
|
2026-07-07 22:59:33 +03:00 |
|
Stephanos A
|
46d0d63611
|
Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha
|
2026-07-07 22:58:11 +03:00 |
|
Stephanos A
|
8cc2d9445d
|
Manuel ticket generation, seat management by route added
|
2026-07-07 22:58:01 +03:00 |
|
Eyob T.
|
2abf418630
|
Merge pull request #515 from Tria-plc/alpha
Update manage booking
|
2026-07-07 21:50:12 +03:00 |
|
Marshal
|
8addfdf3e2
|
changes
|
2026-07-07 18:40:32 +00:00 |
|
Roba Boru
|
b2218f383e
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-07 21:20:55 +03:00 |
|
Roba Boru
|
84169776b3
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-07-07 21:19:56 +03:00 |
|
Roba Boru
|
bf3fa746eb
|
Update manage booking
|
2026-07-07 21:19:04 +03:00 |
|