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

Merge branch 'master' into w2p-55946_Item-mapping-on-item-level

Browse Source 
Conflicts:
	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/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2018-12-21 13:53:10 +01:00
parent 13c1a553a1 2055f3216d
commit 6e7024e31e
135 changed files with 5380 additions and 1961 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 { NotificationsService } from '../shared/notifications/notifications.serv
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 { CSSVariableService } from '../shared/sass-helper/sass-helper.service';
import { MenuService } from '../shared/menu/menu.service';
import { MappingCollectionsReponseParsingService } from './data/mapping-collections-reponse-parsing.service';
import { ObjectSelectService } from '../shared/object-select/object-select.service';
@@ -130,6 +132,8 @@ const PROVIDERS = [
UUIDService,
DSpaceObjectDataService,
ObjectSelectService,
CSSVariableService,
MenuService,
// register AuthInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,