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

Merge branch 'master' into w2p-54472_Create-community-and-collection-pages

Browse Source 
Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/+community-page/community-page-routing.module.ts
	src/app/core/data/community-data.service.ts
	src/app/core/data/dso-response-parsing.service.ts
This commit is contained in:
Kristof De Langhe
2018-09-07 14:16:21 +02:00
parent 260ddd979a 0455a16d03
commit da3627e614
194 changed files with 5044 additions and 1066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+collection-page/collection-page.module.ts
View File

@@ -7,11 +7,13 @@ import { CollectionPageComponent } from './collection-page.component';
import { CollectionPageRoutingModule } from './collection-page-routing.module';
import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
import { CollectionFormComponent } from './collection-form/collection-form.component';
import { SearchPageModule } from '../+search-page/search-page.module';
@NgModule({
imports: [
CommonModule,
SharedModule,
SearchPageModule,
CollectionPageRoutingModule
],
declarations: [