Skip to content

Commit 354e0b9

Browse files
Merge branch 'master' into card-new-design
2 parents 7e2c332 + 58efca0 commit 354e0b9

File tree

227 files changed

+3777
-1852
lines changed

Some content is hidden

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

227 files changed

+3777
-1852
lines changed

.circleci/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ jobs:
4949
key: *cache_key
5050

5151
- run: bazel run @nodejs//:npm install
52-
# For some reason, circleci needs the postinstall to be run explicitly.
53-
# This may be unnecessary once rules_nodejs uses nodejs 8
54-
- run: bazel run @nodejs//:npm run postinstall
5552
- run: bazel build src/...
5653
- run: bazel test src/...
5754
- save_cache:

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
/src/cdk/bidi/** @jelbourn
6565
/src/cdk/coercion/** @jelbourn
6666
/src/cdk/collections/** @jelbourn @crisbeto @andrewseguin
67+
/src/cdk/drag-drop/** @crisbeto
6768
/src/cdk/keycodes/** @jelbourn
6869
/src/cdk/layout/** @josephperrott
6970
/src/cdk/observers/** @jelbourn @crisbeto
@@ -87,7 +88,6 @@
8788
/src/cdk-experimental/** @jelbourn
8889
/src/cdk-experimental/dialog/** @jelbourn @josephperrott @crisbeto
8990
/src/cdk-experimental/scrolling/** @mmalerba
90-
/src/cdk-experimental/drag-drop/** @crisbeto
9191

9292
# Docs examples & guides
9393
/guides/** @amcdnl @jelbourn

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
<a name="6.4.6"></a>
2+
## [6.4.6 argon-aftershave](https://github.com/angular/material2/compare/6.4.5...6.4.6) (2018-08-20)
3+
4+
5+
### Bug Fixes
6+
7+
* **cdk-text-field:** prevent keyframes from getting stripped by LibSass ([#12567](https://github.com/angular/material2/issues/12567)) ([4180e72](https://github.com/angular/material2/commit/4180e72))
8+
* **form-field:** update label gap for outline style ([#12555](https://github.com/angular/material2/issues/12555)) ([ffeb779](https://github.com/angular/material2/commit/ffeb779))
9+
* **progress-bar:** query state animation not working ([#11459](https://github.com/angular/material2/issues/11459)) ([948f655](https://github.com/angular/material2/commit/948f655)), closes [#11453](https://github.com/angular/material2/issues/11453)
10+
* **selection-list:** do not allow toggling disabled options ([#12617](https://github.com/angular/material2/issues/12617)) ([3c1995d](https://github.com/angular/material2/commit/3c1995d)), closes [#12608](https://github.com/angular/material2/issues/12608)
11+
* **tabs:** changed after checked error when using isActive in view ([#12206](https://github.com/angular/material2/issues/12206)) ([75632bd](https://github.com/angular/material2/commit/75632bd)), closes [#12197](https://github.com/angular/material2/issues/12197)
12+
13+
114
<a name="6.4.5"></a>
215
## [6.4.5 mithril-magnet](https://github.com/angular/material2/compare/6.4.3...6.4.4) (2018-08-13)
316

guides/schematics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This schematic will:
2020
- Add Prebuilt or Setup Custom Theme
2121
- Add Roboto fonts to your index.html
2222
- Apply simple CSS reset to body
23-
23+
- Install and load `hammerjs` for gestures in your project.
2424

2525
## Generator Schematics
2626
In addition to the install schematic, Angular Material has three schematics it comes packaged with:

0 commit comments

Comments
 (0)