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 'origin/master' into w2p-44024_simple-search-with-select

Browse Source 
Conflicts:
	package.json
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Lotte Hofstede
2017-09-20 16:07:34 +02:00
parent b0bfff15a6 6db85d1e7b
commit c38a43ff2b
43 changed files with 325 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/shared/shared.module.ts
View File

@@ -27,6 +27,7 @@ import { TruncatePipe } from './utils/truncate.pipe';
import { WrapperListElementComponent } from '../object-list/wrapper-list-element/wrapper-list-element.component';
import { SearchResultListElementComponent } from '../object-list/search-result-list-element/search-result-list-element.component';
import { SearchFormComponent } from './search-form/search-form.component';
import { ServerResponseService } from './server-response.service';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -71,7 +72,8 @@ const ENTRY_COMPONENTS = [
const PROVIDERS = [
ApiService,
HostWindowService,
{ provide: NativeWindowService, useFactory: NativeWindowFactory }
{ provide: NativeWindowService, useFactory: NativeWindowFactory },
ServerResponseService
];
@NgModule({