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

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

Browse Source 
# Conflicts:
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.module.ts
#	src/app/core/data/request.models.ts
This commit is contained in:
Giuseppe Digilio
2017-11-07 14:45:35 +01:00
parent 380faf8468 41ac403553
commit 8a532fcab1
85 changed files with 1983 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,8 @@ import { ResponseCacheService } from './cache/response-cache.service';
import { RootResponseParsingService } from './data/root-response-parsing.service';
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 { SubmissionFormsConfigService } from './config/submission-forms-config.service';
@@ -65,6 +67,8 @@ const PROVIDERS = [
ResponseCacheService,
RootResponseParsingService,
ServerResponseService,
BrowseResponseParsingService,
BrowseService,
ConfigResponseParsingService,
SubmissionDefinitionsConfigService,
SubmissionFormsConfigService,