Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-28 07:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/change_to_mantine

Browse Source
This commit is contained in:
marshal
2026-06-06 10:45:34 +03:00
parent 7acca2345b a39366867a
commit b62ea3f95f
3 changed files with 6 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/edr-freight-api/src/config/database.config.ts
View File

@@ -17,7 +17,7 @@ import {
PositionType,
Position,
Project,
UnitConfiguration,
UnitSetting,
GlobalUnitConfiguration,
Unit,
EmployeeSignature,
@@ -64,7 +64,7 @@ const iamEntities = [
PositionType,
Position,
Project,
UnitConfiguration,
UnitSetting,
GlobalUnitConfiguration,
Unit,
EmployeeSignature,

2
apps/edr-freight-web/portal/package.json
View File

@@ -16,7 +16,7 @@
"@edr/ui-common": "workspace:*",
"@hookform/resolvers": "^5.4.0",
"@tanstack/react-query": "^5.59.0",
"@tria-plc/iamui-common": "1.1.1",
"@tria-plc/iamui-common": "1.1.2",
"axios": "^1.7.7",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",