Michael Abebe
|
c0fc66729b
|
feat(freight:backoffice): Added employees page
|
2026-05-28 11:44:58 +03:00 |
|
Michael Abebe
|
6841c3f4d8
|
feat(freight:backoffice): group roles by apps
|
2026-05-28 10:57:20 +03:00 |
|
Michael Abebe
|
2ccbfe324f
|
feat(freight:backoffice): Added permissions and roles pages under user-management dashboard
|
2026-05-28 10:44:41 +03:00 |
|
yaschalew10
|
49a746b272
|
Merge pull request #42 from Tria-plc/freight/feature/user_registration
Freight/feature/user registration
|
2026-05-28 08:45:48 +03:00 |
|
yaschalew
|
217069fb74
|
fix conflict
|
2026-05-28 08:44:26 +03:00 |
|
yaschalew
|
4bacbaa96c
|
add route
|
2026-05-28 08:41:12 +03:00 |
|
yaschalew10
|
ee80d597c1
|
Merge pull request #40 from Tria-plc/freight/feature/bootstrap_backoffice
Freight/feature/bootstrap backoffice
|
2026-05-26 14:49:49 +03:00 |
|
Michael Abebe
|
cad3dd8e2d
|
fix(freight:api): fixed removed seeder in merge
|
2026-05-26 13:47:58 +03:00 |
|
Michael Abebe
|
39c3f3cf43
|
Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice
|
2026-05-26 13:37:34 +03:00 |
|
Michael Abebe
|
54b122bb3a
|
feat(freight:backoffice): added position type
|
2026-05-26 13:35:49 +03:00 |
|
Michael Abebe
|
b487d47055
|
feat(freight:backoffice): migrated smart-office user-management
|
2026-05-26 12:50:40 +03:00 |
|
yaschalew
|
ffd38f8025
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight/feature/user_registration
|
2026-05-26 10:16:41 +03:00 |
|
yaschalew
|
8a7a56766f
|
add onboarding
|
2026-05-26 10:15:59 +03:00 |
|
yaschalew10
|
589bf33091
|
Merge pull request #39 from Tria-plc/freight_feature/booking/minio
add signed url
|
2026-05-26 09:36:01 +03:00 |
|
marshal
|
37b0c48cc0
|
add signed url
|
2026-05-26 09:34:44 +03:00 |
|
marshal
|
f23d570427
|
changes
|
2026-05-26 09:24:47 +03:00 |
|
yaschalew
|
5a4d6baec2
|
user account create
|
2026-05-26 05:40:53 +03:00 |
|
hagiye
|
f90e5e0e1c
|
company detail api and frontend
|
2026-05-26 01:06:06 +03:00 |
|
Michael Abebe
|
a8d26b73b8
|
ui update
|
2026-05-25 16:27:54 +03:00 |
|
Michael Abebe
|
235b4b9a93
|
Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice
|
2026-05-25 15:53:35 +03:00 |
|
Michael Abebe
|
516d2c8b45
|
feat(freight:backoffice): added org structure managemnet
|
2026-05-25 15:50:47 +03:00 |
|
yaschalew10
|
ab1dfe0c16
|
Merge pull request #38 from Tria-plc/freight_feature/booking/minio
implement file module and add files relation to booking entity and po…
|
2026-05-25 10:58:56 +03:00 |
|
marshal
|
9432814e3b
|
implement file module and add files relation to booking entity and populate on fetch
|
2026-05-25 10:19:08 +03:00 |
|
Nathnael Wondisha
|
879e277cfc
|
Merge pull request #37 from Tria-plc/freight/feature/ui-intergration
freight/feature/ui intergration
|
2026-05-23 11:55:13 +03:00 |
|
ghost2023
|
dc41da3731
|
feat: wire up the create booking form
|
2026-05-23 11:54:13 +03:00 |
|
ghost2023
|
8a5652d7d9
|
feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs
|
2026-05-23 11:21:17 +03:00 |
|
yaschalew10
|
a252b88dfb
|
Merge pull request #36 from Tria-plc/freight/features/dynamic-terminal-component
Freight/features/dynamic terminal component
|
2026-05-23 11:13:24 +03:00 |
|
yaschalew10
|
a80f64e772
|
Merge pull request #35 from Tria-plc/freight_feature/booking/minio
feat(bookings): support multiple containers per booking via JSONB array
|
2026-05-23 11:10:29 +03:00 |
|
marshal
|
ae317540c1
|
feat(bookings): support multiple containers per booking via JSONB array
|
2026-05-23 11:08:35 +03:00 |
|
mengstabketemaw
|
cf3869ef66
|
features: dynamic terminal components
|
2026-05-23 11:08:05 +03:00 |
|
mengstabketemaw
|
3485ef299d
|
fix local merge conflict
|
2026-05-23 10:52:31 +03:00 |
|
yaschalew10
|
578f6f84ef
|
Merge pull request #34 from Tria-plc/freight_feature/booking/minio
change the schema from public to freight
|
2026-05-23 10:03:01 +03:00 |
|
marshal
|
2064e6efda
|
change the schema from public to freight
|
2026-05-23 10:00:40 +03:00 |
|
yaschalew10
|
3b4a184ab4
|
Merge pull request #33 from Tria-plc/freight_feature/booking/minio
Freight feature/booking/minio
|
2026-05-23 09:54:35 +03:00 |
|
marshal
|
ecbf1f2408
|
mergefix
|
2026-05-23 09:38:19 +03:00 |
|
marshal
|
82c6b1284e
|
implement contract booking functionality and MinIO setup
|
2026-05-23 09:31:52 +03:00 |
|
yaschalew
|
69db7cd960
|
Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into feature/file_settings
|
2026-05-22 20:12:47 +03:00 |
|
yaschalew
|
2c1ef13121
|
add user registrations
|
2026-05-22 20:12:04 +03:00 |
|
yaschalew10
|
a470244f06
|
Merge pull request #28 from Tria-plc/freight/feature/bootstrap_backoffice
Freight/feature/bootstrap backoffice
|
2026-05-22 18:03:07 +03:00 |
|
Michael Abebe
|
2272255bef
|
Merge remote-tracking branch 'origin/freight/develop' into freight/feature/bootstrap_backoffice
|
2026-05-22 17:58:43 +03:00 |
|
Michael Abebe
|
27e2cfcf6b
|
feat(freight:backoffice): added login page and basic authorization
|
2026-05-22 17:55:20 +03:00 |
|
Nathnael Wondisha
|
5c0d44ed7c
|
Merge pull request #27 from Tria-plc/freight/feature/dynamic-dropdown
Implemented the dynamic dropdown
|
2026-05-22 17:34:36 +03:00 |
|
ghost2023
|
bf4d9550f1
|
feat: implemented dynamic select
|
2026-05-22 17:32:35 +03:00 |
|
ghost2023
|
724a99a2fc
|
chore: add the dropdown service to the api repo
|
2026-05-22 17:31:26 +03:00 |
|
Nathnael Wondisha
|
5b926293a0
|
Merge pull request #26 from Tria-plc/freight/feature/rebuild_booking_form
Freight/feature/rebuild booking form
|
2026-05-22 17:19:36 +03:00 |
|
ghost2023
|
1949bed303
|
fix: the muliple wagon validation
|
2026-05-22 17:18:43 +03:00 |
|
ghost2023
|
80db8f11df
|
refactor
|
2026-05-22 17:18:43 +03:00 |
|
Michael Abebe
|
2c9ca6f16b
|
feat(freight:backoffice): added basic frontend integration with auth(login) page
|
2026-05-22 17:15:46 +03:00 |
|
Nathnael Wondisha
|
87f66a2f92
|
Merge pull request #25 from Tria-plc/freight/feature/rebuild_booking_form
Freight/feature/rebuild booking form
|
2026-05-22 15:53:39 +03:00 |
|
ghost2023
|
c9bf3f6726
|
fix: react update to v19
|
2026-05-22 15:47:26 +03:00 |
|