Skip to content

Commit a118c18

Browse files
mddragnevmddragnev
committed
Merge branch 'pivot-grid-master' of https://github.com/IgniteUI/igniteui-angular into mdragnev/pivot-selection
2 parents 3149c97 + 90bf08c commit a118c18

Some content is hidden

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

47 files changed

+30619
-185
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,11 @@
114114
"igniteui-sassdoc-theme": "^1.1.4",
115115
"jasmine": "~3.6.0",
116116
"jasmine-core": "~3.6.0",
117-
"jasmine-spec-reporter": "~5.0.2",
118117
"karma": "^6.3.7",
119118
"karma-chrome-launcher": "~3.1.0",
120119
"karma-coverage": "^2.0.3",
121120
"karma-jasmine": "~3.3.0",
122-
"karma-jasmine-html-reporter": "~1.5.4",
123121
"karma-jasmine-spec-tags": "~1.3.0",
124-
"karma-junit-reporter": "~2.0.1",
125-
"karma-spec-reporter": "~0.0.32",
126122
"lunr": "^2.3.8",
127123
"ng-packagr": "^13.0.0",
128124
"pngcrush": "^2.0.1",

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,16 @@ const GridResourceStringsBG_: ExpandRequire<IGridResourceStrings> = {
133133
igx_grid_actions_unpin_label: 'Откачи',
134134
igx_grid_actions_jumpUp_label: 'Придвижи се нагоре',
135135
igx_grid_actions_jumpDown_label: 'Придвижи се надолу',
136-
igx_grid_pivot_date_dimension_total: 'All Periods'
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
137146
};
138147

139148
/**

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,16 @@ const GridResourceStringsCS_: ExpandRequire<IGridResourceStrings> = {
133133
igx_grid_actions_unpin_label: 'Odepnout',
134134
igx_grid_actions_jumpUp_label: 'Vyskočit',
135135
igx_grid_actions_jumpDown_label: 'Skočit dolů',
136-
igx_grid_pivot_date_dimension_total: 'All Periods'
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
137146
};
138147

139148
/**

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,16 @@ const GridResourceStringsDA_: ExpandRequire<IGridResourceStrings> = {
133133
igx_grid_actions_unpin_label: 'Frigør',
134134
igx_grid_actions_jumpUp_label: 'Spring op',
135135
igx_grid_actions_jumpDown_label: 'Spring ned',
136-
igx_grid_pivot_date_dimension_total: 'All Periods'
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
137146
};
138147

139148
/**

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,16 @@ const GridResourceStringsDE_: ExpandRequire<IGridResourceStrings> = {
133133
igx_grid_actions_unpin_label: 'Löse',
134134
igx_grid_actions_jumpUp_label: 'Springe hoch',
135135
igx_grid_actions_jumpDown_label: 'Springe runter',
136-
igx_grid_pivot_date_dimension_total: 'All Periods'
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
137146
};
138147

139148
/**

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,16 @@ const GridResourceStringsES_: ExpandRequire<IGridResourceStrings> = {
133133
igx_grid_actions_unpin_label: 'Desanclar',
134134
igx_grid_actions_jumpUp_label: 'Saltar arriba',
135135
igx_grid_actions_jumpDown_label: 'Saltar abajo',
136-
igx_grid_pivot_date_dimension_total: 'All Periods'
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
137146
};
138147

139148
/**

‎projects/igniteui-angular-i18n/src/i18n/FR/grid-resources.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,16 @@ const GridResourceStringsFR_: ExpandRequire<IGridResourceStrings> = {
133133
igx_grid_actions_unpin_label: 'Détacher',
134134
igx_grid_actions_jumpUp_label: 'Sauter au début',
135135
igx_grid_actions_jumpDown_label: 'Sauter à la fin',
136-
igx_grid_pivot_date_dimension_total: 'All Periods'
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
137146
};
138147

139148
/**

‎projects/igniteui-angular-i18n/src/i18n/HU/grid-resources.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,16 @@ const GridResourceStringsHU_: ExpandRequire<IGridResourceStrings> = {
134134
igx_grid_actions_unpin_label: 'Rögzítés feloldása',
135135
igx_grid_actions_jumpUp_label: 'Ugrás felfelé',
136136
igx_grid_actions_jumpDown_label: 'Ugrás lefelé',
137-
igx_grid_pivot_date_dimension_total: 'All Periods'
137+
igx_grid_pivot_date_dimension_total: 'All Periods',
138+
igx_grid_pivot_aggregate_count: 'Count',
139+
igx_grid_pivot_aggregate_min: 'Minimum',
140+
igx_grid_pivot_aggregate_max: 'Maximum',
141+
igx_grid_pivot_aggregate_sum: 'Sum',
142+
igx_grid_pivot_aggregate_avg: 'Average',
143+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
144+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
145+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
146+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
138147
};
139148

140149
/**

‎projects/igniteui-angular-i18n/src/i18n/IT/grid-resources.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,16 @@ const GridResourceStringsIT_: ExpandRequire<IGridResourceStrings> = {
133133
igx_grid_actions_unpin_label: 'Deseleziona',
134134
igx_grid_actions_jumpUp_label: 'Salta su',
135135
igx_grid_actions_jumpDown_label: 'Salta giù',
136-
igx_grid_pivot_date_dimension_total: 'All Periods'
136+
igx_grid_pivot_date_dimension_total: 'All Periods',
137+
igx_grid_pivot_aggregate_count: 'Count',
138+
igx_grid_pivot_aggregate_min: 'Minimum',
139+
igx_grid_pivot_aggregate_max: 'Maximum',
140+
igx_grid_pivot_aggregate_sum: 'Sum',
141+
igx_grid_pivot_aggregate_avg: 'Average',
142+
igx_grid_pivot_aggregate_date_latest: 'Latest Date',
143+
igx_grid_pivot_aggregate_date_earliest: 'Earliest Date',
144+
igx_grid_pivot_aggregate_time_latest: 'Latest Time',
145+
igx_grid_pivot_aggregate_time_earliest: 'Earliest Time'
137146
};
138147

139148
/**

0 commit comments

Comments
 (0)