Merge branch 'master' into search-features

Conflicts:
	package.json
	src/app/shared/shared.module.ts
	yarn.lock

src/app/shared/shared.module.ts

@@ -3,15 +3,21 @@ import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NouisliderModule } from 'ng2-nouislider';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { NgbDatepickerModule, NgbModule, NgbTimepickerModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { TranslateModule } from '@ngx-translate/core';
 
 import { NgxPaginationModule } from 'ngx-pagination';
 
+import { FileUploadModule } from 'ng2-file-upload';
+
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
+
 import { EnumKeysPipe } from './utils/enum-keys-pipe';
 import { FileSizePipe } from './utils/file-size-pipe';
 import { SafeUrlPipe } from './utils/safe-url-pipe';
+import { ConsolePipe } from './utils/console.pipe';
 
 import { CollectionListElementComponent } from './object-list/collection-list-element/collection-list-element.component';
 import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
@@ -32,7 +38,6 @@ import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-head
 import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
 import { ErrorComponent } from './error/error.component';
 import { LoadingComponent } from './loading/loading.component';
-
 import { PaginationComponent } from './pagination/pagination.component';
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
 import { SearchFormComponent } from './search-form/search-form.component';
@@ -43,11 +48,30 @@ import { VarDirective } from './utils/var.directive';
 import { LogInComponent } from './log-in/log-in.component';
 import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
 import { LogOutComponent } from './log-out/log-out.component';
+import { FormComponent } from './form/form.component';
+import { DsDynamicTypeaheadComponent } from './form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component';
+import { DsDynamicScrollableDropdownComponent } from './form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DsDynamicFormControlComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control.component';
+import { DsDynamicFormComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form.component';
+import { DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { TextMaskModule } from 'angular2-text-mask';
+import { NotificationComponent } from './notifications/notification/notification.component';
+import { NotificationsBoardComponent } from './notifications/notifications-board/notifications-board.component';
 import { DragClickDirective } from './utils/drag-click.directive';
 import { TruncatePipe } from './utils/truncate.pipe';
 import { TruncatableComponent } from './truncatable/truncatable.component';
 import { TruncatableService } from './truncatable/truncatable.service';
 import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
+import { UploaderComponent } from './uploader/uploader.component';
+import { ChipsComponent } from './chips/chips.component';
+import { DsDynamicTagComponent } from './form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
+import { DsDynamicListComponent } from './form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
+import { DsDynamicGroupComponent } from './form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components';
+import { SortablejsModule } from 'angular-sortablejs';
+import { NumberPickerComponent } from './number-picker/number-picker.component';
+import { DsDatePickerComponent } from './form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
+import { DsDynamicLookupComponent } from './form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
 import { MockAdminGuard } from './mocks/mock-admin-guard.service';
 import { DebounceDirective } from './utils/debounce.directive';
 import { ClickOutsideDirective } from './utils/click-outside.directive';
@@ -60,14 +84,23 @@ import { ObjectKeysPipe } from './utils/object-keys-pipe';
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
   CommonModule,
+  SortablejsModule,
+  DynamicFormsCoreModule,
+  DynamicFormsNGBootstrapUIModule,
+  FileUploadModule,
   FormsModule,
+  InfiniteScrollModule,
   NgbModule,
+  NgbDatepickerModule,
+  NgbTimepickerModule,
+  NgbTypeaheadModule,
   NgxPaginationModule,
   ReactiveFormsModule,
   RouterModule,
   TranslateModule,
   NouisliderModule,
-  MomentModule
+  MomentModule,
+  TextMaskModule
 ];
 
 const PIPES = [
@@ -78,19 +111,32 @@ const PIPES = [
   TruncatePipe,
   EmphasizePipe,
   CapitalizePipe,
-  ObjectKeysPipe
+  ObjectKeysPipe,
+  ConsolePipe
 ];
 
 const COMPONENTS = [
   // put shared components here
   AuthNavMenuComponent,
+  ChipsComponent,
   ComcolPageContentComponent,
   ComcolPageHeaderComponent,
   ComcolPageLogoComponent,
+  DsDynamicFormComponent,
+  DsDynamicFormControlComponent,
+  DsDynamicListComponent,
+  DsDynamicLookupComponent,
+  DsDynamicScrollableDropdownComponent,
+  DsDynamicTagComponent,
+  DsDynamicTypeaheadComponent,
+  DsDynamicGroupComponent,
+  DsDatePickerComponent,
   ErrorComponent,
+  FormComponent,
   LoadingComponent,
   LogInComponent,
   LogOutComponent,
+  NumberPickerComponent,
   ObjectListComponent,
   AbstractListableElementComponent,
   WrapperListElementComponent,
@@ -101,6 +147,7 @@ const COMPONENTS = [
   SearchFormComponent,
   ThumbnailComponent,
   GridThumbnailComponent,
+  UploaderComponent,
   WrapperListElementComponent,
   ViewModeSwitchComponent,
   TruncatableComponent,