hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/app/app.reducer.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2018-03-06 10:20:52 +01:00
parent 31edf91c0a 605c3524c8
commit 39eeec5385
69 changed files with 2179 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/app.reducer.ts
View File

@@ -12,6 +12,7 @@ import {
SearchFiltersState
} from './+search-page/search-filters/search-filter/search-filter.reducer';
import { notificationsReducer, NotificationsState } from './shared/notifications/notifications.reducers';
import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
export interface AppState {
router: fromRouter.RouterReducerState;
@@ -20,6 +21,7 @@ export interface AppState {
notifications: NotificationsState;
searchSidebar: SearchSidebarState;
searchFilter: SearchFiltersState;
truncatable: TruncatablesState;
}
export const appReducers: ActionReducerMap<AppState> = {
@@ -28,5 +30,6 @@ export const appReducers: ActionReducerMap<AppState> = {
header: headerReducer,
notifications: notificationsReducer,
searchSidebar: sidebarReducer,
searchFilter: filterReducer
searchFilter: filterReducer,
truncatable: truncatableReducer
};