Merge remote-tracking branch 'upstream/main' into minor-themed-component-fixes_contribute-main

# Conflicts:
#	src/app/item-page/media-viewer/media-viewer.component.html
#	src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
This commit is contained in:
Alexandre Vryghem
2024-04-30 21:54:42 +02:00
712 changed files with 5542 additions and 1616 deletions

View File

@@ -28,7 +28,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dspace/view-tracker.component';
@Component({
selector: 'ds-community-page',
selector: 'ds-themed-community-page',
// templateUrl: './community-page.component.html',
templateUrl: '../../../../app/community-page/community-page.component.html',
// styleUrls: ['./community-page.component.scss']