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

Merge remote-tracking branch 'remotes/origin/master' into configuration

Browse Source 
# Conflicts:
#	src/app/core/core.module.ts
This commit is contained in:
Giuseppe Digilio
2017-11-24 15:20:45 +01:00
parent a37b2da6a6 07cdf650f8
commit 7361a9e776
50 changed files with 2093 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,8 +32,10 @@ import { ServerResponseService } from '../shared/server-response.service';
import { NativeWindowFactory, NativeWindowService } from '../shared/window.service';
import { BrowseService } from './browse/browse.service';
import { BrowseResponseParsingService } from './data/browse-response-parsing.service';
import { SubmissionDefinitionsConfigService } from './config/submission-definitions-config.service';
import { ConfigResponseParsingService } from './data/config-response-parsing.service';
import { RouteService } from '../shared/route.service';
import { SubmissionDefinitionsConfigService } from './config/submission-definitions-config.service';
import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
import { SubmissionSectionsConfigService } from './config/submission-sections-config.service';
@@ -69,7 +71,9 @@ const PROVIDERS = [
ServerResponseService,
BrowseResponseParsingService,
BrowseService,
ConfigResponseParsingService,
RouteService,
SubmissionDefinitionsConfigService,
SubmissionFormsConfigService,
SubmissionSectionsConfigService,