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

Merge branch 'master' into w2p-62589_Item-mapper-update

Browse Source 
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+search-page/search-service/search.service.ts
This commit is contained in:
Kristof De Langhe
2019-09-06 12:52:36 +02:00
parent 04f57b753e 3a68b6dd7b
commit 7fe0db7d7c
46 changed files with 1908 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,7 @@ import { NormalizedSubmissionFormsModel } from './config/models/normalized-confi
import { NormalizedSubmissionSectionModel } from './config/models/normalized-config-submission-section.model';
import { NormalizedAuthStatus } from './auth/models/normalized-auth-status.model';
import { NormalizedAuthorityValue } from './integration/models/normalized-authority-value.model';
import { RelationshipService } from './data/relationship.service';
import { RoleService } from './roles/role.service';
import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard';
import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
@@ -204,6 +205,7 @@ const PROVIDERS = [
MenuService,
ObjectUpdatesService,
SearchService,
RelationshipService,
MyDSpaceGuard,
RoleService,
TaskResponseParsingService,