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 branch 'community-and-collection-forms' into w2p-58522_delete-collections-and-communities

Browse Source 
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
lotte
2019-01-24 12:58:05 +01:00
parent f0cc24ff9b c4004eaaa2
commit a733eb5834
81 changed files with 2424 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,7 @@ import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.comp
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';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -148,6 +149,7 @@ const COMPONENTS = [
DsDatePickerComponent,
ErrorComponent,
FormComponent,
LangSwitchComponent,
LoadingComponent,
LogInComponent,
LogOutComponent,