This repository has been archived by the owner on Oct 8, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7
Draft COI policy #3
Closed
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
90a0273
Draft COI policy
ccaccd8
make the interests part more inclusive about the community itself
2cf40dd
making the text more straight to the point and defining when somethin…
77a80d9
Update CODE_OF_CONDUCT.md
0ba0a8a
Update CODE_OF_CONDUCT.md
accd9e1
Update CODE_OF_CONDUCT.md
c046622
Update CODE_OF_CONDUCT.md
3d45587
Update CODE_OF_CONDUCT.md
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 | ||||
---|---|---|---|---|---|---|
|
@@ -23,8 +23,8 @@ include: | |||||
|
||||||
Examples of unacceptable behavior by participants include: | ||||||
|
||||||
* The use of sexualized language or imagery and unwelcome sexual attention | ||||||
or advances | ||||||
* The use of sexualized language or imagery and unwelcome sexual attention or | ||||||
advances | ||||||
* Trolling, insulting/derogatory, antagonistic comments and personal or | ||||||
political attacks | ||||||
* Promoting intolerance | ||||||
|
@@ -36,43 +36,67 @@ Examples of unacceptable behavior by participants include: | |||||
|
||||||
## Our Responsibilities | ||||||
|
||||||
Project maintainers are responsible for clarifying the standards of | ||||||
acceptable behavior and are expected to take appropriate and fair | ||||||
corrective action in response to any instances of unacceptable behavior. | ||||||
Project maintainers are responsible for clarifying the standards of acceptable | ||||||
behavior and are expected to take appropriate and fair corrective action in | ||||||
response to any instances of unacceptable behavior. | ||||||
|
||||||
Members of the official team are required to disclose any interests that may | ||||||
come into conflict with the mission of the PrivacyTools website or be at the | ||||||
disbenefit of the community. | ||||||
|
||||||
If a team member has a private interest (e.g., a job at a company or | ||||||
organization which is either listed or wants to be listed), then it is that | ||||||
team member's duty to disclose their affiliation. | ||||||
|
||||||
To determine whether something is a conflict of interest, we consider whether | ||||||
or not the team member's contributions(s) (e.g., proposed changes to the site, | ||||||
comments, etc.) are within the interest of PrivacyTools or the community. Each | ||||||
case will be looked at and discussed, on an individual basis. | ||||||
|
||||||
If it is then decided by the other team members that there is a conflict of | ||||||
interest, the team member in question shall forfeit their right to vote on | ||||||
issues regarding their affiliation. | ||||||
|
||||||
The team member in question is however, allowed to put forward argument about | ||||||
their affiliation and that shall be considered as long as they make it clear to | ||||||
disclose their connection to the company or organization in question. | ||||||
|
||||||
Project maintainers have the right and responsibility to remove, edit, or | ||||||
reject comments, commits, code, wiki edits, issues, and other contributions | ||||||
that are not aligned to this Code of Conduct, or to ban temporarily or | ||||||
permanently any contributor for other behaviors that they deem | ||||||
inappropriate, threatening, offensive, or harmful. | ||||||
permanently any contributor for other behaviors that they deem inappropriate, | ||||||
threatening, offensive, or harmful. | ||||||
|
||||||
## Scope | ||||||
|
||||||
This Code of Conduct applies within all project spaces, and it also applies | ||||||
when an individual is representing as a part of the project or its | ||||||
community in public spaces. | ||||||
when an individual is representing as a part of the project or its community in | ||||||
public spaces. | ||||||
|
||||||
Examples of representing a project or community include using an official | ||||||
project e-mail address, posting via an official social media account, or | ||||||
acting as an appointed representative at an online or offline event. | ||||||
Representation of a project may be further defined and clarified by | ||||||
project maintainers. | ||||||
project e-mail address, posting via an official social media account, or acting | ||||||
as an appointed representative at an online or offline event. | ||||||
|
||||||
Representation of a project may be further defined and clarified by project | ||||||
maintainers. | ||||||
|
||||||
## Enforcement | ||||||
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be | ||||||
reported by contacting blacklight447 via email on | ||||||
[email protected] or [any team member on our forum]. | ||||||
reported by contacting blacklight447 via email on [email protected] | ||||||
or [any team member on our forum]. | ||||||
|
||||||
The reports should include information on whether they can be shared to | ||||||
other team members and how much may be told. | ||||||
|
||||||
[any team member on our forum]:https://forum.privacytools.io/g/team | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
All complaints will be reviewed and investigated and will result in a | ||||||
response that is deemed necessary and appropriate to the circumstances. | ||||||
All complaints will be reviewed and investigated and will result in a response | ||||||
that is deemed necessary and appropriate to the circumstances. | ||||||
|
||||||
The project team is obligated to maintain confidentiality with regard to the | ||||||
reporter of an incident. Further details of specific enforcement policies | ||||||
may be posted separately. | ||||||
reporter of an incident. Further details of specific enforcement policies may | ||||||
be posted separately. | ||||||
|
||||||
Project maintainers who do not follow or enforce the Code of Conduct in good | ||||||
faith may face temporary or permanent repercussions as determined by other | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.