Merge branch 'live-rest-backend' into w2p-41914_DSO-list-component

This commit is contained in:
Art Lowel
2017-06-20 11:39:52 +02:00
56 changed files with 505 additions and 245 deletions

View File

@@ -14,6 +14,9 @@ import { ThumbnailComponent } from "../thumbnail/thumbnail.component";
import { SafeUrlPipe } from "./utils/safe-url-pipe";
import { HostWindowService } from "./host-window.service";
import { NativeWindowFactory, NativeWindowService } from "./window.service";
import { ComcolPageContentComponent } from "./comcol-page-content/comcol-page-content.component";
import { ComcolPageHeaderComponent } from "./comcol-page-header/comcol-page-header.component";
import { ComcolPageLogoComponent } from "./comcol-page-logo/comcol-page-logo.component";
import { TRUNCATE_PIPES } from "ng2-truncate";
import { EnumKeysPipe } from "./utils/enum-keys-pipe";
@@ -39,7 +42,10 @@ const PIPES = [
const COMPONENTS = [
// put shared components here
PaginationComponent,
ThumbnailComponent
ThumbnailComponent,
ComcolPageContentComponent,
ComcolPageHeaderComponent,
ComcolPageLogoComponent
];
const PROVIDERS = [