Skip to content

Commit 6919c0e

Browse files
author
Lauren McCarthy
committed
Merge branch 'master' of github.com:processing/p5.js
2 parents f9f641a + c9ff102 commit 6919c0e

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
language: node_js
22
node_js:
3-
- "0.10"
4-
- "0.12"
53
- "4.2"
64
- "5.1"
75
install: npm install

CONTRIBUTING.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# p5.js Code of Conduct
1+
### The github issues are for bugs and feature requests for the p5.js library itself. If you have a general question or bug programming with p5.js please post it in the [p5.js forum](https://forum.processing.org/two/).
2+
3+
### Please make sure you are posting to the right repository. See this [section](https://github.com/processing/p5.js/blob/master/README.md#issues) for a list of all p5.js repositories.
4+
5+
## p5.js Code of Conduct
26

37
* **Be mindful of your language.** Any of the following behavior is unacceptable:
48
* Offensive comments related to gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, ability, class, religion, culture, subculture, political opinion, age, skill level, occupation, or background

ISSUE_TEMPLATE.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
PLEASE READ THIS BEFORE SUBMITTING AN ISSUE :)
2+
3+
ARE YOU ASKING FOR HELP?
4+
The github issues are ONLY for bugs and feature requests for the p5.js library itself. For help with programming with p5.js, please use the p5.js forum instead: https://forum.processing.org/two/.
5+
6+
ARE YOU REPORTING AN ISSUE?
7+
Please include a snippet of code that demonstrates that the described behavior is not the expected behavior. Use only the minimum amount of code necessary to reproduce the unexpected behavior. Bugs may be temporarily closed until you can provide this.
8+
9+
Thanks!
10+
The p5.js Team

README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Build Status](https://travis-ci.org/processing/p5.js.svg?branch=master)](https://travis-ci.org/processing/p5.js) [![npm version](https://badge.fury.io/js/p5.svg)](https://www.npmjs.com/package/p5)
22

3-
#[p5.js](http://p5js.org)
3+
# [p5.js](http://p5js.org)
44

55
[Hello!](http://hello.p5js.org/) p5.js is a JavaScript library that starts with the original goal of Processing, to make coding accessible for artists, designers, educators, and beginners, and reinterprets this for today's web.
66

@@ -12,18 +12,21 @@ If you already know the basics of JS or Processing, the [p5.js overview](https:/
1212

1313
If you have found a bug in the p5.js library, you can file it here under the [“issues” tab](https://github.com/processing/p5.js/issues).
1414

15-
##p5.js library
15+
## p5.js library
1616

1717
To use p5.js, you can [download the p5.js library here](http://p5js.org/download). If you are interested in the most recent, less stable version, you can clone this repository and run `grunt` from the command line to generate the library from source. See the [development](https://github.com/processing/p5.js/wiki/Development) wiki for more information about our build process.
1818

19-
##Issues
19+
## Issues
2020

21-
* You can post bugs found in the p5.js library itself here: [https://github.com/processing/p5.js/issues](https://github.com/processing/p5.js/issues)
22-
* You can post bugs found on the p5js.org website here: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-website/issues)
23-
* You can post bugs found in the p5.Sound addon library here: [https://github.com/processing/p5.js-sound/issues](https://github.com/processing/p5.js-sound/issues)
21+
Please post bugs in the proper repository:
2422

23+
* p5.js general and p5.dom: [https://github.com/processing/p5.js/issues](https://github.com/processing/p5.js/issues)
24+
* p5.sound: [https://github.com/processing/p5.js-sound/issues](https://github.com/processing/p5.js-sound/issues)
25+
* p5.js website: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-website/issues)
26+
* p5.js web editor: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-web-editor/issues)
2527

26-
##Learning
28+
29+
## Learning
2730

2831
Check out [p5js.org](http://p5js.org) for lots more! Here are some quicklinks:
2932

@@ -35,7 +38,7 @@ Check out [p5js.org](http://p5js.org) for lots more! Here are some quicklinks:
3538
* [Libraries](http://p5js.org/libraries) — Extend p5 functionality to interact with HTML, manipulate sound, and more!
3639
* [FAQ](https://github.com/processing/p5.js/wiki/Frequently-Asked-Questions)
3740

38-
##Get Involved
41+
## Get Involved
3942

4043
p5.js is a collaborative project created by many individuals, and you are invited to help. All types of involvement are welcome. See the [community section](http://p5js.org/community) to get started!
4144

0 commit comments

Comments
 (0)