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 branch 'master' into w2p-58789_Metadata-Registry-UI-Part-2

Browse Source 
Conflicts:
	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
	src/app/+community-page/community-page.component.html
	src/app/app.reducer.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/header/header.component.spec.ts
This commit is contained in:
Kristof De Langhe
2019-01-24 13:18:20 +01:00
parent c150b5f350 da1a97bd8c
commit 31b3a1fdaa
179 changed files with 7578 additions and 1989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,8 @@ import { UploaderService } from '../shared/uploader/uploader.service';
import { BrowseItemsResponseParsingService } from './data/browse-items-response-parsing-service';
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';
const IMPORTS = [
CommonModule,
@@ -126,6 +128,8 @@ const PROVIDERS = [
UploaderService,
UUIDService,
DSpaceObjectDataService,
CSSVariableService,
MenuService,
// register AuthInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,