Skip to content

Commit 0cc5dc5

Browse files
authored
Merge branch '20.0.x' into ikitanov/fix-15839
2 parents 49af236 + df8004e commit 0cc5dc5

38 files changed

+506
-74
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master, 19.2.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
16+
branches: [ master, '[0-9]+.[0-9]+.x' ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master, 19.2.x, 18.2.x, 17.2.x, 16.1.x, 15.1.x ]
19+
branches: [ master, '[0-9]+.[0-9]+.x' ]
2020
schedule:
2121
- cron: '33 4 * * 4'
2222

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

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

5+
## 20.0.6
6+
### General
7+
- `IgxSimpleCombo`
8+
- Added `disableFiltering` to the `IgxSimpleCombo`, which enables/disables the filtering in the list. The default is `false`.
9+
- `IgxCombo`, `IgxSimpleCombo`
10+
- Removed deprecated `filteringOptions.filterable` option.
11+
512
## 20.0.2
613

714
### New Features
@@ -42,7 +49,6 @@ All notable changes for each version of this project will be documented in this
4249
```
4350

4451
## 19.2.0
45-
4652
### General
4753
- `IgxCarousel`
4854
- Removed deprecated property `keyboardSupport`.

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"hammerjs": "^2.0.8",
120120
"ig-typedoc-theme": "^6.0.0",
121121
"igniteui-dockmanager": "^1.16.1",
122-
"igniteui-sassdoc-theme": "^2.0.0",
122+
"igniteui-sassdoc-theme": "^2.0.1",
123123
"igniteui-webcomponents": "6.1.1",
124124
"jasmine": "^5.6.0",
125125
"jasmine-core": "^5.6.0",

projects/igniteui-angular-elements/src/app/wrapper/template-ref-wrapper.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ElementRef, EmbeddedViewRef, Injector, TemplateRef } from '@angular/core';
2+
import { getUUID } from '../../../../igniteui-angular/src/lib/grids/common/random';
23

34
const CONTEXT_PROP = 'context';
45
const IMPLICIT_PROP = 'implicit';
@@ -75,7 +76,7 @@ export class TemplateRefWrapper<C extends object> extends TemplateRef<C> {
7576
root = viewRef.rootNodes[0];
7677

7778
contentContext = new TemplateRefWrapperContentContext();
78-
contentId = crypto.randomUUID();
79+
contentId = getUUID();
7980
contentContext._id = contentId;
8081
root._id = contentId;
8182
contentContext.root = root;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ export const ComboResourceStringsBG = {
88
igx_combo_empty_message: 'Списъкът е празен',
99
igx_combo_filter_search_placeholder: 'Въведете термин за търсене',
1010
igx_combo_addCustomValues_placeholder: 'Добавяне на елемент',
11-
igx_combo_clearItems_placeholder: 'Изчистване на избора'
11+
igx_combo_clearItems_placeholder: 'Изчистване на избора',
12+
igx_combo_aria_label_options: 'Има избрани опции',
13+
igx_combo_aria_label_no_options: 'Няма избрани опции'
1214
} satisfies MakeRequired<IComboResourceStrings>;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ export const ComboResourceStringsCS = {
88
igx_combo_empty_message: 'Seznam je prázdný',
99
igx_combo_filter_search_placeholder: 'Zadejte hledaný výraz',
1010
igx_combo_addCustomValues_placeholder: 'Přidat položku',
11-
igx_combo_clearItems_placeholder: 'Vymazat výběr'
11+
igx_combo_clearItems_placeholder: 'Vymazat výběr',
12+
igx_combo_aria_label_options: 'Vybrané možnosti',
13+
igx_combo_aria_label_no_options: 'Žádné možnosti nejsou vybrány'
1214
} satisfies MakeRequired<IComboResourceStrings>;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ export const ComboResourceStringsDA = {
88
igx_combo_empty_message: 'Listen er tom',
99
igx_combo_filter_search_placeholder: 'Indtast en søgeterm',
1010
igx_combo_addCustomValues_placeholder: 'Tilføj element',
11-
igx_combo_clearItems_placeholder: 'Ryd markering'
11+
igx_combo_clearItems_placeholder: 'Ryd markering',
12+
igx_combo_aria_label_options: 'Valgte muligheder',
13+
igx_combo_aria_label_no_options: 'Ingen valgte muligheder'
1214
} satisfies MakeRequired<IComboResourceStrings>;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ export const ComboResourceStringsDE = {
88
igx_combo_empty_message: 'Die Liste ist leer',
99
igx_combo_filter_search_placeholder: 'Suchbegriff eingeben',
1010
igx_combo_addCustomValues_placeholder: 'Element hinzufügen',
11-
igx_combo_clearItems_placeholder: 'Auswahl löschen'
11+
igx_combo_clearItems_placeholder: 'Auswahl löschen',
12+
igx_combo_aria_label_options: 'Ausgewählte Optionen',
13+
igx_combo_aria_label_no_options: 'Keine Optionen ausgewählt'
1214
} satisfies MakeRequired<IComboResourceStrings>;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ export const ComboResourceStringsES = {
88
igx_combo_empty_message: 'La lista está vacía',
99
igx_combo_filter_search_placeholder: 'Escriba un término de búsqueda',
1010
igx_combo_addCustomValues_placeholder: 'Agregar elemento',
11-
igx_combo_clearItems_placeholder: 'Borrar selección'
11+
igx_combo_clearItems_placeholder: 'Borrar selección',
12+
igx_combo_aria_label_options: 'Opciones seleccionadas',
13+
igx_combo_aria_label_no_options: 'No hay opciones seleccionadas'
1214
} satisfies MakeRequired<IComboResourceStrings>;

0 commit comments

Comments
 (0)