diff --git a/CHANGELOG.md b/CHANGELOG.md index 54f53edd2ab..527b297e256 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,21 @@ * **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) +#### Contributors + +Thank you to the excellent contributors who helped with the v1.1.6 release: + +[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) | +:---: |:---: |:---: |:---: |:---: |:---: | +[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) | + +[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) | +:---: |:---: |:---: |:---: |:---: |:---: | +[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) | + +[phistuck](https://github.com/phistuck) |[wangsha](https://github.com/wangsha) |[alphatwit](https://github.com/alphatwit) |[andrewseguin](https://github.com/andrewseguin) | +:---: |:---: |:---: |:---: | +[phistuck](https://github.com/phistuck) |[wangsha](https://github.com/wangsha) |[alphatwit](https://github.com/alphatwit) |[andrewseguin](https://github.com/andrewseguin) | diff --git a/README.md b/README.md index 94a2787c4ca..796f985e69c 100644 --- a/README.md +++ b/README.md @@ -50,13 +50,13 @@ The patch builds (1.0.4, 1.0.5, 1.0.6) are prepared based on commits in the `pat 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. -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`. +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`. ##### Changelog 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. -> 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. +> 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. ## Contributing diff --git a/docs/app/partials/contributors.tmpl.html b/docs/app/partials/contributors.tmpl.html index 3c6bd50f9aa..6227fdffb01 100644 --- a/docs/app/partials/contributors.tmpl.html +++ b/docs/app/partials/contributors.tmpl.html @@ -8,12 +8,12 @@

Contributors

-

(sorted by GitHub name)

+

(sorted by number of commits)


- + diff --git a/docs/guides/BUILD.md b/docs/guides/BUILD.md index 37e31bc3090..c965726e6ae 100644 --- a/docs/guides/BUILD.md +++ b/docs/guides/BUILD.md @@ -40,7 +40,7 @@ The following command line tasks are available: - `gulp karma` to test once - `gulp karma-watch` to test & watch for changes -### Building the Documentation +### Building the Documentation The AngularJS Material **Live Docs** are generated from the source code and demos and actually use the AngularJS Material components and themes. @@ -50,7 +50,7 @@ AngularJS Material components and themes. See the [Building the Live Documentation](../README.md#docs) document for details. -### Building the Library +### Building the Library Developers can build the entire AngularJS Material library or individual component modules. The library comprises: @@ -79,7 +79,7 @@ gulp build gulp build --release ``` -### Using the Library with Bower +### Using the Library with Bower For developers not interested in building the AngularJS Material library, use **bower** to install and use the AngularJS Material distribution files. @@ -109,7 +109,7 @@ dependencies. For example, the **slider** component is registered as a **material.components.slider** module. -### Building Individual Components +### Building Individual Components To build and deploy assets for each component individually, run the command @@ -159,7 +159,7 @@ and JS from both the **slider** and the **core** modules: -- slider-default-theme.css ``` -### Component Debugging +### Component Debugging Debugging a demo in the Live Docs is complicated due the multiple demos loading and initializing. A 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: * Open Dev Tools and debug... -## Theming +## Theming -https://material.angularjs.org/#/Theming/01_introduction +[Go to the Theming Guide](https://material.angularjs.org/latest/Theming/01_introduction) diff --git a/docs/guides/COMMIT_LEVELS.md b/docs/guides/COMMIT_LEVELS.md index 12b937a3456..84667ca445f 100644 --- a/docs/guides/COMMIT_LEVELS.md +++ b/docs/guides/COMMIT_LEVELS.md @@ -26,23 +26,27 @@ AngularJS Material uses a "Pull Request" process to allow team leaders opportuni The development team has defined three (3) Github levels of **commit authorization** within [Angular/Material](https://github.com/angular/material/): * General: - * Developers in this group includes any team members not listed under Core or Team Leads below - * For any and all changes, developers must use a fork of the AngularJS Material repository - * Please do not make or submit any changes from the master branch. + * Developers in this group includes any team members not listed under Team Leads or Caretakers below + * For any and all changes, developers must use a feature branch from a fork of the AngularJS Material repository + * Please do not make or submit any changes from the master branch of your fork * Are not authorized to merge PRs * Should not reassign issue or change issue milestones * Should ensure their issue labels are correct * Should ensure their issues are tested with latest HEAD versions of AngularJS Material - * Should ensure their issues are tested with latest releases of AngularJS (1.3.x, 1.4.x, 1.5.x) -* Core: - * Includes: [Topher Fangio](https://github.com/topherfangio), [Elad Bezalel](https://github.com/eladbezalel) - * Should not merge PRs (unless explicitly requested) - * Should use AngularJS Material branches for major, non-trivial changes. - * For minor changes, developers in this group may elect to commit direct to master. -* Team Leads: - * Includes: [Naomi Black](https://github.com/naomiblack), [Thomas Burleson](https://github.com/ThomasBurleson), [Jeremy Elbourn](https://github.com/jelbourn) - * May review PRs - * ThomasBurleson is the primary PR reviewer + * Should ensure their issues are tested with latest releases of AngularJS (1.5.x, 1.6.x) +* Team Leads: + * Includes: [Michael Prentice](https://github.com/splaktar) + * Are not authorized to merge PRs + * Should assign issues and change issue milestones + * Should ensure issue labels are correct + * Should review PRs + * Michael Prentice is the primary PR reviewer + * Should confirm Karma tests pass +* Google Caretakers: + * 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) + * Should review PRs * Should confirm Karma tests pass - * Should squash as need - * Should ensure the PR is closed when the merge finishes. + * Should squash as needed + * Should ensure the PR is closed when the merge finishes + * Should create releases + * Should add release assets to the Google CDN diff --git a/package-lock.json b/package-lock.json index e910a5deda1..dad42224601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4632,9 +4632,9 @@ } }, "github-contributors-list": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/github-contributors-list/-/github-contributors-list-1.2.2.tgz", - "integrity": "sha1-BgTL6hD6SQRrs/O50dnEfsVTkrk=", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/github-contributors-list/-/github-contributors-list-1.2.3.tgz", + "integrity": "sha512-yifb1ausL4zUb4kNfOAMaVtBleJzPKiiKWOpg1XauUcv3hfWUMQ2jVNBkDw/8eZiT3cJ4mL2i4ncp1TtnQv4zA==", "dev": true, "requires": { "marked": "0.3.12", diff --git a/package.json b/package.json index 22c55d59794..8aae1fada04 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "dgeni-packages": "^0.22.1", "github": "^12.0.5", "eslint": "^4.3.0", - "github-contributors-list": "^1.2.2", + "github-contributors-list": "^1.2.3", "glob": "~7.0.5", "gulp": "^3.9.1", "gulp-add-src": "^0.2.0", @@ -81,10 +81,11 @@ }, "scripts": { "build": "gulp build", + "contributors:release": "githubcontrib --owner angular --repo material --cols 6 --format md --showlogin true --sha master --sortOrder desc --fromDate ", "docs:build": "gulp docs", "docs:watch": "gulp watch site --dev", "test:fast": "gulp karma-fast", "test:full": "gulp karma", "lint": "eslint ." } -} \ No newline at end of file +}