From 3f755e78a8fc116a5e90611fe8769bf23f2bd29d Mon Sep 17 00:00:00 2001 From: "J. George" Date: Mon, 13 Jan 2025 19:52:04 +0100 Subject: [PATCH 1/3] Update CODE_OF_CONDUCT.md in accordance with MP Foundation recommendation --- CODE_OF_CONDUCT.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 0c80694d5b..0e15efb2ff 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -35,12 +35,13 @@ This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting a project maintainer 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. Maintainers are -obligated to maintain confidentiality with regard to the reporter of an -incident. +reported by contacting a project maintainer at conduct@materialsproject.org. All +complaints will be reviewed and investigated by a Materials Project staff member +and will result in a response that +is deemed necessary and appropriate to the circumstances. +Project maintainers and Materials Project staff members are obligated to maintain confidentiality with regard to the reporter of an incident to the extent +possible by law and institutional policy. Community members should be aware that Materials Project staff members are subject to Lawrence Berkeley National Laboratory's [harassment and discrimination policies](https://diversity.lbl.gov/harassment-discrimination-policies/), which require that reports of sexual violence or harassment (as defined in the policy) be reported to the institution. This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.3.0, available at https://www.contributor-covenant.org/version/1/3/0/code-of-conduct.html From f35cc0d70583bca309769c3d5071983fd2258719 Mon Sep 17 00:00:00 2001 From: "J. George" Date: Mon, 13 Jan 2025 19:54:42 +0100 Subject: [PATCH 2/3] Update CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 0e15efb2ff..ab8e99c862 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -40,8 +40,13 @@ complaints will be reviewed and investigated by a Materials Project staff member and will result in a response that is deemed necessary and appropriate to the circumstances. -Project maintainers and Materials Project staff members are obligated to maintain confidentiality with regard to the reporter of an incident to the extent -possible by law and institutional policy. Community members should be aware that Materials Project staff members are subject to Lawrence Berkeley National Laboratory's [harassment and discrimination policies](https://diversity.lbl.gov/harassment-discrimination-policies/), which require that reports of sexual violence or harassment (as defined in the policy) be reported to the institution. +Project maintainers and Materials Project staff members are obligated to +maintain confidentiality with regard to the reporter of an incident to the extent +possible by law and institutional policy. Community members should be aware that +Materials Project staff members are subject to Lawrence Berkeley National Laboratory's +[harassment and discrimination policies](https://diversity.lbl.gov/harassment-discrimination-policies/), +which require that reports of sexual violence or harassment (as defined in the policy) +be reported to the institution. This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.3.0, available at https://www.contributor-covenant.org/version/1/3/0/code-of-conduct.html From 63f51767de85d26c864d4dddb672a77415cf3742 Mon Sep 17 00:00:00 2001 From: "J. George" Date: Mon, 13 Jan 2025 18:59:37 +0000 Subject: [PATCH 3/3] fix readme --- CODE_OF_CONDUCT.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ab8e99c862..781affc88e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -41,11 +41,11 @@ and will result in a response that is deemed necessary and appropriate to the circumstances. Project maintainers and Materials Project staff members are obligated to -maintain confidentiality with regard to the reporter of an incident to the extent -possible by law and institutional policy. Community members should be aware that -Materials Project staff members are subject to Lawrence Berkeley National Laboratory's -[harassment and discrimination policies](https://diversity.lbl.gov/harassment-discrimination-policies/), -which require that reports of sexual violence or harassment (as defined in the policy) +maintain confidentiality with regard to the reporter of an incident to the extent +possible by law and institutional policy. Community members should be aware that +Materials Project staff members are subject to Lawrence Berkeley National Laboratory's +[harassment and discrimination policies](https://diversity.lbl.gov/harassment-discrimination-policies/), +which require that reports of sexual violence or harassment (as defined in the policy) be reported to the institution. This Code of Conduct is adapted from the [Contributor Covenant][homepage],