CST-5249_suggestion alignment to main, merge conflicts

This commit is contained in:
frabacche
2023-12-21 12:44:12 +01:00
509 changed files with 16021 additions and 5203 deletions

View File

@@ -156,7 +156,10 @@ import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/
import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
import { FormModule } from '../../app/shared/form/form.module';
import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
import { SuggestionNotificationsModule } from '../../app/suggestion-notifications/suggestion-notifications.module';
import { NotificationsModule } from '../../app/notifications/notifications.module';
import {UserMenuComponent} from './app/shared/auth-nav-menu/user-menu/user-menu.component';
import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
const DECLARATIONS = [
@@ -241,6 +244,9 @@ const DECLARATIONS = [
SubmissionSectionUploadFileComponent,
ItemStatusComponent,
EditBitstreamPageComponent,
UserMenuComponent,
BrowseByComponent,
RegisterEmailFormComponent,
];
@NgModule({
@@ -301,7 +307,7 @@ const DECLARATIONS = [
NgxGalleryModule,
FormModule,
RequestCopyModule,
SuggestionNotificationsModule
NotificationsModule
],
declarations: DECLARATIONS,
exports: [