Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update and refactor CoC policy and processes #1135

Merged
merged 90 commits into from
Feb 24, 2024
Merged

Update and refactor CoC policy and processes #1135

merged 90 commits into from
Feb 24, 2024

Commits on Feb 24, 2024

  1. Outline structure of CoC requirements doc

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4f509e2 View commit details
    Browse the repository at this point in the history

  2. Start filling it CoC outline

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a880dc8 View commit details
    Browse the repository at this point in the history

  3. Clean up commitments section

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    15f8739 View commit details
    Browse the repository at this point in the history

  4. Add section for project delegation

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a4266b9 View commit details
    Browse the repository at this point in the history

  5. Add warning upfront

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2726181 View commit details
    Browse the repository at this point in the history

  6. Update CoC

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b683a7d View commit details
    Browse the repository at this point in the history

  7. Removing commitment 

    Already covered in the CoC itself
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2b82f61 View commit details
    Browse the repository at this point in the history

  8. Updates to the CoC

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1ac0b6b View commit details
    Browse the repository at this point in the history

  9. Make it stand out

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    30b7492 View commit details
    Browse the repository at this point in the history

  10. Make appeals standout less

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    583097a View commit details
    Browse the repository at this point in the history

  11. Slight language tuning

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2c067c9 View commit details
    Browse the repository at this point in the history

  12. Always point to the same CoC URL

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b2d2f7b View commit details
    Browse the repository at this point in the history

  13. Apply suggestions from code review 

    Co-authored-by: Michael Dawson <mdawson@devrus.com>
Co-authored-by: Jordan Harband <ljharb@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie @mhdawson @ljharb
    3 people committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0e8f591 View commit details
    Browse the repository at this point in the history

  14. Rename FOUNDATION_CODE_OF_CONDUCT_REQUIREMENTS.md to COC_POLICY.md

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e7ab32b View commit details
    Browse the repository at this point in the history

  15. Rename HANDLING_CODE_OF_CONDUCT_REPORTS.md to COC_PROCESS_FOR_HANDLIN… 

    …G_REPORTS.md
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    dd0d239 View commit details
    Browse the repository at this point in the history

  16. Add missing link

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b620ee7 View commit details
    Browse the repository at this point in the history

  17. Add placeholder page for CoC Team

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    955a17a View commit details
    Browse the repository at this point in the history

  18. Rename CoCET to CoC Team

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9675d0f View commit details
    Browse the repository at this point in the history

  19. More CoCET to CoC Team renaming

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8a9caa9 View commit details
    Browse the repository at this point in the history

  20. Update file titles

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9eb86a3 View commit details
    Browse the repository at this point in the history

  21. Remove reference to the Resources subteam which doesn't exist

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a78e460 View commit details
    Browse the repository at this point in the history

  22. Rename COC_PROCESS file

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ec70cef View commit details
    Browse the repository at this point in the history

  23. Move reason for shared CoC

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    69085f6 View commit details
    Browse the repository at this point in the history

  24. Add CoC Team to Policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    733b7a9 View commit details
    Browse the repository at this point in the history

  25. Remove redundant info from process

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    092a402 View commit details
    Browse the repository at this point in the history

  26. Move Conflict of Interest policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8f9d125 View commit details
    Browse the repository at this point in the history

  27. Add appeals to the policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4680ee8 View commit details
    Browse the repository at this point in the history

  28. Minor language cleanup

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1f5cc42 View commit details
    Browse the repository at this point in the history

  29. Reordering content

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    d936cc3 View commit details
    Browse the repository at this point in the history

  30. Standardize on contributor covenant wording

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    2b7a07d View commit details
    Browse the repository at this point in the history

  31. Separate moderation aspects

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    cd89e67 View commit details
    Browse the repository at this point in the history

  32. Remove ToC

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    6994d5c View commit details
    Browse the repository at this point in the history

  33. Add requirements for project which opt-in to manage CoC incident reports 

    Closes #786.
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    085d29f View commit details
    Browse the repository at this point in the history

  34. Note that the CoC Team maintains the CoC Processes

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ffc6f76 View commit details
    Browse the repository at this point in the history

  35. Clean up escalation and appeal policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    31da164 View commit details
    Browse the repository at this point in the history

  36. Various cleanup

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0515365 View commit details
    Browse the repository at this point in the history

  37. Fix missing line break

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e501c6a View commit details
    Browse the repository at this point in the history

  38. Add warning that processes are out of date

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    5f973d8 View commit details
    Browse the repository at this point in the history

  39. Fix typso 

    Co-authored-by: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie @VoltrexKeyva
    tobie and VoltrexKeyva committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    11be28f View commit details
    Browse the repository at this point in the history

  40. Split COC POLICY Commitments into Incident Response and Confidentiality

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    5deb0ff View commit details
    Browse the repository at this point in the history

  41. Remove remaining references to CoCP

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4527251 View commit details
    Browse the repository at this point in the history

  42. Making it more explicit that the CoC Team can involve external people… 

    … when there's an appeal
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a42a2da View commit details
    Browse the repository at this point in the history

  43. Add transparency and record keeping requirements to the CoC Policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    25632f4 View commit details
    Browse the repository at this point in the history

  44. Rename CoC Team Process to CoC Team Charter

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    bf85e2a View commit details
    Browse the repository at this point in the history

  45. Add missing new line

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4d307cf View commit details
    Browse the repository at this point in the history

  46. Moar typos 

    Co-authored-by: Ben Hutton <relequestual@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie @Relequestual
    tobie and Relequestual committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1e35d64 View commit details
    Browse the repository at this point in the history

  47. Rename CoC Team Charter file accordingly 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    c9a0b48 View commit details
    Browse the repository at this point in the history

  48. Use harmed and accused individuals instead of victims and offenders

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e6b8337 View commit details
    Browse the repository at this point in the history

  49. Align language in CoC

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b8a11f1 View commit details
    Browse the repository at this point in the history

  50. Avoid duplicating content

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    d23885c View commit details
    Browse the repository at this point in the history

  51. Clarify escalation and appeal process

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    059bf0e View commit details
    Browse the repository at this point in the history

  52. Update COC_TEAM_CHARTER.md #1135 

    Include information about makeup and selection process for the CoC Team - for #1135.
Requires additional information on specific team members and appropriate reference link to clarify relationships of the OpenJS Foundation's CPC CoC Team to LF and project level code of conduct teams/policies.

Signed-off-by: Paula <8395352+PaulaPaul@users.noreply.github.com>
    @PaulaPaul @tobie
    PaulaPaul authored and tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ae35e94 View commit details
    Browse the repository at this point in the history

  53. Update COC_TEAM_CHARTER.md #1135 

    Additional formatting and spelling updates for #1135 
Work in progress

Signed-off-by: Paula <8395352+PaulaPaul@users.noreply.github.com>
    @PaulaPaul @tobie
    PaulaPaul authored and tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    7222df2 View commit details
    Browse the repository at this point in the history

  54. Update COC_TEAM_CHARTER.md 

    Additional formatting and link repair #1135

Signed-off-by: Paula <8395352+PaulaPaul@users.noreply.github.com>
    @PaulaPaul @tobie
    PaulaPaul authored and tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    6c6dbde View commit details
    Browse the repository at this point in the history

  55. Minimal COC_TEAM_CHARTER.md #1135 

    Taking a pass at a 'minimum necessary and viable' Team Charter to address the basic components of a charter (Roles/Responsibilities, Operations).

Signed-off-by: Paula <8395352+PaulaPaul@users.noreply.github.com>
    @PaulaPaul @tobie
    PaulaPaul authored and tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    083a516 View commit details
    Browse the repository at this point in the history

  56. More updates - Minimal COC_TEAM_CHARTER.md #1135 

    Correcting a few typos and getting ready to ship...

Signed-off-by: Paula <8395352+PaulaPaul@users.noreply.github.com>
    @PaulaPaul @tobie
    PaulaPaul authored and tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    eee4bf1 View commit details
    Browse the repository at this point in the history

  57. Remove redundant text with the CoC Policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    5062bf2 View commit details
    Browse the repository at this point in the history

  58. Avoid introducing dependency on membership expectations for now 

    Anchor charter in CoC policy
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ff7cb68 View commit details
    Browse the repository at this point in the history

  59. Fix title

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    abd64cf View commit details
    Browse the repository at this point in the history

  60. Spell out acronyms now that the preamble has been shortened

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    cb1391a View commit details
    Browse the repository at this point in the history

  61. Remove line breaks

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    a353d80 View commit details
    Browse the repository at this point in the history

  62. Make a distinction between upholding and abiding by

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1888f9f View commit details
    Browse the repository at this point in the history

  63. Empower individuals to take immediate action to prevent further harm

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    87bc848 View commit details
    Browse the repository at this point in the history

  64. Clean-up team structure and spell out case handling

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ab45618 View commit details
    Browse the repository at this point in the history

  65. Write out responsibilities and move them to top of charter

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    3fd9b6b View commit details
    Browse the repository at this point in the history

  66. Note decision-making process must be documented

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e9f981e View commit details
    Browse the repository at this point in the history

  67. Rough refactoring 

    Write out selection process
Note sections which are still missing content
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9760879 View commit details
    Browse the repository at this point in the history

  68. Indicate where primary members are mentioned in the CoC

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e645d7f View commit details
    Browse the repository at this point in the history

  69. Add some links to the CoC policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    16170e9 View commit details
    Browse the repository at this point in the history

  70. Add commitment to responsiveness

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    bbf79ed View commit details
    Browse the repository at this point in the history

  71. Add reference to CPC decision-making policy

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    d070dfa View commit details
    Browse the repository at this point in the history

  72. Fix language

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    af68265 View commit details
    Browse the repository at this point in the history

  73. Clarify what appeals not being suspensive means 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1b1f185 View commit details
    Browse the repository at this point in the history

  74. Define primary and alternate members more explicitely 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    02a76f4 View commit details
    Browse the repository at this point in the history

  75. Make the CPC responsible for the CoC enforcement processes

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    8b76857 View commit details
    Browse the repository at this point in the history

  76. Remove CoC Chair

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    9bc2e46 View commit details
    Browse the repository at this point in the history

  77. Give examples of mismanagement which justify escalation

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b4a5aae View commit details
    Browse the repository at this point in the history

  78. Make sure the CoC team considers project and community needs during e… 

    …scalation

Allow CoC Team to involve CPC if necessary and project leadership if appropriate.
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    c1e8e6a View commit details
    Browse the repository at this point in the history

  79. Clean up CoC Team selection process

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    dffa55c View commit details
    Browse the repository at this point in the history

  80. Avoid having multiple CoC Team member work for the same employer

    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    7efd5fc View commit details
    Browse the repository at this point in the history

  81. Update CoC email address to coc@openjsf.org 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    11589c3 View commit details
    Browse the repository at this point in the history

  82. Make it clear that the CoC process management is still TBD 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b082a7b View commit details
    Browse the repository at this point in the history

  83. Remove completed todos 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    874a0a2 View commit details
    Browse the repository at this point in the history

  84. Remove todo in CoC Team charter 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    1949b83 View commit details
    Browse the repository at this point in the history

  85. Be explicit about the confidentiality of accused individuals 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b9964fe View commit details
    Browse the repository at this point in the history

  86. Carify limits of obligation of confidentiality 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b968510 View commit details
    Browse the repository at this point in the history

  87. Be more specific about the purpose of information sharing 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b46a206 View commit details
    Browse the repository at this point in the history

  88. Apply suggestions from code review 

    Co-authored-by: Eemeli Aro <eemeli@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie @eemeli
    tobie and eemeli committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    7402f91 View commit details
    Browse the repository at this point in the history

  89. Fixing typos + grammar 

    Co-authored-by: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie @VoltrexKeyva
    tobie and VoltrexKeyva committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    67d5c84 View commit details
    Browse the repository at this point in the history

  90. Make linkinator complain less 

    Signed-off-by: Tobie Langel <tobie@unlockopen.com>
    @tobie
    tobie committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0369bf1 View commit details
    Browse the repository at this point in the history