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 'atmire/master' into Browse-by-links

Browse Source 
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-02-13 13:25:35 +01:00
parent 49fc891809 34e78bd495
commit 371f2bcd85
194 changed files with 4513 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,11 @@ import { CapitalizePipe } from './utils/capitalize.pipe';
import { ObjectKeysPipe } from './utils/object-keys-pipe';
import { MomentModule } from 'ngx-moment';
import { MenuModule } from './menu/menu.module';
import {LangSwitchComponent} from './lang-switch/lang-switch.component';
import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component';
import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component';
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 = [
@@ -131,6 +135,10 @@ const COMPONENTS = [
ComcolPageContentComponent,
ComcolPageHeaderComponent,
ComcolPageLogoComponent,
ComColFormComponent,
CreateComColPageComponent,
EditComColPageComponent,
DeleteComColPageComponent,
ComcolPageBrowseByComponent,
DsDynamicFormComponent,
DsDynamicFormControlComponent,