Merge remote-tracking branch 'upstream/master' into pagination

This commit is contained in:
Giuseppe Digilio
2017-05-19 23:07:42 +02:00
parent 92f1d95ddd
commit 04f1c1c08d
3 changed files with 5 additions and 4 deletions

View File

@@ -78,7 +78,7 @@
"@angular/upgrade": "2.2.3", "@angular/upgrade": "2.2.3",
"@angularclass/bootloader": "1.0.1", "@angularclass/bootloader": "1.0.1",
"@angularclass/idle-preload": "1.0.4", "@angularclass/idle-preload": "1.0.4",
"@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.15", "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.24",
"@ngrx/core": "^1.2.0", "@ngrx/core": "^1.2.0",
"@ngrx/effects": "^2.0.0", "@ngrx/effects": "^2.0.0",
"@ngrx/router-store": "^1.2.5", "@ngrx/router-store": "^1.2.5",
@@ -92,7 +92,7 @@
"angular2-universal": "2.1.0-rc.1", "angular2-universal": "2.1.0-rc.1",
"angular2-universal-polyfills": "2.1.0-rc.1", "angular2-universal-polyfills": "2.1.0-rc.1",
"body-parser": "1.15.2", "body-parser": "1.15.2",
"bootstrap": "4.0.0-alpha.5", "bootstrap": "4.0.0-alpha.6",
"cerialize": "^0.1.13", "cerialize": "^0.1.13",
"compression": "1.6.2", "compression": "1.6.2",
"express": "4.14.0", "express": "4.14.0",

View File

@@ -34,6 +34,7 @@ const PROVIDERS = [
DSpaceRESTv2Service, DSpaceRESTv2Service,
ObjectCacheService, ObjectCacheService,
PaginationOptions, PaginationOptions,
ResponseCacheService,
RequestService, RequestService,
RemoteDataBuildService RemoteDataBuildService
]; ];

View File

@@ -31,9 +31,9 @@ const PIPES = [
]; ];
const COMPONENTS = [ const COMPONENTS = [
ThumbnailComponent
// put shared components here // put shared components here
PaginationComponent PaginationComponent,
ThumbnailComponent
]; ];
const PROVIDERS = [ const PROVIDERS = [