diff --git a/AUTHORS.md b/AUTHORS.md new file mode 100644 index 00000000..26198382 --- /dev/null +++ b/AUTHORS.md @@ -0,0 +1,58 @@ +# Authors + +The following people have contributed to OctoPrint's code base (ordered by +date of first contribution): + + * [Gina Häußge](https://github.com/foosel) + * [Thomas Sanladerer](https://github.com/imitation) + * [Alex Ustyantsev](https://github.com/hudbrog) + * [Andrew Dalgleish](https://github.com/ajd4096) + * [Dale Price](https://github.com/daprice) + * [Václav "ax" Hůla](https://github.com/AxTheB) + * [Tom Perry](https://github.com/daftscience) + * [Andreas Gohr](https://github.com/splitbrain) + * [Lars Norpchen](https://github.com/norpchen) + * [Marlon Wünnemann](https://github.com/marwue) + * ["algspd"](https://github.com/algspd) + * [Peter Uithoven](https://github.com/peteruithoven) + * [Bryan Mayland](https://github.com/CapnBry) + * [Ross Hendrickson](https://github.com/savorywatt) + * [Dan Lipsitt](https://github.com/DanLipsitt) + * [James Gao](https://github.com/jamesgao) + * [Tonnerre Lombard](https://github.com/tonnerre) + * [Marc Hannappel](https://github.com/Salandora) + * [Brad Pitcher](https://github.com/brad) + * [Gabe Rosenhouse](https://github.com/rosenhouse) + * [chriskoz](https://github.com/chriskoz) + * [Ilya Novoselov](https://github.com/nullie) + * [Corey C](https://github.com/C-o-r-E) + * [Jarek Szczepanski](https://github.com/imrahil) + * [Jon Nordby](https://github.com/jonnor) + * [Aaron Bieber](https://github.com/qbit) + * [Guy Sheffer](https://github.com/guysoft) + * [Dattas Moonchaser](https://github.com/dattas) + * [Pim Rutgers](https://github.com/Booli) + * [Koen Kooi](https://github.com/koenkooi) + * [Colin Wallace](https://github.com/Wallacoloo) + * [Michael Ang](https://github.com/mangtronix) + * [Philipp Engel](https://github.com/nosyjoe) + * [Giles Hall](https://github.com/vishnubob) + * [Bevaz](https://github.com/Bevaz) + * [Bortek](https://github.com/bortek) + * [Rob Speed](https://github.com/rspeed) + * [Renha](https://github.com/Renha) + * [Antoine Bertin](https://github.com/Diaoul) + * [Teja Philipp](https://github.com/hungerpirat) + * ["matobago"](https://github.com/matobago) + * ["nophead"](https://github.com/nophead) + * [Bob Clough](https://github.com/thinkl33t) + * [Mikk Kiilaspää](https://github.com/Mikk36) + * [Jack Minardi](https://github.com/jminardi) + * [Mark Walker](https://github.com/markwal) + * [Lucas Clemente](https://github.com/lucas-clemente) + * [Andrew Erickson](https://github.com/aerickson) + +OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by +[Daid Braam](https://github.com/daid). Parts of its communication layer and +the server side GCODE interpreter are still based on Cura's code base from +December 2012 and hence on the work of its authors up until then. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4f4c46cf..24bc3890 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,29 +21,31 @@ Pull Requests plugin. If the current plugin system doesn't allow you to implement your feature as a plugin, create a "Brainstorming" ticket to get the discussion going how best to solve *this* in OctoPrint's plugin system - maybe that's the actual PR you have been waiting for to contribute :) -2. If you plan to make **any large changes to the code or appearance, please open a "Brainstorming" ticket first** so that +2. If you plan to make **any large changes to the code or appearance, please open a "Brainstorming" ticket first** so that we can determine if it's a good time for your specific pull request. It might be that I'm currently in the process of - making heavy changes to the code locations you'd target as well, or your approach doesn't fit the general "project + making heavy changes to the code locations you'd target as well, or your approach doesn't fit the general "project vision", and that would just cause unnecessary work and frustration for everyone or possibly get the PR rejected. 3. When adding code to OctoPrint, make sure you **follow the current coding style**. That means tabs instead of spaces in the python files (yes, I know that this goes against PEP-8, I don't care) and space instead of tabs in the Javascript sources, english language (that means code, variables, comments!), comments where necessary (tell why the code does something like it does it, structure your code), following the general architecture. If your PR needs to make changes to the Stylesheets, - change the ``.less`` files from which the CSS is compiled. PRs that contain direct changes to the compiled - CSS will be closed. -4. **Test your changes thoroughly**. That also means testing with usage scenarios you don't normally use, e.g. if you only + change the ``.less`` files from which the CSS is compiled. PRs that contain direct changes to the compiled + CSS will be closed. +4. **Test your changes thoroughly**. That also means testing with usage scenarios you don't normally use, e.g. if you only use access control, test without and vice versa. If you only test with your printer, test with the virtual printer and vice versa. State in your pull request how your tested your changes. 5. Please create all pull requests **against the `devel` branch**. 6. Create **one pull request per feature/bug fix**. 7. Create a **custom branch** for your feature/bug fix and use that as base for your pull request. Pull requests directly against your version of `devel` will be closed. -7. In your pull request's description, **state what your pull request is doing**, as in, what feature does it implement, what +8. In your pull request's description, **state what your pull request is doing**, as in, what feature does it implement, what bug does it fix. The more thoroughly you explain your intent behind the PR here, the higher the chances it will get merged fast. +9. Don't forget to **add yourself to the [AUTHORS](../AUTHORS.md) file** :) History ------- * 2015-01-23: More guidelines for creating pull requests, support/questions redirected to Mailinglist/G+ community * 2015-01-27: Added another explicit link to the FAQ + * 2015-07-07: Added step to add yourself to AUTHORS when creating a PR :)