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

Merging 6.2.x into master #3012

Merged
merged 57 commits into from
Nov 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
9fcb9c9
feat(grid, chip): add display density DI token to igxGrid and igxChip
kacheshmarova Oct 26, 2018
c0cc258
Merge
kacheshmarova Oct 29, 2018
a6b0f20
Resolving confilcts related to the new structure(grids ->grid)
kacheshmarova Oct 29, 2018
318b560
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Oct 29, 2018
bd802cf
Merge
kacheshmarova Oct 30, 2018
248d782
Merge
kacheshmarova Oct 30, 2018
872fda9
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Oct 30, 2018
0d7bee4
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
zdrawku Oct 30, 2018
8df82f2
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
zdrawku Oct 30, 2018
d1d02f2
Fixing styling issue
kacheshmarova Oct 30, 2018
4047a82
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Oct 30, 2018
f93ebf1
Adding event arguments for DenistyChanged
kacheshmarova Oct 31, 2018
beffda6
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Oct 31, 2018
2ab12be
Renaming IDisplayDenisty to IDisplayDenistyOptions and setting IDensi…
kacheshmarova Oct 31, 2018
254bd4a
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Oct 31, 2018
06bd344
Trigger onDensityChanged only for components that do not have display…
kacheshmarova Nov 1, 2018
675c928
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Nov 1, 2018
c018eda
Merge
kacheshmarova Nov 1, 2018
e12c975
Adding displayDenisty DI in tree grid constructor
kacheshmarova Nov 2, 2018
3573c66
Merge branch 'master'
kacheshmarova Nov 2, 2018
b53a975
Merge master into vkacheshmarova/add-display-density-DI-token-igxGrid
mpavlinov Nov 5, 2018
f0eba7c
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Nov 5, 2018
fd97622
Group by chips are now affected from the global display denisty option
kacheshmarova Nov 5, 2018
f4464e2
Merge branch 'vkacheshmarova/add-display-density-DI-token-igxGrid' of…
kacheshmarova Nov 5, 2018
1a9ec68
fix(igxGrid): dirty check only checks if value exists, #2940
ViktorSlavov Nov 6, 2018
5eda948
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Nov 6, 2018
ef74275
fix(igx-grid): Open date-picker only if condition is not unary, #2937
sstoyanovIG Nov 6, 2018
e79ada8
Merge branch 'master' into VSlavov/grid-edit-dirty
ViktorSlavov Nov 6, 2018
ee9c894
Merge branch 'master' into sstoyanov/bug-fix-2937
bkulov Nov 6, 2018
a85d452
Summaries display denisty classes are now correctly applied
kacheshmarova Nov 6, 2018
40f6dd7
Removing dsiplayDenisty property since it is not needed any more
kacheshmarova Nov 6, 2018
3d6f6f8
Merge branch 'master' into sstoyanov/bug-fix-2937
bkulov Nov 6, 2018
adf480c
Merge branch 'master' into vkacheshmarova/add-display-density-DI-toke…
mpavlinov Nov 6, 2018
70f11a0
Merge branch 'master' into VSlavov/grid-edit-dirty
ViktorSlavov Nov 6, 2018
88067d9
fix(igx-grid): Clear filter when value is cleared from input, #2945
sstoyanovIG Nov 6, 2018
987c798
Merge branch '6.2.x' into vkacheshmarova/add-display-density-DI-token…
kdinev Nov 6, 2018
df616ac
Merge pull request #2942 from IgniteUI/VSlavov/grid-edit-dirty
kdinev Nov 6, 2018
55b91a3
Merge branch '6.2.x' into vkacheshmarova/add-display-density-DI-token…
kdinev Nov 6, 2018
8c99236
Merge branch 'master' into sstoyanov/bug-fix-2937
kdinev Nov 6, 2018
390bddd
Merge branch '6.2.x' into sstoyanov/bug-fix-2945
kdinev Nov 6, 2018
3291f21
Merge pull request #2847 from IgniteUI/vkacheshmarova/add-display-den…
mpavlinov Nov 7, 2018
40f2f19
Merge branch '6.2.x' into sstoyanov/bug-fix-2937
mpavlinov Nov 7, 2018
2e0261e
Merge branch '6.2.x' into sstoyanov/bug-fix-2945
kdinev Nov 7, 2018
3e45fbe
test(treeGrid): Update treeGrid Keyboard navigation tests #2953
nrobakova Nov 8, 2018
cdb7c42
Merge pull request #2952 from IgniteUI/sstoyanov/bug-fix-2945
kdinev Nov 8, 2018
21f7f7c
Merge branch '6.2.x' into sstoyanov/bug-fix-2937
kdinev Nov 8, 2018
18c7ca6
Merge pull request #2947 from IgniteUI/sstoyanov/bug-fix-2937
bkulov Nov 8, 2018
8fe6734
Merge branch '6.2.x' into nrobakova/fix-tests-2953-6.2.x
zdrawku Nov 8, 2018
43f9b21
Merge pull request #2973 from IgniteUI/nrobakova/fix-tests-2953-6.2.x
zdrawku Nov 9, 2018
ab3b06e
Improve keyboard navigation in filtering (#2964)
sstoyanovIG Nov 9, 2018
fb8661e
feat(igx-grid): Close filter row on Esc, #2979
sstoyanovIG Nov 12, 2018
b9a35d9
test(igx-grid): Add test, #2979
sstoyanovIG Nov 12, 2018
ae5233a
Merge pull request #2986 from IgniteUI/sstoyanov/fr-#2979
bkulov Nov 12, 2018
8c7fda5
chore(*): Merging master into 6.2.x
kdinev Nov 13, 2018
44e0538
Merge pull request #3004 from IgniteUI/master-6.2.x
kdinev Nov 13, 2018
3597d0d
Sorting strategy merge 6.2.x (#2998)
kdinev Nov 13, 2018
a507721
chore(*): Merging 6.2.x into master
kdinev Nov 14, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ When you focus a specific cell and press one of the following key combinations,

### General

- `sortStrategy` input exposed to provide custom sort strategy for the `IgxColumnComponent`. The custom strategy should implement the `ISortingStrategy` interface, or can extend the base `SortingStrategy` class and override all or some of its public/protected members.
- `groupingComparer` input exposed to provide custom grouping compare function for the `IgxColumnComponent`. The function receives two values and should return `0` if they are to considered members of the same group.

### Bug fixes

- Fix sorting and groupby expression not syncing when there are already sorted columns. #2786
Expand Down
59 changes: 21 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion projects/igniteui-angular/src/lib/animations/main.js.map

This file was deleted.

This file was deleted.

Loading