Roba Boru
|
ee8cba0e6d
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-24 13:53:50 +03:00 |
|
Roba Boru
|
3a99b182e0
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-24 13:53:32 +03:00 |
|
Roba Boru
|
350759ce25
|
Fix build errors
|
2026-06-24 13:49:27 +03:00 |
|
yaschalew
|
5eaab8164a
|
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 13:02:42 +03:00 |
|
natib21
|
0e351fa0b4
|
sms
|
2026-06-24 10:02:16 +00:00 |
|
yaschalew
|
967969af65
|
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 12:36:52 +03:00 |
|
natib21
|
9c7300dcac
|
fix
|
2026-06-24 09:35:54 +00:00 |
|
yaschalew
|
86c4e37cc9
|
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 12:34:08 +03:00 |
|
natib21
|
8c3827c70b
|
fix
|
2026-06-24 09:33:37 +00:00 |
|
Abubeker Yasin
|
1dd141f5d7
|
Merge pull request #268 from Tria-plc/alpha
fix: ( seats ) remove IamModule reference from SeatsModule imports
|
2026-06-24 12:32:08 +03:00 |
|
hagiye
|
8ee31789c6
|
merge conflict fix
|
2026-06-24 12:31:59 +03:00 |
|
Abubeker Yasin
|
56c73cd337
|
fix: ( seats ) remove IamModule reference from SeatsModule imports
|
2026-06-24 12:31:34 +03:00 |
|
yaschalew
|
b455d81ede
|
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 12:30:57 +03:00 |
|
yaschalew
|
833e55385d
|
fix
|
2026-06-24 12:30:43 +03:00 |
|
natib21
|
79860c807c
|
fix
|
2026-06-24 09:30:11 +00:00 |
|
Abubeker Yasin
|
799e2f5e8d
|
Merge pull request #267 from Tria-plc/alpha
fix: ( schema ) restore optional Passenger.user
|
2026-06-24 12:26:38 +03:00 |
|
Abubeker Yasin
|
e7bbc8112b
|
fix: ( schema ) restore optional Passenger.user
|
2026-06-24 12:25:42 +03:00 |
|
Abubeker Yasin
|
2208454749
|
Merge pull request #266 from Tria-plc/alpha
fix: ( lock file ) missing @types/luxon entry)
|
2026-06-24 12:18:50 +03:00 |
|
yaschalew
|
d4578f215b
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 12:18:02 +03:00 |
|
Abubeker Yasin
|
a793950800
|
fix: ( lock file ) missing @types/luxon entry)
|
2026-06-24 12:17:59 +03:00 |
|
natib21
|
930fa9e9d9
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 09:17:40 +00:00 |
|
marshal
|
ee94833a9e
|
Merge pull request #265 from Tria-plc/freight_feature/profile
Freight feature/profile
|
2026-06-24 12:16:57 +03:00 |
|
marshal
|
49ae46934a
|
fix(freight-api): call acceptBooking after payment completion
|
2026-06-24 12:16:03 +03:00 |
|
Eyob T.
|
22c6b3d9ae
|
Merge pull request #264 from Tria-plc/alpha
Update seatmap configuration
|
2026-06-24 12:07:09 +03:00 |
|
natib21
|
b1e0a403a6
|
fix
|
2026-06-24 09:02:09 +00:00 |
|
Roba Boru
|
4c9c5f7e2f
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-24 11:56:30 +03:00 |
|
Roba Boru
|
4ac72c3271
|
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-24 11:55:18 +03:00 |
|
Abubeker Yasin
|
3496a041ac
|
Merge pull request #263 from Tria-plc/passenger/feat/iam
Passenger/feat/iam
|
2026-06-24 11:54:12 +03:00 |
|
Abubeker Yasin
|
c79e63231c
|
Merge branch 'dev' into passenger/feat/iam
|
2026-06-24 11:53:33 +03:00 |
|
Roba Boru
|
bdcadeca81
|
Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha
|
2026-06-24 11:53:32 +03:00 |
|
Roba Boru
|
9320e0e9ab
|
Update seatmap configuration
|
2026-06-24 11:50:44 +03:00 |
|
Abubeker Yasin
|
d78b5114ff
|
feat: ( d-money ) create d-money success page
|
2026-06-24 11:49:07 +03:00 |
|
natib21
|
97a5ee61d9
|
Merge branch 'freight/feature/vehicle_2' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 08:43:57 +00:00 |
|
Abubeker Yasin
|
1dfe4b9c37
|
refactor: ( iam ) add public decorator for public endpoins
|
2026-06-24 11:39:31 +03:00 |
|
natib21
|
4f6a925e80
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 08:34:32 +00:00 |
|
natib21
|
9fcbf2783a
|
booking id
|
2026-06-24 08:33:51 +00:00 |
|
yaschalew10
|
99078b7cf2
|
Merge pull request #261 from Tria-plc/freight/feature/vehicle_2
Freight/feature/vehicle 2
|
2026-06-24 11:23:15 +03:00 |
|
yaschalew
|
f99e6b87db
|
Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight/feature/vehicle_2
|
2026-06-24 11:21:44 +03:00 |
|
yaschalew
|
a1b72e591e
|
fix issue
|
2026-06-24 11:21:13 +03:00 |
|
marshal
|
7c2ed993d1
|
Merge pull request #260 from Tria-plc/freight_feature/profile
fix(freight-web): switch API_BASE_URL from localhost to production
|
2026-06-24 11:18:09 +03:00 |
|
natib21
|
7fed72ea7a
|
fix
|
2026-06-24 08:16:24 +00:00 |
|
marshal
|
bd7c97a8a8
|
fix(freight-web): switch API_BASE_URL from localhost to production
|
2026-06-24 11:15:45 +03:00 |
|
marshal
|
741e3e2e45
|
Merge pull request #259 from Tria-plc/freight_feature/profile
Freight feature/profile
|
2026-06-24 11:12:34 +03:00 |
|
marshal
|
b1dfdeb4c5
|
fix(freight-web): comment out unused onBlur prop and UserCheck import
|
2026-06-24 11:09:45 +03:00 |
|
marshal
|
70c30bd17b
|
Merge pull request #258 from Tria-plc/freight_feature/profile
Freight feature/profile
|
2026-06-24 11:04:01 +03:00 |
|
marshal
|
fd4cc8f080
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile
|
2026-06-24 10:58:57 +03:00 |
|
yaschalew10
|
1ec72a879a
|
Merge pull request #256 from Tria-plc/freight/develop
fix hot fix
|
2026-06-24 10:44:42 +03:00 |
|
yaschalew
|
7d1474896e
|
fix hot fix
|
2026-06-24 10:43:25 +03:00 |
|
yaschalew10
|
0d19e090b1
|
Merge pull request #255 from Tria-plc/freight/develop
Freight/develop
|
2026-06-24 10:10:00 +03:00 |
|
yaschalew
|
5897dc342d
|
fix conflict
|
2026-06-24 10:08:19 +03:00 |
|