-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
247 additions
and
42 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,168 @@ | ||
# Contributing to ocGrid | ||
|
||
Please take a moment to review this document in order to make the contribution | ||
process easy and effective for everyone involved. | ||
|
||
Following these guidelines helps to communicate that you respect the time of | ||
the developers managing and developing this open source project. In return, | ||
they should reciprocate that respect in addressing your issue or assessing | ||
patches and features. | ||
|
||
|
||
## Using the issue tracker | ||
|
||
The issue tracker is the preferred channel for [bug reports](#bugs), | ||
[features requests](#features) and [submitting pull | ||
requests](#pull-requests), but please respect the following restrictions: | ||
|
||
* Please **do not** use the issue tracker for personal support requests (use | ||
[Stack Overflow](http://stackoverflow.com) or IRC). | ||
|
||
* Please **do not** derail or troll issues. Keep the discussion on topic and | ||
respect the opinions of others. | ||
|
||
|
||
<a name="bugs"></a> | ||
## Bug reports | ||
|
||
A bug is a _demonstrable problem_ that is caused by the code in the repository. | ||
Good bug reports are extremely helpful - thank you! | ||
|
||
Guidelines for bug reports: | ||
|
||
1. **Use the GitHub issue search** — check if the issue has already been | ||
reported. | ||
|
||
2. **Check if the issue has been fixed** — try to reproduce it using the | ||
latest `master` or development branch in the repository. | ||
|
||
3. **Isolate the problem** — create a [reduced test | ||
case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. | ||
|
||
A good bug report shouldn't leave others needing to chase you up for more | ||
information. Please try to be as detailed as possible in your report. What is | ||
your environment? What steps will reproduce the issue? What browser(s) and OS | ||
experience the problem? What would you expect to be the outcome? All these | ||
details will help people to fix any potential bugs. | ||
|
||
Example: | ||
|
||
> Short and descriptive example bug report title | ||
> | ||
> A summary of the issue and the browser/OS environment in which it occurs. If | ||
> suitable, include the steps required to reproduce the bug. | ||
> | ||
> 1. This is the first step | ||
> 2. This is the second step | ||
> 3. Further steps, etc. | ||
> | ||
> `<url>` - a link to the reduced test case | ||
> | ||
> Any other information you want to share that is relevant to the issue being | ||
> reported. This might include the lines of code that you have identified as | ||
> causing the bug, and potential solutions (and your opinions on their | ||
> merits). | ||
|
||
<a name="features"></a> | ||
## Feature requests | ||
|
||
Feature requests are welcome. But take a moment to find out whether your idea | ||
fits with the scope and aims of the project. It's up to *you* to make a strong | ||
case to convince the project's developers of the merits of this feature. Please | ||
provide as much detail and context as possible. | ||
|
||
|
||
<a name="pull-requests"></a> | ||
## Pull requests | ||
|
||
Good pull requests - patches, improvements, new features - are a fantastic | ||
help. They should remain focused in scope and avoid containing unrelated | ||
commits. | ||
|
||
**Please ask first** before embarking on any significant pull request (e.g. | ||
implementing features, refactoring code, porting to a different language), | ||
otherwise you risk spending a lot of time working on something that the | ||
project's developers might not want to merge into the project. | ||
|
||
Please adhere to the coding conventions used throughout a project (indentation, | ||
accurate comments, etc.) and any other requirements (such as test coverage). | ||
|
||
Follow this process if you'd like your work considered for inclusion in the | ||
project: | ||
|
||
1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, | ||
and configure the remotes: | ||
|
||
```bash | ||
# Clone your fork of the repo into the current directory | ||
git clone [email protected]:<YOUR_USERNAME>/ocGrid.git | ||
# Navigate to the newly cloned directory | ||
cd ocGrid | ||
# Assign the original repo to a remote called "upstream" | ||
git remote add upstream https://github.com/octopuscreative/ocGrid | ||
``` | ||
|
||
2. If you cloned a while ago, get the latest changes from upstream: | ||
|
||
```bash | ||
git checkout <dev-branch> | ||
git pull upstream <dev-branch> | ||
``` | ||
|
||
3. Create a new topic branch (off the main project development branch) to | ||
contain your feature, change, or fix: | ||
|
||
```bash | ||
git checkout -b <topic-branch-name> | ||
``` | ||
|
||
4. Commit your changes in logical chunks. Please adhere to these [git commit | ||
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) | ||
or your code is unlikely be merged into the main project. Use Git's | ||
[interactive rebase](https://help.github.com/articles/interactive-rebase) | ||
feature to tidy up your commits before making them public. | ||
|
||
5. Locally merge (or rebase) the upstream development branch into your topic branch: | ||
|
||
```bash | ||
git pull [--rebase] upstream <dev-branch> | ||
``` | ||
|
||
6. Push your topic branch up to your fork: | ||
|
||
```bash | ||
git push origin <topic-branch-name> | ||
``` | ||
|
||
7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) | ||
with a clear title and description. | ||
|
||
**IMPORTANT**: By submitting a patch, you agree to allow the project owner to | ||
license your work under the same license as that used by the project. | ||
|
||
|
||
<a name="pull-requests"></a> | ||
## ocGrid Code Conventions | ||
|
||
1. Make all changes in CoffeeScript files, **not** JavaScript files. | ||
2. Use [Grunt](#grunt) to build the JavaScript files. | ||
|
||
|
||
<a name="grunt"></a> | ||
### Using CoffeeScript and Grunt | ||
|
||
To install all development dependencies, in the project's root directory, run | ||
|
||
``` | ||
npm install | ||
``` | ||
|
||
Once you're configured, building the JavaScript from the command line is easy: | ||
|
||
``` | ||
grunt build # build ocGrid from source | ||
grunt watch # watch for changes and build ocGrid automatically | ||
``` | ||
|
||
If you're interested, you can find the task in [Gruntfile.js](https://github.com/octopuscreative/ocGrid/blob/master/Gruntfile.js). |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Copyright (c) 2014 Octopus Creative | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in | ||
all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. |
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,3 @@ | ||
# ocGrid | ||
|
||
More information coming soon ^_^ |
This file was deleted.
Oops, something went wrong.
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,9 +1,29 @@ | ||
{ | ||
"name": "octopus-grid", | ||
"version": "0.0.1", | ||
"author": "Octopus Creative", | ||
"name": "ocGrid", | ||
"version": "1.0.1", | ||
"description": "A grid. For grid-like things.", | ||
"dependencies": {}, | ||
"devDependencies": { | ||
"grunt": "~0.4.5", | ||
"grunt-contrib-copy": "^0.7.0", | ||
"grunt-contrib-clean": "^0.6.0", | ||
"grunt-contrib-sass": "^0.8.1", | ||
"grunt-contrib-watch": "^0.6.1" | ||
} | ||
}, | ||
"engine": "node >= 0.10", | ||
"licenses": [ | ||
{ | ||
"type": "MIT", | ||
"url": "https://github.com/octopuscreative/ocGrid/blob/master/LICENSE.md" | ||
} | ||
], | ||
"maintainers": [ | ||
{ | ||
"name": "Paul Straw", | ||
"url": "https://github.com/paulstraw" | ||
} | ||
], | ||
"download": "https://github.com/octopuscreative/ocGrid/releases", | ||
"bugs": "https://github.com/octopuscreative/ocGrid/issues" | ||
} |
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
File renamed without changes.
File renamed without changes.