Skip to content

Commit 407bfab

Browse files
authored
Merge branch 'master' into range-calendar-styling
2 parents 6e64e52 + c2fc53d commit 407bfab

File tree

157 files changed

+4101
-1678
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+4101
-1678
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@ before_script:
1717
# more heap mem per https://github.com/angular/angular-cli/issues/12645, https://github.com/npm/npm/issues/12238#issuecomment-367147962
1818
- export NODE_OPTIONS="--max_old_space_size=4096"
1919
- npm install -g gulp
20+
- npm install -g istanbul-combine
2021
script:
2122
- npm run lint:lib
2223
- ng build igniteui-angular --prod
2324
- npm run build:style
24-
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib; fi
25+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:others; fi
26+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:grid; fi
27+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:tgrid; fi
28+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib:hgrid; fi
29+
- if [ -z "${TRAVIS_TAG}" ]; then istanbul-combine -d coverage -p none -r lcov -r html coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json; fi
2530
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi
2631
- if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
2732

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
All notable changes for each version of this project will be documented in this file.
44

5+
## 8.2.0
6+
7+
### New Features
8+
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
9+
- `uniqueColumnValuesStrategy` input is added. This property provides a callback for loading unique column values on demand. If this property is provided, the unique values it generates will be used by the Excel Style Filtering (instead of using the unique values from the data that is bound to the grid).
10+
- `igxExcelStyleLoading` directive is added, which can be used to provide a custom loading template for the Excel Style Filtering. If this property is not provided, a default loading template will be used instead.
11+
### General
12+
- `IgxGrid`, `IgxTreeGrid`, `IgxHierarchicalGrid`
13+
- **Breaking Change** `igxExcelStyleSortingTemplate` directive is renamed to `igxExcelStyleSorting`.
14+
- **Breaking Change** `igxExcelStyleMovingTemplate` directive is renamed to `igxExcelStyleMoving`.
15+
- **Breaking Change** `igxExcelStyleHidingTemplate` directive is renamed to `igxExcelStyleHiding`.
16+
- **Breaking Change** `igxExcelStylePinningTemplate` directive is renamed to `igxExcelStylePinning`.
17+
## 8.1.4
18+
- `IgxDialog` new @Input `positionSettings` is now available. It provides the ability to get/set both position and animation settings of the Dialog component.
19+
520
## 8.1.3
621
- `IgxCombo`
722
- Combo `onSelectionChange` events now emits the item(s) that were added to or removed from the collection:

azure-pipelines.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,42 @@ steps:
77
env:
88
AZURE_PIPELINES: "true"
99

10+
- script: sudo npm install -g istanbul-combine
11+
displayName: 'Install coverage combiner'
12+
env:
13+
AZURE_PIPELINES: "true"
14+
1015
- script: npm run lint:lib
1116
displayName: 'Run lint'
1217

1318
- script: npm run build:lib
1419
displayName: 'Build source code and styles'
1520

16-
- script: npm run test:lib:azure
17-
displayName: 'Run tests'
21+
- script: npm run test:lib:azure:others
22+
displayName: 'Run non-grid tests'
23+
env:
24+
NODE_OPTIONS: "--max_old_space_size=4096"
25+
26+
- script: npm run test:lib:azure:grid
27+
displayName: 'Run grid tests'
1828
env:
1929
NODE_OPTIONS: "--max_old_space_size=4096"
2030

31+
- script: npm run test:lib:azure:tgrid
32+
displayName: 'Run tree grid tests'
33+
env:
34+
NODE_OPTIONS: "--max_old_space_size=4096"
35+
36+
- script: npm run test:lib:azure:hgrid
37+
displayName: 'Run hierarchical grid tests'
38+
env:
39+
NODE_OPTIONS: "--max_old_space_size=4096"
40+
41+
- script: istanbul-combine -d coverage -p none -r lcov -r cobertura coverage/hierarchical-grid/coverage-final.json coverage/tree-grid/coverage-final.json coverage/non-grid/coverage-final.json coverage/grid/coverage-final.json
42+
displayName: 'Combine coverage results'
43+
env:
44+
AZURE_PIPELINES: "true"
45+
2146
- script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
2247
condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular'))
2348
displayName: 'Code coverage @ Coveralls'

0 commit comments

Comments
 (0)