Code

Proposed Code of Conduct#22

Code

Merged

brenns10 merged 8 commits intomasterhacsoc/wiki:masterfrom code-of-conducthacsoc/wiki:code-of-conductCopy head branch name to clipboardMar 23, 2017

+104

Commits

Commits on Feb 23, 2016

• Preliminary code of conduct.

  

  Stephen Brennan

  committed
  f29f400

• ACM and IEEE codes, just in case.

  

  Stephen Brennan

  committed
  49ce7b6

• Add github organization to the list of communication streams the code of conduct applies to.

  

  Stephen Brennan

  committed
  690461d

• Address a few more issues in text.

  

  Stephen Brennan

  committed
  f0bfa12

• Make the "rude or unwelcome comments" more specific, and add info about tension between expression and welcoming atmosphere.

  

  Stephen Brennan

  committed
  6dede47

Commits on Feb 24, 2016

• Added clearer explanation of mission and tensions

  Show description for 3d2a6d8
  timtadh

  committed
  3d2a6d8

Commits on Mar 14, 2017

• Final update according to discussion on GitHub.

  

  Stephen Brennan

  committed
  8ae3d08

Commits on Mar 23, 2017

• Under construction

  

  Stephen Brennan

  committed
  ae944a0