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

Merge remote-tracking branch 'remotes/origin/master' into authentication

Browse Source 
# Conflicts:
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.effects.ts
#	src/app/core/core.module.ts
#	src/app/core/shared/hal-endpoint.service.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
#	src/modules/app/browser-app.module.ts
#	src/modules/app/server-app.module.ts
This commit is contained in:
Giuseppe Digilio
2018-05-08 10:57:15 +02:00
parent b0b4342f24 99f8d4f24d
commit f8b3cc516c
131 changed files with 2337 additions and 1218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,9 @@ import { isNotEmpty } from '../shared/empty.util';
import { ApiService } from '../shared/services/api.service';
import { CollectionDataService } from './data/collection-data.service';
import { CommunityDataService } from './data/community-data.service';
import { DebugResponseParsingService } from './data/debug-response-parsing.service';
import { DSOResponseParsingService } from './data/dso-response-parsing.service';
import { SearchResponseParsingService } from './data/search-response-parsing.service';
import { DSpaceRESTv2Service } from './dspace-rest-v2/dspace-rest-v2.service';
import { HostWindowService } from '../shared/host-window.service';
import { ItemDataService } from './data/item-data.service';
@@ -27,7 +29,7 @@ import { PaginationComponentOptions } from '../shared/pagination/pagination-comp
import { RemoteDataBuildService } from './cache/builders/remote-data-build.service';
import { RequestService } from './data/request.service';
import { ResponseCacheService } from './cache/response-cache.service';
import { RootResponseParsingService } from './data/root-response-parsing.service';
import { EndpointMapResponseParsingService } from './data/endpoint-map-response-parsing.service';
import { ServerResponseService } from '../shared/services/server-response.service';
import { NativeWindowFactory, NativeWindowService } from '../shared/services/window.service';
import { BrowseService } from './browse/browse.service';
@@ -44,6 +46,10 @@ import { AuthResponseParsingService } from './auth/auth-response-parsing.service
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { AuthInterceptor } from './auth/auth.interceptor';
import { PlatformService } from '../shared/services/platform.service';
import { HALEndpointService } from './shared/hal-endpoint.service';
import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
import { FacetValueMapResponseParsingService } from './data/facet-value-map-response-parsing.service';
import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
const IMPORTS = [
CommonModule,
@@ -68,6 +74,7 @@ const PROVIDERS = [
CollectionDataService,
DSOResponseParsingService,
DSpaceRESTv2Service,
HALEndpointService,
HostWindowService,
ItemDataService,
MetadataService,
@@ -77,7 +84,12 @@ const PROVIDERS = [
RemoteDataBuildService,
RequestService,
ResponseCacheService,
RootResponseParsingService,
EndpointMapResponseParsingService,
FacetValueResponseParsingService,
FacetValueMapResponseParsingService,
FacetConfigResponseParsingService,
DebugResponseParsingService,
SearchResponseParsingService,
ServerResponseService,
BrowseResponseParsingService,
BrowseService,