Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit ef537d5

Browse files
Splaktarjosephperrott
authored andcommitted
docs(changelog,build,commit-levels,readme): updates for v1.1.6 (#11076)
1 parent 6e425c4 commit ef537d5

File tree

7 files changed

+52
-32
lines changed

7 files changed

+52
-32
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@
1717

1818
* **datepicker:** add the ability to restrict users to a calendar view ([#9736](https://github.com/angular/material/issues/9736)) ([eecc976](https://github.com/angular/material/commit/eecc976)), closes [#9260](https://github.com/angular/material/issues/9260)
1919

20+
#### Contributors
21+
22+
Thank you to the excellent contributors who helped with the v1.1.6 release:
23+
24+
[<img alt="crisbeto" src="https://avatars0.githubusercontent.com/u/4450522?v=4&s=117" width="117">](https://github.com/crisbeto) |[<img alt="jelbourn" src="https://avatars3.githubusercontent.com/u/838736?v=4&s=117" width="117">](https://github.com/jelbourn) |[<img alt="EladBezalel" src="https://avatars3.githubusercontent.com/u/6004537?v=4&s=117" width="117">](https://github.com/EladBezalel) |[<img alt="Splaktar" src="https://avatars1.githubusercontent.com/u/3506071?v=4&s=117" width="117">](https://github.com/Splaktar) |[<img alt="alopezsanchez" src="https://avatars3.githubusercontent.com/u/15221596?v=4&s=117" width="117">](https://github.com/alopezsanchez) |[<img alt="Phoqe" src="https://avatars3.githubusercontent.com/u/7033377?v=4&s=117" width="117">](https://github.com/Phoqe) |
25+
:---: |:---: |:---: |:---: |:---: |:---: |
26+
[crisbeto](https://github.com/crisbeto) |[jelbourn](https://github.com/jelbourn) |[EladBezalel](https://github.com/EladBezalel) |[Splaktar](https://github.com/Splaktar) |[alopezsanchez](https://github.com/alopezsanchez) |[Phoqe](https://github.com/Phoqe) |
27+
28+
[<img alt="oliversalzburg" src="https://avatars2.githubusercontent.com/u/1658949?v=4&s=117" width="117">](https://github.com/oliversalzburg) |[<img alt="graingert" src="https://avatars3.githubusercontent.com/u/413772?v=4&s=117" width="117">](https://github.com/graingert) |[<img alt="dulynoded" src="https://avatars0.githubusercontent.com/u/11513504?v=4&s=117" width="117">](https://github.com/dulynoded) |[<img alt="Ardeshir81" src="https://avatars3.githubusercontent.com/u/5755214?v=4&s=117" width="117">](https://github.com/Ardeshir81) |[<img alt="beetlerom" src="https://avatars3.githubusercontent.com/u/1420091?v=4&s=117" width="117">](https://github.com/beetlerom) |[<img alt="davestacey" src="https://avatars3.githubusercontent.com/u/754281?v=4&s=117" width="117">](https://github.com/davestacey) |
29+
:---: |:---: |:---: |:---: |:---: |:---: |
30+
[oliversalzburg](https://github.com/oliversalzburg) |[graingert](https://github.com/graingert) |[dulynoded](https://github.com/dulynoded) |[Ardeshir81](https://github.com/Ardeshir81) |[beetlerom](https://github.com/beetlerom) |[davestacey](https://github.com/davestacey) |
31+
32+
[<img alt="phistuck" src="https://avatars0.githubusercontent.com/u/184400?v=4&s=117" width="117">](https://github.com/phistuck) |[<img alt="wangsha" src="https://avatars0.githubusercontent.com/u/221029?v=4&s=117" width="117">](https://github.com/wangsha) |[<img alt="alphatwit" src="https://avatars1.githubusercontent.com/u/3231066?v=4&s=117" width="117">](https://github.com/alphatwit) |[<img alt="andrewseguin" src="https://avatars3.githubusercontent.com/u/22898577?v=4&s=117" width="117">](https://github.com/andrewseguin) |
33+
:---: |:---: |:---: |:---: |
34+
[phistuck](https://github.com/phistuck) |[wangsha](https://github.com/wangsha) |[alphatwit](https://github.com/alphatwit) |[andrewseguin](https://github.com/andrewseguin) |
2035

2136

2237
<a name="1.1.5"></a>

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ The patch builds (1.0.4, 1.0.5, 1.0.6) are prepared based on commits in the `pat
5050

5151
The minor build (1.1.0, 1.2.0, 1.3.0,...) are prepared based on commits in the `master` branch; which will remain the daily development branch AND will be the source for the `minor` releases.
5252

53-
Our formal release of `minor` builds is much less frequent; probably 1x / Quarter. Developers can easily obtain the latest, full change-set from bower or npm using references to `@master`.
53+
Our formal release of `minor` builds is much less frequent. Developers can easily obtain the latest, full change-set from bower or npm using references to `@master`.
5454

5555
##### Changelog
5656

5757
The Changelog may contain releases for `patch` or `minor`. If you do not see a fix listed in the Changelog but the issue has been resolved or the PR merged, then those changes will be `master` available in the next *minor* release.
5858

59-
> for the purposes of AngularJS Material, you *could* think of the patch releases as being *minor* changes and the 'minor' releases as being *major* changes.
59+
> For the purposes of AngularJS Material, you *could* think of the patch releases as being *minor* changes and the 'minor' releases as being *major* changes.
6060
6161

6262
## <a name="contributing"></a> Contributing

docs/app/partials/contributors.tmpl.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
<h2>Contributors</h2>
1010

11-
<p style="margin-top:-10px;"> (sorted by GitHub name)</p>
11+
<p style="margin-top:-10px;"> (sorted by number of commits)</p>
1212
<br/>
1313

1414
<div class="contributor_tables">
1515

16-
<!-- User the 'contributors.json' generated by 'npm run contributors' -->
16+
<!-- Use the 'contributors.json' generated by 'gulp build-contributors' -->
1717

1818
<table ng-repeat="row in github.contributors">
1919
<thead>

docs/guides/BUILD.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The following command line tasks are available:
4040
- `gulp karma` to test once
4141
- `gulp karma-watch` to test & watch for changes
4242

43-
###<a name="livedocs"></a> Building the Documentation
43+
### <a name="livedocs"></a> Building the Documentation
4444

4545
The AngularJS Material **Live Docs** are generated from the source code and demos and actually use the
4646
AngularJS Material components and themes.
@@ -50,7 +50,7 @@ AngularJS Material components and themes.
5050

5151
See the [Building the Live Documentation](../README.md#docs) document for details.
5252

53-
###<a name="builds"></a> Building the Library
53+
### <a name="builds"></a> Building the Library
5454

5555
Developers can build the entire AngularJS Material library or individual component modules. The
5656
library comprises:
@@ -79,7 +79,7 @@ gulp build
7979
gulp build --release
8080
```
8181

82-
###<a name="bower"></a> Using the Library with Bower
82+
### <a name="bower"></a> Using the Library with Bower
8383

8484
For developers not interested in building the AngularJS Material library, use **bower** to install and
8585
use the AngularJS Material distribution files.
@@ -109,7 +109,7 @@ dependencies.
109109
110110
For example, the **slider** component is registered as a **material.components.slider** module.
111111

112-
###<a name="comp_builds"></a> Building Individual Components
112+
### <a name="comp_builds"></a> Building Individual Components
113113

114114
To build and deploy assets for each component individually, run the command
115115

@@ -159,7 +159,7 @@ and JS from both the **slider** and the **core** modules:
159159
-- slider-default-theme.css
160160
```
161161

162-
###<a name="comp_debug"></a> Component Debugging
162+
### <a name="comp_debug"></a> Component Debugging
163163

164164
Debugging a demo in the Live Docs is complicated due the multiple demos loading and initializing. A
165165
more practical approach is to open and debug a specific, standalone Component demo.
@@ -199,6 +199,6 @@ After running `gulp server` to start a *LiveReload* server in your project root:
199199
* Open Dev Tools and debug...
200200

201201

202-
##<a name="themes"></a> Theming
202+
## <a name="themes"></a> Theming
203203

204-
https://material.angularjs.org/#/Theming/01_introduction
204+
[Go to the Theming Guide](https://material.angularjs.org/latest/Theming/01_introduction)

docs/guides/COMMIT_LEVELS.md

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,27 @@ AngularJS Material uses a "Pull Request" process to allow team leaders opportuni
2626
The development team has defined three (3) Github levels of **commit authorization** within [Angular/Material](https://github.com/angular/material/):
2727

2828
* General:
29-
* Developers in this group includes any team members not listed under Core or Team Leads below
30-
* For any and all changes, developers must use a fork of the AngularJS Material repository
31-
* Please do not make or submit any changes from the master branch.
29+
* Developers in this group includes any team members not listed under Team Leads or Caretakers below
30+
* For any and all changes, developers must use a feature branch from a fork of the AngularJS Material repository
31+
* Please do not make or submit any changes from the master branch of your fork
3232
* Are not authorized to merge PRs
3333
* Should not reassign issue or change issue milestones
3434
* Should ensure their issue labels are correct
3535
* Should ensure their issues are tested with latest HEAD versions of AngularJS Material
36-
* Should ensure their issues are tested with latest releases of AngularJS (1.3.x, 1.4.x, 1.5.x)
37-
* Core:
38-
* Includes: [Topher Fangio](https://github.com/topherfangio), [Elad Bezalel](https://github.com/eladbezalel)
39-
* Should not merge PRs (unless explicitly requested)
40-
* Should use AngularJS Material branches for major, non-trivial changes.
41-
* For minor changes, developers in this group may elect to commit direct to master.
42-
* Team Leads:
43-
* Includes: [Naomi Black](https://github.com/naomiblack), [Thomas Burleson](https://github.com/ThomasBurleson), [Jeremy Elbourn](https://github.com/jelbourn)
44-
* May review PRs
45-
* ThomasBurleson is the primary PR reviewer
36+
* Should ensure their issues are tested with latest releases of AngularJS (1.5.x, 1.6.x)
37+
* Team Leads:
38+
* Includes: [Michael Prentice](https://github.com/splaktar)
39+
* Are not authorized to merge PRs
40+
* Should assign issues and change issue milestones
41+
* Should ensure issue labels are correct
42+
* Should review PRs
43+
* Michael Prentice is the primary PR reviewer
44+
* Should confirm Karma tests pass
45+
* Google Caretakers:
46+
* Includes: [Jeremy Elbourn](https://github.com/jelbourn), [Andrew Seguin](https://github.com/andrewseguin), [Joey Perrott](https://github.com/josephperrott), [Tina Yuangao](https://github.com/tinayuangao), [Miles Malerba](https://github.com/mmalerba)
47+
* Should review PRs
4648
* Should confirm Karma tests pass
47-
* Should squash as need
48-
* Should ensure the PR is closed when the merge finishes.
49+
* Should squash as needed
50+
* Should ensure the PR is closed when the merge finishes
51+
* Should create releases
52+
* Should add release assets to the Google CDN

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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"dgeni-packages": "^0.22.1",
3939
"github": "^12.0.5",
4040
"eslint": "^4.3.0",
41-
"github-contributors-list": "^1.2.2",
41+
"github-contributors-list": "^1.2.3",
4242
"glob": "~7.0.5",
4343
"gulp": "^3.9.1",
4444
"gulp-add-src": "^0.2.0",
@@ -81,10 +81,11 @@
8181
},
8282
"scripts": {
8383
"build": "gulp build",
84+
"contributors:release": "githubcontrib --owner angular --repo material --cols 6 --format md --showlogin true --sha master --sortOrder desc --fromDate ",
8485
"docs:build": "gulp docs",
8586
"docs:watch": "gulp watch site --dev",
8687
"test:fast": "gulp karma-fast",
8788
"test:full": "gulp karma",
8889
"lint": "eslint ."
8990
}
90-
}
91+
}

0 commit comments

Comments
 (0)