-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #172 from Polymer/master
6/5 master -> stable
- Loading branch information
Showing
39 changed files
with
6,760 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Names should be added to this file with this pattern: | ||
# | ||
# For individuals: | ||
# Name <email address> | ||
# | ||
# For organizations: | ||
# Organization <fnmatch pattern> | ||
# | ||
Google Inc. <*@google.com> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
# Contributing | ||
|
||
Want to contribute to polymer? Great! | ||
Want to contribute to Polymer? Great! | ||
|
||
We are more than happy to accept external contributions to the project in the form of [feedback](https://groups.google.com/forum/?fromgroups=#!forum/polymer-dev), [bug reports](https://github.com/Polymer/polymer/issues), and pull requests. | ||
We are more than happy to accept external contributions to the project in the form of [feedback](https://groups.google.com/forum/?fromgroups=#!forum/polymer-dev), [bug reports](../../issues), and pull requests. | ||
|
||
## Contributor License Agreement | ||
|
||
|
@@ -22,8 +22,9 @@ Other projects require a similar agreement: jQuery, Firefox, Apache, Node, and m | |
Here's an easy guide that should get you up and running: | ||
|
||
1. Fork the project on github and pull down your copy. | ||
> replace the {{ username }} with your username and {{ repository }} with the repository name | ||
git clone [email protected]:username/polymer.git --recursive | ||
git clone [email protected]:{{ username }}/{{ repository }}.git --recursive | ||
|
||
Note the `--recursive`. This is necessary for submodules to initialize properly. If you don't do a recursive clone, you'll have to init them manually: | ||
|
||
|
@@ -40,8 +41,7 @@ That's it for the one time setup. Now you're ready to make a change. | |
|
||
We iterate fast! To avoid potential merge conflicts, it's a good idea to pull from the main project before making a change and submitting a pull request. The easiest way to do this is setup a remote called `upstream` and do a pull before working on a change: | ||
|
||
cd polymer | ||
git remote add upstream git://github.com/Polymer/polymer.git | ||
git remote add upstream git://github.com/Polymer/{{ repository }}.git | ||
|
||
Then before making a change, do a pull from the upstream `master` branch: | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule platform
updated
from 39c3e1 to 704bce
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.