From 9070b4adcbf717644ff9073eb0f2b1bacdd71213 Mon Sep 17 00:00:00 2001 From: Joe Sepi Date: Tue, 13 Dec 2022 14:33:29 -0500 Subject: [PATCH 1/7] Initial CoCP changes and email update --- .../FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index 82cffba14..563d7d983 100644 --- a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -44,7 +44,7 @@ in place by a project (for reports made to a project) or the CPC (in the case of reports relating to spaces within the scope of the foundation versus a project). In exceptional cases where a reporter wishes to challenge the response from the CPC or project, or does not feel comfortable reporting through the standard processes, an escalation -report can be made to coc-escalation@openjsf.org. +report can be made to report@openjsf.org. All escalations will be reviewed and investigated by the Code of Conduct Panel (CoCP) and will result in a response that is deemed necessary and appropriate to the circumstances. @@ -56,13 +56,12 @@ to the reporter of an escalation. The Code of Conduct panel is a cross-foundation team who have been trained in moderation and code of conduct issues. The makeup of this team is as follows: -* The Foundation Executive director -* 1 member from the Board -* 1 member from the CPC -* 1 member of the OpenJS marketing committee -* each top-level project may optionally provide 1 member -* the non top-level projects may optionally provide 1 member -* optionally 1 invited outside expert as agreed by the other CoCP members. +* OpenJS Foundation Executive Director - Robin Ginn (@rginn) +* OpenJS Foundation Marketing Lead - Kylie Wagar-Dirks (@kyliewd) +* 3 community members from the Cross Project Council + - TBD + - TBD + - TBD Members of the CoCP team will be added for a 1-year term and will be re-confirmed on a yearly basis. From f0579514ae5d945ce8324a4be676226ef5b74fae Mon Sep 17 00:00:00 2001 From: Joe Sepi Date: Tue, 13 Dec 2022 14:46:27 -0500 Subject: [PATCH 2/7] Further CoC Modifications --- .../FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index 563d7d983..6e1fdfdbc 100644 --- a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -51,20 +51,25 @@ and will result in a response that is deemed necessary and appropriate to the ci The Code of Conduct panel is obligated to maintain confidentiality with regard to the reporter of an escalation. -### Code of Conduct panel +### Code of Conduct Panel -The Code of Conduct panel is a cross-foundation team who have been trained in moderation +The Code of Conduct Panel is a cross-foundation team who have been trained in moderation and code of conduct issues. The makeup of this team is as follows: * OpenJS Foundation Executive Director - Robin Ginn (@rginn) * OpenJS Foundation Marketing Lead - Kylie Wagar-Dirks (@kyliewd) -* 3 community members from the Cross Project Council +* 3 members selected by the Cross Project Council - TBD - TBD - TBD -Members of the CoCP team will be added for a 1-year term and will be re-confirmed on -a yearly basis. +#### Nomination + +Code of Conduct Panel team members are CPC Members who self-nominate or are community +members nominated by the CPC. CoCP team members must be approved by the CPC and re-confirmed +every year. If there are no objections after seven days, the nomination is automatically +accepted. If there are objections to a specific nomination, then a simple majority vote of +the CPC in favor of the nomination is required. ## Resources From ab239973f964685403bd02a2d0e7544ed598daaa Mon Sep 17 00:00:00 2001 From: Tobie Langel Date: Wed, 4 Jan 2023 23:26:59 +0100 Subject: [PATCH 3/7] Shorten intro --- conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index 6e1fdfdbc..a593a31fe 100644 --- a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -1,12 +1,7 @@ # Foundation Code of Conduct Requirements -It is important that there be a Code of Conduct (CoC) which -is documented and enforced for the OpenJS Foundation, -hereinafter referred to as the "Foundation", and the -projects within it. This document defines the requirements -for a CoC for the Foundation and the projects which are part -of the foundation. - +This document defines the requirements for implementing a Code of Conduct (CoC) +for the OpenJS foundation and its projects. ## Code of Conduct From d6df92fd40f180a148639b4bfe67d88080ba64ad Mon Sep 17 00:00:00 2001 From: Joe Sepi Date: Tue, 24 Jan 2023 12:39:14 -0500 Subject: [PATCH 4/7] Update conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md Signed-off-by: Joe Sepi --- conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index a593a31fe..b9f007c78 100644 --- a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -41,9 +41,9 @@ In exceptional cases where a reporter wishes to challenge the response from the project, or does not feel comfortable reporting through the standard processes, an escalation report can be made to report@openjsf.org. -All escalations will be reviewed and investigated by the Code of Conduct Panel (CoCP) +All escalations will be reviewed and investigated by the OpenJS Foundation Code of Conduct team and will result in a response that is deemed necessary and appropriate to the circumstances. -The Code of Conduct panel is obligated to maintain confidentiality with regard +The OpenJS Foundation Code of Conduct team is obligated to maintain confidentiality with regard to the reporter of an escalation. ### Code of Conduct Panel From ab5aa51414c91581c373ac1f94d7c9e2f8014776 Mon Sep 17 00:00:00 2001 From: Joe Sepi Date: Tue, 24 Jan 2023 12:39:32 -0500 Subject: [PATCH 5/7] Update conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md Signed-off-by: Joe Sepi --- conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index b9f007c78..5534a8194 100644 --- a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -46,7 +46,7 @@ and will result in a response that is deemed necessary and appropriate to the ci The OpenJS Foundation Code of Conduct team is obligated to maintain confidentiality with regard to the reporter of an escalation. -### Code of Conduct Panel +### OpenJS Foundation Code of Conduct team The Code of Conduct Panel is a cross-foundation team who have been trained in moderation and code of conduct issues. The makeup of this team is as follows: From fc8a397e24778867d0ccf556d008b751429ad082 Mon Sep 17 00:00:00 2001 From: Joe Sepi Date: Tue, 24 Jan 2023 12:39:40 -0500 Subject: [PATCH 6/7] Update conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md Signed-off-by: Joe Sepi --- conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index 5534a8194..4a041ebf6 100644 --- a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -52,7 +52,7 @@ The Code of Conduct Panel is a cross-foundation team who have been trained in mo and code of conduct issues. The makeup of this team is as follows: * OpenJS Foundation Executive Director - Robin Ginn (@rginn) -* OpenJS Foundation Marketing Lead - Kylie Wagar-Dirks (@kyliewd) +* OpenJS Foundation Marketing representative - Kylie Wagar-Dirks (@kyliewd) * 3 members selected by the Cross Project Council - TBD - TBD From 898ac9e77bd9caa0c8329a90b84766e7c1d5626e Mon Sep 17 00:00:00 2001 From: Joe Sepi Date: Tue, 24 Jan 2023 12:39:49 -0500 Subject: [PATCH 7/7] Update conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md Signed-off-by: Joe Sepi --- conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md index 4a041ebf6..eaf831d0b 100644 --- a/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md +++ b/conduct/FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md @@ -48,7 +48,7 @@ to the reporter of an escalation. ### OpenJS Foundation Code of Conduct team -The Code of Conduct Panel is a cross-foundation team who have been trained in moderation +The OpenJS Foundation Code of Conduct team is a cross-foundation team who have been trained in moderation and code of conduct issues. The makeup of this team is as follows: * OpenJS Foundation Executive Director - Robin Ginn (@rginn)