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

Merge remote-tracking branch 'upstream/main' into atmire-contributions-alex-7.5

Browse Source 
# Conflicts:
#	src/app/item-page/item-page.module.ts
#	src/app/shared/search/themed-search.component.ts
#	src/app/shared/shared.module.ts
#	src/themes/custom/eager-theme.module.ts
#	src/themes/custom/lazy-theme.module.ts
This commit is contained in:
Alexandre Vryghem
2023-02-18 13:19:00 +01:00
parent 7edc1c1036 bbec2fd038
commit 008e089e62
391 changed files with 12216 additions and 1804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/item-page/item-page.module.ts
View File

@@ -39,7 +39,6 @@ import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/med
import { NgxGalleryModule } from '@kolkov/ngx-gallery';
import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component';
import { VersionPageComponent } from './version-page/version-page/version-page.component';
import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component';
import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
import { OrcidAuthComponent } from './orcid-page/orcid-auth/orcid-auth.component';
import { OrcidPageComponent } from './orcid-page/orcid-page.component';
@@ -53,6 +52,7 @@ import { ItemVersionsModule } from './versions/item-versions.module';
import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
import { FileSectionComponent } from './simple/field-components/file-section/file-section.component';
import { ItemSharedModule } from './item-shared.module';
import { DsoPageModule } from '../shared/dso-page/dso-page.module';
import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component';
@@ -93,7 +93,6 @@ const DECLARATIONS = [
OrcidQueueComponent,
ItemAlertsComponent,
ThemedItemAlertsComponent,
VersionedItemComponent,
BitstreamRequestACopyPageComponent,
];
@@ -111,7 +110,8 @@ const DECLARATIONS = [
NgxGalleryModule,
NgbAccordionModule,
ResultsBackButtonModule,
UploadModule
UploadModule,
DsoPageModule,
],
declarations: [
...DECLARATIONS,