Merge branch 'freight/develop' into freight/feature/backoffice_iam_demo

This commit is contained in:
Michael Abebe
2026-05-29 12:15:00 +03:00
75 changed files with 2788 additions and 838 deletions

View File

@@ -18,8 +18,7 @@ import { NotificationsModule } from "./modules/notifications/notifications.modul
import { FileUploadSettingsModule } from "./modules/file-upload-settings/file-upload-settings.module";
import { DropdownSettingsModule } from "./modules/dropdown-settings/dropdown-settings.module";
import { OtpModule } from './modules/otp/otp.module';
import { ServiceTypesModule } from "./modules/service-types/service-types.module";
import { CargoTypesModule } from "./modules/cargo-types/cargo-types.module";
import { RuleEngineModule } from "./modules/rule-engine/rule-engine.module";
import { BackofficeModule } from "./modules/backoffice/backoffice.module";
import { DemoPermissionsModule } from "./modules/demo-permissions/demo-permissions.module";
import { EdrOrgSeeder } from "./seed/edr-org.seeder";
@@ -49,8 +48,7 @@ import { DemoUsersSeeder } from "./seed/demo-users.seeder";
FileUploadSettingsModule,
DropdownSettingsModule,
OtpModule,
ServiceTypesModule,
CargoTypesModule,
RuleEngineModule,
BackofficeModule,
DemoPermissionsModule,
],