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

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

Browse Source 
Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
This commit is contained in:
lotte
2018-12-20 15:59:23 +01:00
parent 7a12332d70 2055f3216d
commit 42d1bdb3d8
136 changed files with 5374 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import { SharedModule } from '../shared/shared.module';
import { CommunityPageComponent } from './community-page.component';
import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
import { CommunityPageRoutingModule } from './community-page-routing.module';
import {CommunityPageSubCommunityListComponent} from './sub-community-list/community-page-sub-community-list.component';
import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
import { CommunityFormComponent } from './community-form/community-form.component';
import { EditCommunityPageComponent } from './edit-community-page/edit-community-page.component';
@@ -19,6 +20,7 @@ import { EditCommunityPageComponent } from './edit-community-page/edit-community
declarations: [
CommunityPageComponent,
CommunityPageSubCollectionListComponent,
CommunityPageSubCommunityListComponent,
CreateCommunityPageComponent,
EditCommunityPageComponent,
CommunityFormComponent