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 remote-tracking branch 'upstream/master' into pagination

Browse Source 
# Conflicts:
#	package.json
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/core/cache/request-cache.reducer.spec.ts
#	src/app/core/cache/request-cache.service.spec.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2017-05-19 22:03:21 +02:00
parent 412a3a3970 71c1e3a549
commit 92f1d95ddd
134 changed files with 2947 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,18 @@
import { NgModule, Optional, SkipSelf, ModuleWithProviders } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from "../shared/shared.module";
import { isNotEmpty } from "../shared/empty.util";
import { FooterComponent } from "./footer/footer.component";
import { DSpaceRESTv2Service } from "./dspace-rest-v2/dspace-rest-v2.service";
import { ObjectCacheService } from "./cache/object-cache.service";
import { RequestCacheService } from "./cache/request-cache.service";
import { CollectionDataService } from "./data-services/collection-data.service";
import { ItemDataService } from "./data-services/item-data.service";
import { PaginationOptions } from "./shared/pagination-options.model";
import { ResponseCacheService } from "./cache/response-cache.service";
import { CollectionDataService } from "./data/collection-data.service";
import { ItemDataService } from "./data/item-data.service";
import { RequestService } from "./data/request.service";
import { RemoteDataBuildService } from "./cache/builders/remote-data-build.service";
import { CommunityDataService } from "./data/community-data.service";
import { PaginationOptions } from "./cache/models/pagination-options.model";
const IMPORTS = [
CommonModule,
@@ -25,12 +28,14 @@ const EXPORTS = [
];
const PROVIDERS = [
CommunityDataService,
CollectionDataService,
ItemDataService,
DSpaceRESTv2Service,
ObjectCacheService,
PaginationOptions,
RequestCacheService
RequestService,
RemoteDataBuildService
];
@NgModule({