hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-16 14:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into #885-media-viewer

Browse Source 
# Conflicts:
#	src/app/+item-page/item-page.module.ts
This commit is contained in:
Dániel Péter Sipos
2021-01-04 10:18:05 +01:00
parent 152923aba7 17ca2c4a21
commit 09dc9491a3
154 changed files with 1795 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/+item-page/item-page.module.ts
View File

@@ -30,6 +30,7 @@ import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.c
import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
import { StatisticsModule } from '../statistics/statistics.module';
import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
import { MediaViewerComponent } from './media-viewer/media-viewer.component';
import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component';
@@ -60,6 +61,7 @@ import { NgxGalleryModule } from '@kolkov/ngx-gallery';
CollectionsComponent,
FullFileSectionComponent,
PublicationComponent,
UntypedItemComponent,
RelatedItemsComponent,
ItemComponent,
GenericItemPageFieldComponent,
@@ -83,6 +85,9 @@ import { NgxGalleryModule } from '@kolkov/ngx-gallery';
ItemPageTitleFieldComponent,
TabbedRelatedEntitiesSearchComponent,
],
entryComponents: [PublicationComponent],
entryComponents: [
PublicationComponent,
UntypedItemComponent
]
})
export class ItemPageModule {}