Merge branch 'master' into w2p-64961_Edit-bitstream-page

Conflicts:
	src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
	src/app/app-routing.module.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-09-12 13:21:08 +02:00
214 changed files with 5092 additions and 705 deletions

View File

@@ -64,7 +64,8 @@ import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.c
GenericItemPageFieldComponent,
RelatedEntitiesSearchComponent,
RelatedItemsComponent,
MetadataRepresentationListComponent
MetadataRepresentationListComponent,
ItemPageTitleFieldComponent
],
entryComponents: [
PublicationComponent