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

Merge branch 'main' into feature/CST-9636

Browse Source 
# Conflicts:
#	src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
This commit is contained in:
Enea Jahollari
2023-05-23 15:51:46 +02:00
parent b4340e0b91 7a2b1b2068
commit d7fe120245
359 changed files with 5845 additions and 4991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ import { ErrorComponent } from './error/error.component';
import { LoadingComponent } from './loading/loading.component';
import { PaginationComponent } from './pagination/pagination.component';
import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
import { ThemedThumbnailComponent } from '../thumbnail/themed-thumbnail.component';
import { SearchFormComponent } from './search-form/search-form.component';
import { ThemedSearchFormComponent } from './search-form/themed-search-form.component';
import {
@@ -351,6 +352,7 @@ const COMPONENTS = [
PageWithSidebarComponent,
SidebarDropdownComponent,
ThumbnailComponent,
ThemedThumbnailComponent,
MyDSpaceStatusBadgeComponent,
ThemedMyDSpaceStatusBadgeComponent,
ViewModeSwitchComponent,