Skip to content

Commit 3cbdcfd

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into ddavidkov/treegrid
2 parents 76905ba + 8ffa20c commit 3cbdcfd

Some content is hidden

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

84 files changed

+16823
-121
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,5 @@ src/**/*.css.map
4646

4747
# Typedoc Theme
4848
extras/docs/themes/typedoc/bin
49+
extras/docs/themes/sassdoc/node_modules
50+
extras/docs/themes/sassdoc/sassdoc/*

.sassdocrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"name": "Ignite UI for Angular",
77
"version": "6.1.x"
88
},
9-
"theme": "default",
9+
"theme": "./extras/docs/themes/sassdoc",
1010
"autofill": ["throws", "content"],
1111
"groups": {
1212
"undefined": "general"

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ script:
1818
- npm run lint:lib
1919
- ng build igniteui-angular --prod
2020
- npm run build:style
21-
- npm run test:lib
22-
- npm run test:migration
21+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib; fi
22+
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:migration; fi
2323
- if [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
2424

2525
before_deploy:

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"git.ignoreLimitWarning": true
3+
}

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
All notable changes for each version of this project will be documented in this file.
44

55
## 6.2.0
6-
-`igxGrid`:
7-
- **Breaking change** `cellClasses` input on `IgxColumnComponent` now accepts an object literal to allow conditional cell styling.
6+
- `igxGrid`:
7+
- **Breaking change** `cellClasses` input on `IgxColumnComponent` now accepts an object literal to allow conditional cell styling.
88
- `igx-datePicker` selector is deprecated. Use `igx-date-picker` selector instead.
99
- `igxOverlay`:
1010
- `OverlaySettings` now also accepts an optional `outlet` to specify the container where the overlay should be attached.
@@ -55,6 +55,12 @@ All notable changes for each version of this project will be documented in this
5555
- Introduced `deselectDate` method added that deselects date(s) (based on the selection type)
5656
- `igxExpansionPanel`:
5757
- component added. `igxExpansionPanel` provides a way to display more information after expanding an item, respectively show less after collapsing it. For more detailed information see the [official documentation](https://www.infragistics.com/products/ignite-ui-angular/angular/components/expansion_panel.html).
58+
- `IgxList`:
59+
- the control now supports **ng-templates** which are shown "under" a list item when it is left or right panned. The templates are distinguished using the `igxListItemLeftPanning` and `igxListItemRightPanning` directives set on the templates.
60+
- the IgxList's `onLeftPan` and `onRightPan` events now have an argument of type `IListItemPanningEventArgs` (instead of `IgxListItemComponent`). The event argument has the following fields:
61+
- **item** of type `IgxListItemComponent`
62+
- **direction** of type `IgxListPanState`
63+
- **keepItem** of type `boolean`
5864

5965
## 6.1.5
6066
- **General**

0 commit comments

Comments
 (0)