Skip to content

Commit bddaa58

Browse files
Merge branch 'master' into datepicker-broad-selector
2 parents 8245646 + 872952e commit bddaa58

File tree

564 files changed

+16969
-9888
lines changed

Some content is hidden

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

564 files changed

+16969
-9888
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Angular Material components
22
/src/lib/* @jelbourn
33
/src/lib/autocomplete/** @kara @crisbeto
4+
/src/lib/badge/** @amcdnl
45
/src/lib/bottom-sheet/** @jelbourn @crisbeto
56
/src/lib/button-toggle/** @tinayuangao
67
/src/lib/button/** @tinayuangao
@@ -18,9 +19,11 @@
1819
/src/lib/list/** @jelbourn @crisbeto @devversion
1920
/src/lib/menu/** @kara @crisbeto
2021
/src/lib/paginator/** @andrewseguin
22+
/src/lib/prebuilt-themes/** @jelbourn
2123
/src/lib/progress-bar/** @jelbourn @crisbeto @josephperrott
2224
/src/lib/progress-spinner/** @jelbourn @crisbeto @josephperrott
2325
/src/lib/radio/** @tinayuangao @devversion
26+
/src/lib/schematics/** @amcdnl
2427
/src/lib/select/** @kara @crisbeto
2528
/src/lib/sidenav/** @mmalerba
2629
/src/lib/slide-toggle/** @devversion
@@ -32,7 +35,6 @@
3235
/src/lib/tabs/** @andrewseguin
3336
/src/lib/toolbar/** @devversion
3437
/src/lib/tooltip/** @andrewseguin
35-
/src/lib/badge/** @amcdnl
3638
/src/lib/tree/** @tinayuangao
3739

3840
# Angular Material core
@@ -42,10 +44,10 @@
4244
/src/lib/core/datetime/** @mmalerba
4345
/src/lib/core/error/** @crisbeto @mmalerba
4446
/src/lib/core/gestures/** @jelbourn
47+
/src/lib/core/label/** @kara @mmalerba
4548
/src/lib/core/line/** @jelbourn
4649
/src/lib/core/option/** @kara @crisbeto
4750
/src/lib/core/placeholder/** @kara @mmalerba
48-
/src/lib/core/label/** @kara @mmalerba
4951
/src/lib/core/ripple/** @devversion
5052
/src/lib/core/selection/** @tinayuangao @jelbourn
5153
/src/lib/core/selection/pseudo*/** @crisbeto @jelbourn
@@ -72,6 +74,7 @@
7274
/src/cdk/stepper/** @mmalerba
7375
/src/cdk/table/** @andrewseguin
7476
/src/cdk/testing/** @devversion
77+
/src/cdk/text-field/** @mmalerba
7578
/src/cdk/tree/** @tinayuangao
7679

7780
# Moment adapter package
@@ -92,13 +95,15 @@
9295
/src/demo-app/* @jelbourn
9396
/src/demo-app/a11y/** @tinayuangao
9497
/src/demo-app/autocomplete/** @kara @crisbeto
95-
/src/demo-app/bottom-sheet/** @jelbourn @crisbeto
98+
/src/demo-app/badge/** @amcdnl
9699
/src/demo-app/baseline/** @mmalerba
100+
/src/demo-app/bottom-sheet/** @jelbourn @crisbeto
97101
/src/demo-app/button-toggle/** @tinayuangao
98102
/src/demo-app/button/** @tinayuangao
99103
/src/demo-app/card/** @jelbourn
100104
/src/demo-app/checkbox/** @tinayuangao @devversion
101105
/src/demo-app/chips/** @tinayuangao
106+
/src/demo-app/connected-overlay/** @jelbourn @crisbeto
102107
/src/demo-app/dataset/** @andrewseguin
103108
/src/demo-app/datepicker/** @mmalerba
104109
/src/demo-app/demo-app/** @jelbourn
@@ -133,7 +138,6 @@
133138
/src/demo-app/tooltip/** @andrewseguin
134139
/src/demo-app/tree/** @tinayuangao
135140
/src/demo-app/typography/** @crisbeto
136-
/src/demo-app/badge/** @amcdnl
137141

138142
# E2E app
139143
/e2e/* @jelbourn
@@ -177,9 +181,6 @@
177181
/src/e2e-app/slide-toggle/** @devversion
178182
/src/e2e-app/tabs/** @andrewseguin
179183

180-
# Schematics
181-
/schematics/** @amcdnl
182-
183184
# Universal app
184185
/src/universal-app/** @jelbourn
185186

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/tmp
66
/deploy
77
/screenshots
8+
/bazel-out
89

910
# Example module file will be auto-generated.
1011
/src/material-examples/example-module.ts
@@ -40,5 +41,5 @@ testem.log
4041
/.git
4142

4243
# schematics
43-
/schematics/**/*.js
44-
/schematics/**/*.map
44+
/src/lib/schematics/**/*.js
45+
/src/lib/schematics/**/*.map

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ env:
4646
- LOGS_DIR=/tmp/angular-material2-build/logs
4747
- SAUCE_USERNAME=angular-ci
4848
- BROWSER_STACK_USERNAME=angularteam1
49-
- BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
49+
- BROWSER_STACK_ACCESS_KEY=CaXMeMHD9pr5PHg8N7Jq
5050
- BROWSER_PROVIDER_READY_FILE=/tmp/angular-material2-build/readyfile
5151
- BROWSER_PROVIDER_ERROR_FILE=/tmp/angular-material2-build/errorfile
5252

BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ filegroup(
1414
# TODO(alexeagle): figure out what to do
1515
srcs = glob(["/".join(["node_modules", pkg, "**", ext]) for pkg in [
1616
"@angular",
17+
"@angular-devkit",
18+
"@schematics",
1719
"@types",
1820
"bytebuffer",
1921
"hammerjs",
2022
"jasmine",
2123
"minimist",
2224
"moment",
25+
"parse5",
2326
"protobufjs",
2427
"protractor",
2528
"reflect-metadata",

0 commit comments

Comments
 (0)