Skip to content

Commit dd318a9

Browse files
authored
Merge branch 'master' into mdragnev/fix-12447
2 parents 87d2954 + e5802ad commit dd318a9

File tree

177 files changed

+3890
-3599
lines changed

Some content is hidden

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

177 files changed

+3890
-3599
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ npm-debug.log
3838
yarn-error.log
3939
testem.log
4040
/typings
41+
TESTS-**.xml
4142

4243
# System Files
4344
.DS_Store

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ All notable changes for each version of this project will be documented in this
5353
- `multi` mode - select/deselect all dates between the last selected/deselected and the one clicked while holding `Shift`.
5454
- `range` mode - extend/shorten the range from the last selected date to the one clicked while holding `Shift`.
5555

56+
- `IgxFilterOptions`
57+
- Added support for multiple keys.
58+
5659
### Theme Changes
5760
- **Breaking Changes** - The `palette` function no longer provides `info`, `success`, `warn` and `error` colors. Therefore you have to pass custom values for them if you need to use these colors. You can also use the values for `info`, `success`, `warn` and `error` colors from our predefined color palettes.
5861

azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ steps:
5858
testRunner: 'JUnit'
5959
testResultsFiles: '**/TESTS-*.xml'
6060

61-
# - task: PublishCodeCoverageResults@1
62-
# inputs:
63-
# codeCoverageTool: Cobertura
64-
# summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
65-
# reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'
61+
- task: PublishCodeCoverageResults@1
62+
inputs:
63+
codeCoverageTool: Cobertura
64+
summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
65+
reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'

package-lock.json

Lines changed: 154 additions & 390 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"e2e": "ng e2e",
1111
"test:lib": "ng test igniteui-angular --watch=false --no-progress --code-coverage",
1212
"test:lib:perf": "ng test igniteui-angular --watch=false --no-progress --karma-config=./projects/igniteui-angular/karma.test-perf.conf.js",
13-
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress",
13+
"test:lib:azure": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.azure.conf.js",
1414
"test:lib:grid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.grid.conf.js",
1515
"test:lib:tgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.tree-grid.conf.js",
1616
"test:lib:hgrid": "ng test igniteui-angular --watch=false --no-progress --code-coverage --karma-config=./projects/igniteui-angular/karma.hierarchical-grid.conf.js",
@@ -67,7 +67,9 @@
6767
"core-js": "^3.26.1",
6868
"fflate": "^0.7.3",
6969
"hammerjs": "^2.0.8",
70+
"igniteui-theming": "^1.2.0",
7071
"igniteui-trial-watermark": "^1.0.3",
72+
"karma-junit-reporter": "^2.0.1",
7173
"lodash-es": "^4.17.21",
7274
"rxjs": "^6.6.7",
7375
"tslib": "^2.3.0",
@@ -114,7 +116,6 @@
114116
"hammer-simulator": "0.0.1",
115117
"ig-typedoc-theme": "^4.2.0",
116118
"igniteui-sassdoc-theme": "^1.1.4",
117-
"igniteui-theming": "^1.1.4",
118119
"igniteui-webcomponents": "^4.0.0",
119120
"jasmine": "^4.5.0",
120121
"jasmine-core": "~4.5.0",

projects/igniteui-angular-i18n/src/i18n/BG/grid-resources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const GridResourceStringsBG_: ExpandRequire<IGridResourceStrings> = {
165165
igx_grid_max_length_validation_error: 'Входните данни не трябва да са дълги повече от {0} знака.',
166166
igx_grid_email_validation_error: 'Трябва да бъде въведен валиден имейл адрес.',
167167
igx_grid_pattern_validation_error: 'Въведените данни не спазват зададения образец.',
168-
igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
168+
igx_grid_pivot_no_aggregator: 'Няма открит валиден агрегатор за {0}. Задайте валидна стойност на aggregatorName или aggregator.'
169169
};
170170

171171
/**

projects/igniteui-angular-i18n/src/i18n/CS/grid-resources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const GridResourceStringsCS_: ExpandRequire<IGridResourceStrings> = {
165165
igx_grid_max_length_validation_error: 'Záznam by neměl mít více než {0} znaků',
166166
igx_grid_email_validation_error: 'Je třeba zadat platnou e-mailovou adresu',
167167
igx_grid_pattern_validation_error: 'Položka neodpovídá požadovanému vzoru',
168-
igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
168+
igx_grid_pivot_no_aggregator: 'Pro {0} nebyl nalezen žádný platný agregátor. Nastavte prosím buď platný aggregatorName nebo aggregator.'
169169
};
170170

171171
/**

projects/igniteui-angular-i18n/src/i18n/DA/grid-resources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const GridResourceStringsDA_: ExpandRequire<IGridResourceStrings> = {
165165
igx_grid_max_length_validation_error: 'Indtastningen må højst være {0} tegn',
166166
igx_grid_email_validation_error: 'Der skal indtastes en gyldig e-mailadresse',
167167
igx_grid_pattern_validation_error: 'Indtastning stemmer ikke overens med det krævede mønster',
168-
igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
168+
igx_grid_pivot_no_aggregator: 'Der blev ikke fundet nogen gyldig aggregator for {0}. Indstil enten et gyldigt "aggregatorName" eller "aggregator".'
169169
};
170170

171171
/**

projects/igniteui-angular-i18n/src/i18n/DE/grid-resources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const GridResourceStringsDE_: ExpandRequire<IGridResourceStrings> = {
165165
igx_grid_max_length_validation_error: 'Bitte geben Sie nicht mehr als {0} Zeichen ein',
166166
igx_grid_email_validation_error: 'Eine gültige E-Mail-Adresse sollte eingegeben werden',
167167
igx_grid_pattern_validation_error: 'Eintrag entspricht nicht dem erforderlichen Muster',
168-
igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
168+
igx_grid_pivot_no_aggregator: 'Kein gültiger Aggregator für {0} gefunden. Bitte legen Sie entweder einen gültigen „aggregatorName“ oder „aggregator“ fest.'
169169
};
170170

171171
/**

projects/igniteui-angular-i18n/src/i18n/ES/grid-resources.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const GridResourceStringsES_: ExpandRequire<IGridResourceStrings> = {
165165
igx_grid_max_length_validation_error: 'No escriba más de {0} caracteres',
166166
igx_grid_email_validation_error: 'Debe introducirse una dirección de correo electrónico válida.',
167167
igx_grid_pattern_validation_error: 'La entrada no coincide con el patrón necesario.',
168-
igx_grid_pivot_no_aggregator: 'No valid aggregator found for {0}. Please set either a valid aggregatorName or aggregator.'
168+
igx_grid_pivot_no_aggregator: 'No se encontró un agregador válido para {0}. Establezca un aggregatorName o aggregator válido.'
169169
};
170170

171171
/**

0 commit comments

Comments
 (0)