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

Merge branch 'master' into w2p-54472_Create-community-and-collection-pages

Browse Source 
Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.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
This commit is contained in:
lotte
2018-12-20 15:59:23 +01:00
parent 7a12332d70 2055f3216d
commit 42d1bdb3d8
136 changed files with 5374 additions and 1958 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 { DataBuildService } from './cache/builders/data-build.service';
import { DSOUpdateComparator } from './data/dso-update-comparator';
@@ -130,6 +132,8 @@ const PROVIDERS = [
UUIDService,
DSpaceObjectDataService,
DSOUpdateComparator,
CSSVariableService,
MenuService,
// register AuthInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,