Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add column group header template samples #1246

Merged
merged 11 commits into from
Jul 17, 2019

Conversation

DiyanDimitrov
Copy link
Contributor

# Conflicts:
#	live-editing/configs/HierarchicalGridConfigGenerator.ts
#	src/app/hierarchical-grid/hierarchical-grid-routing.module.ts
#	src/app/hierarchical-grid/hierarchical-grid.module.ts
@DiyanDimitrov DiyanDimitrov requested a review from gedinakova July 2, 2019 13:55
gedinakova
gedinakova previously approved these changes Jul 2, 2019
gedinakova
gedinakova previously approved these changes Jul 10, 2019
# Conflicts:
#	live-editing/configs/GridConfigGenerator.ts
#	src/app/grid/grid-routes-data.ts
#	src/app/grid/grids-routing.module.ts
#	src/app/grid/grids.module.ts
#	src/app/hierarchical-grid/hierarchical-grid-routes-data.ts
#	src/app/hierarchical-grid/hierarchical-grid-routing.module.ts
#	src/app/hierarchical-grid/hierarchical-grid.module.ts
#	src/app/tree-grid/tree-grid-routes-data.ts
#	src/app/tree-grid/tree-grid-routing.module.ts
#	src/app/tree-grid/tree-grid.module.ts
gedinakova
gedinakova previously approved these changes Jul 16, 2019
# Conflicts:
#	live-editing/configs/GridConfigGenerator.ts
#	live-editing/configs/TreeGridConfigGenerator.ts
#	src/app/grid/grid-routes-data.ts
#	src/app/grid/grids-routing.module.ts
#	src/app/grid/grids.module.ts
#	src/app/tree-grid/tree-grid-routes-data.ts
#	src/app/tree-grid/tree-grid-routing.module.ts
#	src/app/tree-grid/tree-grid.module.ts
@DiyanDimitrov DiyanDimitrov merged commit 9155ef4 into master Jul 17, 2019
@DiyanDimitrov DiyanDimitrov deleted the ddimitrov/columnGroupHeaderTemplateSample branch July 17, 2019 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants