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 branch 'master' into w2p-65272_Edit-collection-item-template

Browse Source 
Conflicts:
	src/app/core/auth/auth-request.service.ts
	src/app/core/core.module.ts
This commit is contained in:
Kristof De Langhe
2020-07-02 11:39:30 +02:00
parent e234c3a44d 2fe9965411
commit b77fd69ac7
64 changed files with 2299 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,8 +142,10 @@ import { WorkflowActionDataService } from './data/workflow-action-data.service';
import { WorkflowAction } from './tasks/models/workflow-action-object.model';
import { ItemTemplateDataService } from './data/item-template-data.service';
import { TemplateItem } from './shared/template-item.model';
import { Registration } from './shared/registration.model';
import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
import { MetadataFieldDataService } from './data/metadata-field-data.service';
import { TokenResponseParsingService } from './auth/token-response-parsing.service';
/**
* When not in production, endpoint responses can be mocked for testing purposes
@@ -261,6 +263,7 @@ const PROVIDERS = [
WorkflowActionDataService,
MetadataSchemaDataService,
MetadataFieldDataService,
TokenResponseParsingService,
// register AuthInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,
@@ -312,7 +315,8 @@ export const models =
Version,
VersionHistory,
WorkflowAction,
TemplateItem
TemplateItem,
Registration
];
@NgModule({