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 submission

Browse Source 
# Conflicts:
#	src/app/core/data/browse-entries-response-parsing.service.spec.ts
#	src/app/core/data/browse-entries-response-parsing.service.ts
This commit is contained in:
Giuseppe Digilio
2019-02-21 18:49:36 +01:00
parent 3b655847fc 8bf9b509ff
commit 83562b2f32
28 changed files with 634 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,7 @@ import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/cre
import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
import { LangSwitchComponent } from './lang-switch/lang-switch.component';
import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -143,6 +144,7 @@ const COMPONENTS = [
CreateComColPageComponent,
EditComColPageComponent,
DeleteComColPageComponent,
ComcolPageBrowseByComponent,
DsDynamicFormComponent,
DsDynamicFormControlContainerComponent,
DsDynamicListComponent,