Skip to content

Commit

Permalink
Merge pull request #209 from ryanttb/master
Browse files Browse the repository at this point in the history
rc1!
  • Loading branch information
ryanttb committed May 29, 2016
2 parents e3332c8 + a4b01c3 commit 1bfe35e
Show file tree
Hide file tree
Showing 12 changed files with 7,664 additions and 3,985 deletions.
20 changes: 9 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# jQuery Geo
# Contributing to jQuery Geo

## Contributing
## Important notes

### Important notes
Please don't edit files in the `dist` subdirectory as they are generated via Grunt. You'll find source code in the `js` subdirectory.
Please do not edit files in the `dist` subdirectory as they are generated via Grunt. You will find source code in the `js` subdirectory.

## Code style

### Code style
Regarding code style like indentation and whitespace, **follow the conventions you see used in the source already.**

Please follow jQuery Foundation's [JavaScript Style Guide](http://contribute.jquery.org/style-guide/js/) and/or [idomatic.js](https://github.com/rwldrn/idiomatic.js/).
Please follow jQuery Foundation [JavaScript Style Guide](http://contribute.jquery.org/style-guide/js/) and/or [idomatic.js](https://github.com/rwldrn/idiomatic.js/).

### Submitting pull requests
## Submitting pull requests

1. Create a new branch, please don't work in your `master` branch directly.
1. Create a new branch, please do not work in your `master` branch directly.
1. Fix stuff.
1. Run `grunt` to verify that your code is lint-free. Repeat steps 2-3 until done.
1. Update the documentation to reflect any changes.
1. Push to your fork and submit a pull request.

### Building with grunt
## Building with grunt

* install node.js ~0.8
* install grunt-cli ([info](http://gruntjs.com/getting-started#installing-the-cli)):
Expand All @@ -41,7 +41,6 @@ npm install grunt
npm install grunt-contrib-clean
npm install grunt-contrib-concat
npm install grunt-contrib-uglify
npm install grunt-contrib-qunit
npm install grunt-contrib-jshint
```

Expand All @@ -53,4 +52,3 @@ grunt

Unless you have downloaded a tagged release, grunt will create a test version of jQuery Geo: dist/jquery.geo-1.0.0-test.min.js


278 changes: 0 additions & 278 deletions LICENSE-GPL

This file was deleted.

Loading

0 comments on commit 1bfe35e

Please sign in to comment.