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

Merge remote-tracking branch 'remotes/origin/main' into authorities_and_controlled_vocabularies

Browse Source 
# Conflicts:
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2020-08-26 13:58:49 +02:00
parent cfd819cd62 cc618ebadd
commit 4b35828bbe
55 changed files with 2006 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/shared/shared.module.ts
View File

@@ -18,6 +18,9 @@ import { MomentModule } from 'ngx-moment';
import { TooltipModule } from 'ngx-bootstrap';
import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
import { ExportMetadataSelectorComponent } from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
import { PublicationListElementComponent } from './object-list/item-list-element/item-types/publication/publication-list-element.component';
import { EnumKeysPipe } from './utils/enum-keys-pipe';
import { FileSizePipe } from './utils/file-size-pipe';
@@ -305,6 +308,7 @@ const COMPONENTS = [
ThumbnailComponent,
GridThumbnailComponent,
UploaderComponent,
FileDropzoneNoUploaderComponent,
ItemListPreviewComponent,
MyDSpaceItemStatusComponent,
ItemSubmitterComponent,
@@ -396,6 +400,8 @@ const COMPONENTS = [
GroupSearchBoxComponent,
FileDownloadLinkComponent,
CollectionDropdownComponent,
ExportMetadataSelectorComponent,
ConfirmationModalComponent,
VocabularyTreeviewComponent
];
@@ -472,8 +478,10 @@ const ENTRY_COMPONENTS = [
ClaimedTaskActionsReturnToPoolComponent,
ClaimedTaskActionsEditMetadataComponent,
FileDownloadLinkComponent,
VocabularyTreeviewComponent,
CurationFormComponent
CurationFormComponent,
ExportMetadataSelectorComponent,
ConfirmationModalComponent
VocabularyTreeviewComponent
];
const SHARED_ITEM_PAGE_COMPONENTS = [