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 'remotes/origin/master' into authentication

Browse Source 
# Conflicts:
#	src/app/core/core.module.ts
This commit is contained in:
Giuseppe Digilio
2018-05-21 17:22:45 +02:00
parent 95d6527e31 43380732de
commit 4a697c09f6
20 changed files with 881 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import { coreReducers } from './core.reducers';
import { isNotEmpty } from '../shared/empty.util';
import { ApiService } from '../shared/services/api.service';
import { BrowseEntriesResponseParsingService } from './data/browse-entries-response-parsing.service';
import { CollectionDataService } from './data/collection-data.service';
import { CommunityDataService } from './data/community-data.service';
import { DebugResponseParsingService } from './data/debug-response-parsing.service';
@@ -93,6 +94,7 @@ const PROVIDERS = [
SearchResponseParsingService,
ServerResponseService,
BrowseResponseParsingService,
BrowseEntriesResponseParsingService,
BrowseService,
ConfigResponseParsingService,
RouteService,