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

@@ -54,7 +54,7 @@ import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-trac
import { getCollectionPageRoute } from './collection-page-routing-paths';
@Component({
selector: 'ds-collection-page',
selector: 'ds-base-collection-page',
styleUrls: ['./collection-page.component.scss'],
templateUrl: './collection-page.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,