From b481f9ae6577f628c52ec071b988f2f6cb7a6ed7 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 18:14:51 +0300 Subject: [PATCH 01/11] add contributor-covenant CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..1e4968ab --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,77 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to make participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## 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 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. + +## Scope + +This Code of Conduct applies within all project spaces, and it also applies when +an individual is representing 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. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at [INSERT EMAIL ADDRESS]. 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. + +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 +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq + -- 2.47.2 From 9b076c9e9a15126ecb0a623dccfe4cab5a1edf8d Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 18:25:27 +0300 Subject: [PATCH 02/11] CODE_OF_CONDUCT.md: PTIO adjustments Co-authored-by: Blacklight Co-authored-by: Dawid Potocki Co-authored-by: Nitrohorse <1514352+nitrohorse@users.noreply.github.com> --- CODE_OF_CONDUCT.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1e4968ab..e60e89c4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,12 +1,13 @@ -# Contributor Covenant Code of Conduct +# Privacytools.io Code of Conduct ## Our Pledge In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, sex characteristics, gender identity and expression, -level of experience, education, socio-economic status, nationality, personal +our community a harassment-free experience for everyone, regardless of a +distinction of any kind, such as age, body size, disability, ethnicity, sex +characteristics, gender identity and expression, level of experience, +education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. ## Our Standards @@ -25,6 +26,7 @@ Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or advances * Trolling, insulting/derogatory comments, and personal or political attacks +* Promoting intolerance * Public or private harassment * Publishing others' private information, such as a physical or electronic address, without explicit permission @@ -46,7 +48,7 @@ threatening, offensive, or harmful. ## Scope This Code of Conduct applies within all project spaces, and it also applies when -an individual is representing the project or its community in public spaces. +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 @@ -55,7 +57,7 @@ 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 the project team at [INSERT EMAIL ADDRESS]. All +reported by contacting the project team at https://forum.privacytools.io/badges/4/leader. 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. -- 2.47.2 From 8c8c5f9ac9d2592a785b635c6bb0a98731a1f99f Mon Sep 17 00:00:00 2001 From: Nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sun, 8 Sep 2019 18:43:01 +0300 Subject: [PATCH 03/11] CODE_OF_CONDUCT.md: add antagonistic to comments --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e60e89c4..3acba5f0 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -25,7 +25,7 @@ Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks +* Trolling, insulting/derogatory, antagonistic comments and personal or political attacks * Promoting intolerance * Public or private harassment * Publishing others' private information, such as a physical or electronic -- 2.47.2 From a3fe6cabd317be08289c92d871627bd870ecfb3c Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 18:59:41 +0300 Subject: [PATCH 04/11] CODE_OF_CONDUCT.md: clarify Enforcement Co-authored-by: Blacklight Co-authored-by: Dawid Potocki Co-authored-by: Nitrohorse <1514352+nitrohorse@users.noreply.github.com> --- CODE_OF_CONDUCT.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3acba5f0..22b5fad0 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -57,8 +57,12 @@ 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 the project team at https://forum.privacytools.io/badges/4/leader. All -complaints will be reviewed and investigated and will result in a response that +reported by contacting Blacklight447 on mailto:blacklight447@privacytools.io +or any team member at https://forum.privacytools.io/g/team. The reports should +include information on whether they can be shared to other team members and how +much may be told. + +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. -- 2.47.2 From 7b07ff1892aba2957a688cd36b263075531b0bb5 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 19:12:16 +0300 Subject: [PATCH 05/11] CoC: adjust Attribution Co-authored-by: Dawid Potocki --- CODE_OF_CONDUCT.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 22b5fad0..04f3b655 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -73,11 +73,9 @@ members of the project's leadership. ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html - -[homepage]: https://www.contributor-covenant.org +This Code of Conduct is forked, from the CC-BY 4.0 licensed Contributor Covenant version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html, +by Privacytools.io, available at https://github.com/privacytools.io/privacytools.io/blob/master/CODE_OF_CONDUCT.md For answers to common questions about this code of conduct, see https://www.contributor-covenant.org/faq - -- 2.47.2 From b4e80678410f6406722e3ab2d89072f9e9cb8dec Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 19:33:44 +0300 Subject: [PATCH 06/11] CoC: remove FAQ Co-authored-by: Dawid Potocki --- CODE_OF_CONDUCT.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 04f3b655..49d47a01 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -76,6 +76,3 @@ members of the project's leadership. This Code of Conduct is forked, from the CC-BY 4.0 licensed Contributor Covenant version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html, by Privacytools.io, available at https://github.com/privacytools.io/privacytools.io/blob/master/CODE_OF_CONDUCT.md - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq -- 2.47.2 From 8c44a4d895618dfe0019f8beca82e784b186d7cc Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Mon, 9 Sep 2019 06:03:45 +1200 Subject: [PATCH 07/11] Wrap and other shit --- CODE_OF_CONDUCT.md | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 49d47a01..47f960b7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,4 +1,4 @@ -# Privacytools.io Code of Conduct +# privacytools.io Code of Conduct ## Our Pledge @@ -7,8 +7,8 @@ contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of a distinction of any kind, such as age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, -education, socio-economic status, nationality, personal -appearance, race, religion, or sexual identity and orientation. +education, socio-economic status, nationality, personal appearance, race, +religion, or sexual identity and orientation. ## Our Standards @@ -24,8 +24,9 @@ include: Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory, antagonistic comments and personal or political attacks +advances +* Trolling, insulting/derogatory, antagonistic comments and personal or +political attacks * Promoting intolerance * Public or private harassment * Publishing others' private information, such as a physical or electronic @@ -47,8 +48,10 @@ 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. +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. + 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 @@ -57,15 +60,16 @@ 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 on mailto:blacklight447@privacytools.io +reported by contacting blacklight447 via email on blacklight447@privacytools.io or any team member at https://forum.privacytools.io/g/team. The reports should include information on whether they can be shared to other team members and how much may be told. -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. +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. 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 @@ -73,6 +77,7 @@ members of the project's leadership. ## Attribution -This Code of Conduct is forked, from the CC-BY 4.0 licensed Contributor Covenant version 1.4, -available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html, -by Privacytools.io, available at https://github.com/privacytools.io/privacytools.io/blob/master/CODE_OF_CONDUCT.md +This Code of Conduct is forked from licensed under Creative Commons BY-4.0, +Contributor Covenant version 1.4 (https://contributor-covenant.org/version/1/4) +by privacytools.io, which you can find on our GitHub repository: +https://github.com/privacytoolsIO/privacytools.io/raw/master/CODE_OF_CONDUCT.md -- 2.47.2 From db8046b3fe7e0a61a2fbff12def578481904e4fe Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 21:08:59 +0300 Subject: [PATCH 08/11] CoC: add missing "and --- CODE_OF_CONDUCT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 47f960b7..fe427b9c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -77,7 +77,7 @@ members of the project's leadership. ## Attribution -This Code of Conduct is forked from licensed under Creative Commons BY-4.0, -Contributor Covenant version 1.4 (https://contributor-covenant.org/version/1/4) +This Code of Conduct is forked from and licensed under Creative Commons +BY-4.0, Contributor Covenant version 1.4 (https://contributor-covenant.org/version/1/4) by privacytools.io, which you can find on our GitHub repository: https://github.com/privacytoolsIO/privacytools.io/raw/master/CODE_OF_CONDUCT.md -- 2.47.2 From ed358fc7cf3a7abb3d79720cf6062caf34f7619d Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 21:11:43 +0300 Subject: [PATCH 09/11] CoC: link to blob --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index fe427b9c..7131d55a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -80,4 +80,4 @@ members of the project's leadership. This Code of Conduct is forked from and licensed under Creative Commons BY-4.0, Contributor Covenant version 1.4 (https://contributor-covenant.org/version/1/4) by privacytools.io, which you can find on our GitHub repository: -https://github.com/privacytoolsIO/privacytools.io/raw/master/CODE_OF_CONDUCT.md +https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md -- 2.47.2 From 87c564f153ab338bbeca6966fa36546d32b5cbaa Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 21:22:03 +0300 Subject: [PATCH 10/11] CoC: improve wrapping --- CODE_OF_CONDUCT.md | 55 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7131d55a..756a45fb 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -23,10 +23,10 @@ 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 + political attacks * Promoting intolerance * Public or private harassment * Publishing others' private information, such as a physical or electronic @@ -36,40 +36,43 @@ political attacks ## 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. 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 blacklight447@privacytools.io -or any team member at https://forum.privacytools.io/g/team. The reports should -include information on whether they can be shared to other team members and how -much may be told. +reported by contacting blacklight447 via email on +blacklight447@privacytools.io 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. -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. +[any team member on our forum]:https://forum.privacytools.io/g/team + +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. 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 @@ -78,6 +81,8 @@ members of the project's leadership. ## Attribution This Code of Conduct is forked from and licensed under Creative Commons -BY-4.0, Contributor Covenant version 1.4 (https://contributor-covenant.org/version/1/4) -by privacytools.io, which you can find on our GitHub repository: -https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md +BY-4.0, [Contributor Covenant version 1.4] by privacytools.io, which you can +[find on our GitHub repository]. + +[find on our GitHub repository]:https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md +[Contributor Covenant version 1.4]:https://contributor-covenant.org/version/1/4) -- 2.47.2 From ec6c339460a0c83b30f59e807a27e8faefa405a3 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 8 Sep 2019 21:34:25 +0300 Subject: [PATCH 11/11] CODE_OF_CONDUCT.md: remove extra char --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 756a45fb..c03da44c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -85,4 +85,4 @@ BY-4.0, [Contributor Covenant version 1.4] by privacytools.io, which you can [find on our GitHub repository]. [find on our GitHub repository]:https://github.com/privacytoolsIO/privacytools.io/blob/master/CODE_OF_CONDUCT.md -[Contributor Covenant version 1.4]:https://contributor-covenant.org/version/1/4) +[Contributor Covenant version 1.4]:https://contributor-covenant.org/version/1/4 -- 2.47.2