hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-12 12:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-69305_Apply-new-MyDSpace-fix

Browse Source 
Conflicts:
	src/app/core/core.module.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2020-03-27 09:59:33 +01:00
parent f080a7568e 521b0d3986
commit 7996555ec2
138 changed files with 5650 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/core/core.module.ts
View File

@@ -142,6 +142,10 @@ import { PoolTask } from './tasks/models/pool-task-object.model';
import { TaskObject } from './tasks/models/task-object.model';
import { PoolTaskDataService } from './tasks/pool-task-data.service';
import { TaskResponseParsingService } from './tasks/task-response-parsing.service';
import { VersionDataService } from './data/version-data.service';
import { VersionHistoryDataService } from './data/version-history-data.service';
import { Version } from './shared/version.model';
import { VersionHistory } from './shared/version-history.model';
import { WorkflowActionDataService } from './data/workflow-action-data.service';
import { WorkflowAction } from './tasks/models/workflow-action-object.model';
@@ -257,6 +261,8 @@ const PROVIDERS = [
RelationshipTypeService,
ExternalSourceService,
LookupRelationService,
VersionDataService,
VersionHistoryDataService,
LicenseDataService,
ItemTypeDataService,
WorkflowActionDataService,
@@ -308,6 +314,8 @@ export const models =
ItemType,
ExternalSource,
ExternalSourceEntry,
Version,
VersionHistory,
WorkflowAction
];