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

Merge remote-tracking branch 'remotes/origin/main' into authorities_and_controlled_vocabularies

Browse Source 
# Conflicts:
#	src/app/core/core.module.ts
This commit is contained in:
Giuseppe Digilio
2020-07-21 18:57:47 +02:00
parent cb11e3c702 9d3f58770a
commit c8c7e92717
29 changed files with 1069 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/core/core.module.ts
View File

@@ -145,6 +145,11 @@ import { WorkflowAction } from './tasks/models/workflow-action-object.model';
import { LocaleInterceptor } from './locale/locale.interceptor';
import { ItemTemplateDataService } from './data/item-template-data.service';
import { TemplateItem } from './shared/template-item.model';
import { Feature } from './shared/feature.model';
import { Authorization } from './shared/authorization.model';
import { FeatureDataService } from './data/feature-authorization/feature-data.service';
import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
import { SiteAdministratorGuard } from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
import { Registration } from './shared/registration.model';
import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
import { MetadataFieldDataService } from './data/metadata-field-data.service';
@@ -277,6 +282,9 @@ const PROVIDERS = [
ProcessDataService,
ScriptDataService,
ProcessFilesResponseParsingService,
FeatureDataService,
AuthorizationDataService,
SiteAdministratorGuard,
MetadataSchemaDataService,
MetadataFieldDataService,
TokenResponseParsingService,
@@ -344,6 +352,8 @@ export const models =
VersionHistory,
WorkflowAction,
TemplateItem,
Feature,
Authorization,
Registration,
Vocabulary,
VocabularyEntry,