hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 10:34:15 +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

4
src/themes/custom/lazy-theme.module.ts
View File

@@ -124,6 +124,8 @@ import { ItemSharedModule } from '../../app/item-page/item-shared.module';
import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
const DECLARATIONS = [
@@ -213,6 +215,7 @@ const DECLARATIONS = [
InfoModule,
JournalEntitiesModule,
MenuModule,
DsoPageModule,
MyDspaceSearchModule,
NavbarModule,
NgbModule,
@@ -238,6 +241,7 @@ const DECLARATIONS = [
ResourcePoliciesModule,
ComcolModule,
DsoSharedModule,
SystemWideAlertModule
],
declarations: DECLARATIONS,
exports: [