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

Merge remote-tracking branch 'origin/main' into CST-5307

Browse Source 
# Conflicts:
#	src/app/core/core.module.ts
#	src/app/profile-page/profile-page.component.spec.ts
#	src/app/profile-page/profile-page.component.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2022-05-26 10:40:48 +02:00
parent de2202799d 7a84ea483d
commit ebbae79854
169 changed files with 3698 additions and 1388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,14 +283,13 @@ import {
} from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
import { DsSelectComponent } from './ds-select/ds-select.component';
import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
import {
ThemedItemListPreviewComponent
} from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
import { RSSComponent } from './rss-feed/rss.component';
import { ExternalLinkMenuItemComponent } from './menu/menu-item/external-link-menu-item.component';
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
import { PersonPageClaimButtonComponent } from './dso-page/person-page-claim-button/person-page-claim-button.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
CommonModule,
SortablejsModule,
FileUploadModule,
@@ -330,7 +329,8 @@ const PIPES = [
ObjectKeysPipe,
ObjectValuesPipe,
ConsolePipe,
ObjNgFor
ObjNgFor,
BrowserOnlyPipe,
];
const COMPONENTS = [
@@ -353,6 +353,7 @@ const COMPONENTS = [
AbstractListableElementComponent,
ObjectCollectionComponent,
PaginationComponent,
RSSComponent,
SearchFormComponent,
PageWithSidebarComponent,
SidebarDropdownComponent,