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

resolved merge conflicts

Browse Source
This commit is contained in:
William Welling
2017-09-29 12:59:33 -05:00
parent 0efcd9cecc 202891b55a
commit aa934383ef
32 changed files with 611 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,8 @@ import { coreEffects } from './core.effects';
import { EffectsModule } from '@ngrx/effects';
import { StoreModule } from '@ngrx/store';
import { coreReducers } from './core.reducers';
import { DSOResponseParsingService } from './data/dso-response-parsing.service';
import { RootResponseParsingService } from './data/root-response-parsing.service';
import { ApiService } from '../shared/api.service';
@@ -41,14 +43,16 @@ const PROVIDERS = [
ApiService,
CommunityDataService,
CollectionDataService,
DSOResponseParsingService,
DSpaceRESTv2Service,
HostWindowService,
ItemDataService,
ObjectCacheService,
PaginationComponentOptions,
ResponseCacheService,
RequestService,
PaginationComponentOptions,
RemoteDataBuildService,
RequestService,
ResponseCacheService,
RootResponseParsingService,
ServerResponseService,
{ provide: NativeWindowService, useFactory: NativeWindowFactory }
];