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

Merge branch 'master' into w2p-70834_Refactor-registry-service-and-associated-models

Browse Source 
Conflicts:
	src/app/core/data/data.service.ts
This commit is contained in:
Kristof De Langhe
2020-06-04 16:28:56 +02:00
parent 49bb61b2ae 9b7a33cc69
commit 44386823a3
161 changed files with 8229 additions and 2332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing
import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
import { RelationshipTypeService } from './data/relationship-type.service';
import { RelationshipService } from './data/relationship.service';
import { ResourcePolicyService } from './data/resource-policy.service';
import { ResourcePolicyService } from './resource-policy/resource-policy.service';
import { SearchResponseParsingService } from './data/search-response-parsing.service';
import { SiteDataService } from './data/site-data.service';
import { DSpaceRESTv2Service } from './dspace-rest-v2/dspace-rest-v2.service';
@@ -111,7 +111,7 @@ import { RelationshipType } from './shared/item-relationships/relationship-type.
import { Relationship } from './shared/item-relationships/relationship.model';
import { Item } from './shared/item.model';
import { License } from './shared/license.model';
import { ResourcePolicy } from './shared/resource-policy.model';
import { ResourcePolicy } from './resource-policy/models/resource-policy.model';
import { SearchConfigurationService } from './shared/search/search-configuration.service';
import { SearchFilterService } from './shared/search/search-filter.service';
import { SearchService } from './shared/search/search.service';