Merge branch 'main' into CST-4875-Feedback-form

# Conflicts:
#	src/app/app.module.ts
#	src/app/core/core.module.ts
#	src/app/core/data/feature-authorization/feature-id.ts
#	src/app/footer/footer.component.html
#	src/themes/custom/theme.module.ts
This commit is contained in:
Corrado Lombardi
2022-01-24 19:21:52 +01:00
401 changed files with 5941 additions and 3899 deletions

View File

@@ -164,6 +164,7 @@ import { RootDataService } from './data/root-data.service';
import { Root } from './data/root.model';
import { SearchConfig } from './shared/search/search-filters/search-config.model';
import { SequenceService } from './shared/sequence.service';
import { GroupDataService } from './eperson/group-data.service';
/**
* When not in production, endpoint responses can be mocked for testing purposes
@@ -286,6 +287,7 @@ const PROVIDERS = [
VocabularyService,
VocabularyTreeviewService,
SequenceService,
GroupDataService
FeedbackDataService,
// FeedbackGuard
];