Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-28 16:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,526 Commits 96 Branches 0 Tags
7af2ecc76eb37f466f193e3a6f8a4e6319df4e3d
Commit Graph

1526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eyob T.
90f86262c0 Merge pull request #175 from Tria-plc/alpha 
Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.124 and its dependencies
 2026-06-16 14:59:03 +03:00
Stephanos A
a61130cd51 Update pnpm-lock.yaml to include '@nestjs/microservices' version 11.1.24 and its dependencies 2026-06-16 14:56:35 +03:00
ghost2023
e0e6020020 fixes 2026-06-16 14:54:07 +03:00
Eyob T.
022da79387 Merge pull request #174 from Tria-plc/alpha 
Request to merge updates on round trip journeys, UAT feedback items, back office documentation
 2026-06-16 14:49:50 +03:00
Stephanos A
eb97c11ddb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:41:33 +03:00
Stephanos A
e03c11e7ee Build issues resolution 2026-06-16 14:41:27 +03:00
Stephanos A
fc5f77c817 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:40:09 +03:00
Yonas Tewabe
7be5be9c54 Update deploy.yml 2026-06-16 14:37:57 +03:00
Eyob T.
232c986cbb Merge pull request #173 from Tria-plc/alpha 
Update email and sms services
 2026-06-16 14:32:18 +03:00
marshal
166067fbe7 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 14:29:17 +03:00
Nathnael Wondisha
c0b6869232 Merge pull request #172 from Tria-plc/freight/fix/fixes 
freight/fix/fixes
 2026-06-16 14:28:24 +03:00
ghost2023
e47340c2c8 fixes 2026-06-16 14:27:17 +03:00
marshal
3ca564f073 simplify build script and add tinymce dependency 2026-06-16 14:26:47 +03:00
Roba Boru
06035a2b94 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 14:22:21 +03:00
Roba Boru
1a71f654b1 Update email and sms services 2026-06-16 14:21:56 +03:00
ghost2023
d6ad094d5a style: use mantine in settings page 2026-06-16 14:19:52 +03:00
ghost2023
b883c2d878 feat(onboarding): Implement company profile creation on Settings page 2026-06-16 14:10:31 +03:00
marshal
811225c05d Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 13:50:54 +03:00
marshal
23272f972a Merge pull request #171 from Tria-plc/freight_feature/priority 
Freight feature/priority
 2026-06-16 13:34:18 +03:00
Stephanos A
75c8423f50 Round trip journeys, feedback items, backoffice documentation 2026-06-16 13:33:03 +03:00
Marshal
3afccbd660 fix priority ui 2026-06-16 10:24:22 +00:00
hagiye
63f177e6d0 Move within warehouses 2026-06-16 12:46:02 +03:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Marshal
0778021d86 implement priority 2026-06-16 09:26:57 +00:00
Hagernesh
d5a536956f Loading queque changes 2026-06-16 09:25:47 +00:00
Eyob T.
22d28340cd Merge pull request #169 from Tria-plc/alpha 
Update telebirr payment method callback page
 2026-06-16 12:23:35 +03:00
Nathnael
7044dcfb43 payment ui for booking 2026-06-16 09:20:31 +00:00
marshal
00d1263f6d fix seed issue 2026-06-16 12:15:48 +03:00
Roba Boru
e9f06a52aa Merge remove changes 2026-06-16 12:14:35 +03:00
Roba Boru
ed49470249 Update telebirr callback page query paramaters 2026-06-16 12:14:10 +03:00
Abubeker Yasin
d65ea24354 Merge pull request #168 from Tria-plc/feat/payment-microservice 
Feat/payment microservice
 2026-06-16 12:09:13 +03:00
Abubeker Yasin
38175cbdb7 Update seed.ts 2026-06-16 12:07:38 +03:00
Hagernesh
314e9b79cc Faciklity add 2026-06-16 09:06:11 +00:00
Marshal
7151bce288 changes 2026-06-16 08:56:52 +00:00
Nathnael
570c5ee125 feat: setted up the renewal contract 2026-06-16 08:51:23 +00:00
hagiye
f5d6d8e7da Batch 1 to 3 implementation 2026-06-16 11:36:24 +03:00
Nathnael
05da2ce27a feat: ui status updates 2026-06-16 08:29:40 +00:00
yaschalew10
0cac604510 Merge pull request #167 from Tria-plc/freight_feature/payments 
Freight feature/payments
 2026-06-16 11:13:03 +03:00
Roba Boru
db54a6870d Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-16 11:13:01 +03:00
marshal
dc5929e7ae changes 2026-06-16 11:11:32 +03:00
marshal
a0dbb4ca6f backoffice cleen up 2026-06-16 11:04:36 +03:00
Abubeker Yasin
06c7fea330 Merge branch 'feat/payment-microservice' into alpha 2026-06-16 11:02:41 +03:00
Abubeker Yasin
8520c3add3 fix: ( payment ) remove /100 2026-06-16 11:02:07 +03:00
yaschalew10
36b9545be2 Merge pull request #166 from Tria-plc/freight/feature/user_management 
Freight/feature/user management
 2026-06-16 10:54:45 +03:00
Abubeker Yasin
e5877e5339 fix: ( telebirr ) fix query status 2026-06-16 10:52:36 +03:00
Yonas Tewabe
3fef810666 Update deploy.yml 2026-06-16 10:27:24 +03:00
Yonas Tewabe
ae967b324c Update deploy.yml 2026-06-16 10:26:01 +03:00
Yonas Tewabe
d0689dfe04 Update deploy.yml 2026-06-16 10:23:51 +03:00
Yonas Tewabe
f52fc44ca1 Update deploy.yml 2026-06-16 10:21:57 +03:00
Nathnael
adba481f23 feat: setted up the schedule in the booking 2026-06-16 07:18:59 +00:00