hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +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

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

@@ -10,5 +10,5 @@ export const coreEffects = [
RequestEffects,
ObjectCacheEffects,
UUIDIndexEffects,
AuthEffects,
AuthEffects
];