hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 18:44:14 +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

8
src/app/shared/shared.module.ts
View File

@@ -5,10 +5,13 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { Ng2PaginationModule } from 'ng2-pagination';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from 'ng2-translate/ng2-translate';
import { TranslateModule } from '@ngx-translate/core';
import { ApiService } from './api.service';
import { PaginationComponent } from "./pagination/pagination.component";
import { FileSizePipe } from "./utils/file-size-pipe";
import { ThumbnailComponent } from "../thumbnail/thumbnail.component";
import { SafeUrlPipe } from "./utils/safe-url-pipe";
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -22,10 +25,13 @@ const MODULES = [
];
const PIPES = [
FileSizePipe,
SafeUrlPipe
// put pipes here
];
const COMPONENTS = [
ThumbnailComponent
// put shared components here
PaginationComponent
];