Merge remote-tracking branch 'remotes/origin/master' into submission

# Conflicts:
#	src/app/core/data/browse-items-response-parsing-service.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2019-03-08 16:30:39 +01:00
41 changed files with 1760 additions and 188 deletions

View File

@@ -98,6 +98,8 @@ import { ObjectValuesPipe } from './utils/object-values-pipe';
import { InListValidator } from './utils/in-list-validator.directive';
import { AutoFocusDirective } from './utils/auto-focus.directive';
import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -131,9 +133,9 @@ const PIPES = [
EmphasizePipe,
CapitalizePipe,
ObjectKeysPipe,
ObjectValuesPipe,
ConsolePipe,
ObjNgFor,
ObjectValuesPipe
ObjNgFor
];
const COMPONENTS = [
@@ -207,7 +209,9 @@ const ENTRY_COMPONENTS = [
DsDatePickerComponent,
DsDynamicFormGroupComponent,
DsDynamicFormArrayComponent,
DsDatePickerInlineComponent
DsDatePickerInlineComponent,
StartsWithDateComponent,
StartsWithTextComponent
];
const PROVIDERS = [