New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New CONTRIBUTING.md, edited CODE_OF_CONDUCT.md #71

Merged
merged 2 commits into from Jan 14, 2018
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+9 −20
Diff settings

Always

Just for now

Prev

cleaned up some formatting and wording, added some links.

  • Loading branch information...
jmfcodes committed Jan 14, 2018
commit 89a67528d17de7ac62659f9c4bca6b4be8d9744c
Copy path View file
@@ -7,25 +7,14 @@
* Please be kind and courteous. There’s no need to be mean or rude.
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behaviour. We specifically do not tolerate behavior that excludes people in socially marginalized groups.
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behaviour. We specifically do not tolerate behavior that excludes people in socially marginalized groups.
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact a member of of the development team immediately. Whether you’re a regular contributor or a newcomer, we care about making this community a safe place for you and we’ve got your back.
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
* We interpret the term “harassment” as outlined in the [Citizen Code of Conduct](http://citizencodeofconduct.org/) under Unacceptable Behaviors:
..* Violence, threats of violence or violent language directed against another person.
..* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
..* Posting or displaying sexually explicit or violent material.
..* Posting or threatening to post other people’s personally identifying information (“doxing”).
..* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
..* Inappropriate photography or recording.
..* Inappropriate physical contact. You should have someone’s consent before touching them.
..* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
..* Deliberate intimidation, stalking or following (online or in person).
..* Advocating for, or encouraging, any of the above behavior.
..* Sustained disruption of community events, including talks and presentations.
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
* We interpret the term “harassment” as outlined in the [Citizen Code of Conduct](http://citizencodeofconduct.org/) under Unacceptable Behaviors, including the following: violence; threats of violence or violent language directed against another person; sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language; posting or displaying sexually explicit or violent material; posting or threatening to post other people’s personally identifying information (“doxing”); personal insults, particularly those related to marginalized identities; inappropriate photography or recording; unwelcome sexual attention, including sexualized comments or jokes, inappropriate touching, groping, and unwelcomed sexual advances; deliberate intimidation, stalking or following (online or in person); advocating for, or encouraging, any of the above behavior; sustained disruption of discussions or collaborations.

## Moderation

These are the policies for upholding our community’s standards of conduct. If you feel that a thread needs moderation, please contact a member of the development team. These policies apply to any mediums used for the project development communications, including but not limited to [Github](https://github.com/BanjoFox/Aardwolf) and [the discussion forum](http://wearesocial.tech/).
These are the policies for upholding our community’s standards of conduct. If you feel that a thread needs moderation, please contact a member of [the development team](https://github.com/BanjoFox/aardwolf/wiki/Contributors). These policies apply to any mediums used for the project development communications, including but not limited to [Github](https://github.com/BanjoFox/Aardwolf), [#aardwolf-discussion:matrix.org](https://riot.im/app/#/room/#aardwolf-discussion:matrix.org), [the `aardwolf-development` mailing list](https://lists.riseup.net/www/info/aardwolf-development), and [the discussion forum](http://wearesocial.tech/).

1. Remarks that violate standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
@@ -36,8 +25,8 @@ These are the policies for upholding our community’s standards of conduct. If
7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, **in private**. Public complaints about bans are not allowed.
8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.

In this community we strive to go the extra step to look out for each other. Don’t just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they’re off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.
In this community we strive to go the extra step to look out for each other. Don’t just aim to be technically unimpeachable, try to be your best self. In particular, avoid being flippant with offensive or sensitive issues, particularly if they’re off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.

And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could’ve communicated better — remember that it’s your responsibility to make your fellow community members comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.
And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing it and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could’ve communicated better — remember that it’s your responsibility to make your fellow community members comfortable. Everyone wants to get along and we are all here first and foremost because we want to build a great project. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.

*Gratefully adapted from [Rust’s Code of Conduct](https://www.rust-lang.org/conduct.html) and the [Citizen Code of Conduct](http://citizencodeofconduct.org/).*
Copy path View file
@@ -4,7 +4,7 @@ Contributors are always welcome! We are looking for help from technical and non-

## Frontend - non-technical
- A logo!
- Color scheme (colorblind- and low-vision-friendly. **TIP:** [use a contrast checker](https://webaim.org/resources/contrastchecker/))
- Color scheme (colorblind- and low-vision-friendly). **TIP:** [use a contrast checker](https://webaim.org/resources/contrastchecker/)
- Clarify and beautify Github documentation. **TIP:** check out [Github's Markdown Guide](https://guides.github.com/features/mastering-markdown/)

## Frontend - technical
@@ -35,5 +35,5 @@ Contributors are always welcome! We are looking for help from technical and non-
## Communication

- Most of the core contributors use Riot/Matrix room [#aardwolf-discussion:matrix.org](https://riot.im/app/#/room/#aardwolf-discussion:matrix.org)
- You can also join the [`aardwolf-development` mailing list](https://lists.riseup.net/www/info/aardwolf-development).
- @-Mentioning someone on Github will also receive a prompt response.
- You can also join the [aardwolf-development mailing list](https://lists.riseup.net/www/info/aardwolf-development).
- @-Mentioning someone here will also receive a prompt response.
ProTip! Use n and p to navigate between commits in a pull request.