mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Merge remote-tracking branch 'upstream/main' into w2p-101127_browse-by-controlled-vocabulary-7.6.0-next
Conflicts: src/app/browse-by/browse-by-guard.spec.ts src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
This commit is contained in:
@@ -56,12 +56,8 @@ import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component
|
||||
import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
|
||||
import { ForbiddenComponent } from './app/forbidden/forbidden.component';
|
||||
import { PrivacyComponent } from './app/info/privacy/privacy.component';
|
||||
import {
|
||||
CollectionStatisticsPageComponent
|
||||
} from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
|
||||
import {
|
||||
CommunityStatisticsPageComponent
|
||||
} from './app/statistics-page/community-statistics-page/community-statistics-page.component';
|
||||
import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
|
||||
import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
|
||||
import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
|
||||
import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
|
||||
import { CommunityPageComponent } from './app/community-page/community-page.component';
|
||||
@@ -77,15 +73,10 @@ import { ProfilePageComponent } from './app/profile-page/profile-page.component'
|
||||
import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
|
||||
import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
|
||||
import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
|
||||
import {
|
||||
SubmissionImportExternalComponent
|
||||
} from './app/submission/import-external/submission-import-external.component';
|
||||
import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
|
||||
import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
|
||||
import { WorkflowItemDeleteComponent
|
||||
} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
|
||||
import {
|
||||
WorkflowItemSendBackComponent
|
||||
} from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
|
||||
import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
|
||||
import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
|
||||
import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
|
||||
import { FeedbackComponent } from './app/info/feedback/feedback.component';
|
||||
import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
|
||||
@@ -103,12 +94,8 @@ import { SearchResultsComponent } from './app/shared/search/search-results/searc
|
||||
import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
|
||||
import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component';
|
||||
import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
|
||||
import {
|
||||
CommunityPageSubCommunityListComponent
|
||||
} from './app/community-page/sub-community-list/community-page-sub-community-list.component';
|
||||
import {
|
||||
CommunityPageSubCollectionListComponent
|
||||
} from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
|
||||
import { CommunityPageSubCommunityListComponent } from './app/community-page/sub-community-list/community-page-sub-community-list.component';
|
||||
import { CommunityPageSubCollectionListComponent } from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
|
||||
import { ObjectListComponent } from './app/shared/object-list/object-list.component';
|
||||
|
||||
import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
|
||||
@@ -122,6 +109,13 @@ import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-b
|
||||
import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
|
||||
import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
|
||||
import { ItemSharedModule } from '../../app/item-page/item-shared.module';
|
||||
import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
|
||||
import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
|
||||
import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
|
||||
import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
|
||||
import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
|
||||
import { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component';
|
||||
import { AccessStatusBadgeComponent } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
|
||||
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';
|
||||
@@ -146,6 +140,8 @@ import {
|
||||
MediaViewerVideoComponent
|
||||
} from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
|
||||
import { NgxGalleryModule } from '@kolkov/ngx-gallery';
|
||||
import { WorkspaceItemsDeletePageComponent } from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component';
|
||||
import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
|
||||
|
||||
const DECLARATIONS = [
|
||||
FileSectionComponent,
|
||||
@@ -203,6 +199,13 @@ const DECLARATIONS = [
|
||||
BrowseByTitlePageComponent,
|
||||
BrowseByTaxonomyPageComponent,
|
||||
ExternalSourceEntryImportModalComponent,
|
||||
SearchFiltersComponent,
|
||||
SearchSidebarComponent,
|
||||
BadgesComponent,
|
||||
StatusBadgeComponent,
|
||||
TypeBadgeComponent,
|
||||
MyDSpaceStatusBadgeComponent,
|
||||
AccessStatusBadgeComponent,
|
||||
ResultsBackButtonComponent,
|
||||
DsoEditMetadataComponent,
|
||||
ItemAlertsComponent,
|
||||
@@ -214,6 +217,8 @@ const DECLARATIONS = [
|
||||
MediaViewerComponent,
|
||||
MediaViewerImageComponent,
|
||||
MediaViewerVideoComponent,
|
||||
WorkspaceItemsDeletePageComponent,
|
||||
ThumbnailComponent,
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
Reference in New Issue
Block a user