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

Merge remote-tracking branch 'atmire/master' into modifying-metadata-registries

Browse Source 
Conflicts:
	src/app/+community-page/community-page.component.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
	src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
	src/app/+item-page/edit-item-page/item-private/item-private.component.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
	src/app/+item-page/edit-item-page/item-public/item-public.component.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
	src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
	src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
	src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/cache/response.models.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/request.models.ts
	src/app/core/index/index.effects.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/operators.spec.ts
	src/app/header/header.component.spec.ts
	src/app/shared/form/form.component.ts
This commit is contained in:
Kristof De Langhe
2019-02-13 12:47:17 +01:00
parent f08fda9bce 34e78bd495
commit d6a60d1adc
117 changed files with 2627 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,8 @@ import { DSpaceObjectDataService } from './data/dspace-object-data.service';
import { MetadataschemaParsingService } from './data/metadataschema-parsing.service';
import { CSSVariableService } from '../shared/sass-helper/sass-helper.service';
import { MenuService } from '../shared/menu/menu.service';
import { NormalizedObjectBuildService } from './cache/builders/normalized-object-build.service';
import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service';
const IMPORTS = [
CommonModule,
@@ -101,6 +103,7 @@ const PROVIDERS = [
ObjectCacheService,
PaginationComponentOptions,
RegistryService,
NormalizedObjectBuildService,
RemoteDataBuildService,
RequestService,
EndpointMapResponseParsingService,
@@ -128,6 +131,7 @@ const PROVIDERS = [
UploaderService,
UUIDService,
DSpaceObjectDataService,
DSOChangeAnalyzer,
CSSVariableService,
MenuService,
// register AuthInterceptor as HttpInterceptor