Skip to content
This repository has been archived by the owner on Sep 20, 2018. It is now read-only.

Gh pages #105

Open
wants to merge 96 commits into
base: Incorporate-geek-feminism-org
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
039898e
Make it configurable
bkeepers Jun 24, 2015
a0f0ac2
Ignore .sass-cache
bkeepers Jun 24, 2015
bd579b7
tweak text to make it read better
bkeepers Jun 24, 2015
53276ca
Configure the template when loading the page
bkeepers Jun 24, 2015
c302d24
Tweaks
bkeepers Jun 24, 2015
b24fd51
Use design from todogroup.org
bkeepers Jun 24, 2015
5a916d7
Ignore .sass-cache
bkeepers Jun 24, 2015
a7ad151
Update repo URL
bkeepers Jun 24, 2015
3bcd090
link to website instead of twitter
bkeepers Jun 24, 2015
30959ea
words
bkeepers Jun 24, 2015
211a578
Merge pull request #11 from todogroup/todo-styles
caniszczyk Jun 25, 2015
2dde56c
Fix simple typo in index.md
Jun 25, 2015
dc39513
Merge branch 'gh-pages' into configurable
bkeepers Jun 25, 2015
a339bde
tweaks to config design
bkeepers Jun 30, 2015
26b99e1
Clean up JS
bkeepers Jun 30, 2015
1884a53
Store raw variables in url
bkeepers Jun 30, 2015
8efb346
return nothing if empty
bkeepers Jun 30, 2015
3535cad
Copy snipped on select
bkeepers Jun 30, 2015
6716a3b
Clean up styles
bkeepers Jun 30, 2015
761fdd9
Add comment about customizing to fit your needs
bkeepers Jun 30, 2015
ab54513
Make title link to homepage
bkeepers Jun 30, 2015
91281be
Remove duplicate header
bkeepers Jun 30, 2015
c9431e8
Don't need to encode the hash?
bkeepers Jun 30, 2015
6b9d181
Incorporate changes from Amy and the Geek Feminism CoC
fat16 Jun 30, 2015
573b5a7
No magic copying
bkeepers Jul 1, 2015
1e3bf5b
Merge remote-tracking branch 'origin/gh-pages' into configurable
bkeepers Jul 1, 2015
20dfe36
Merge pull request #10 from todogroup/configurable
bkeepers Jul 1, 2015
742d96e
base_url => baseurl
bkeepers Jul 1, 2015
896f587
Just use relative URLs for now
bkeepers Jul 1, 2015
f05fd4e
Add reference to XKCD comic
caniszczyk Jul 1, 2015
20a31f6
Fix bullet
caniszczyk Jul 1, 2015
714b0b3
Update the diction for clarity
Jul 1, 2015
aaa041b
Merge pull request #12 from todogroup/gh-pages-language
caniszczyk Jul 1, 2015
97046bb
Add the reference to the FAQ
caniszczyk Jul 1, 2015
16bf675
Merge pull request #13 from todogroup/add-faq-reference
caniszczyk Jul 1, 2015
13611b3
Small FAQ clarifications
Jul 1, 2015
4eeeb2a
Merge pull request #14 from todogroup/gh-pages-faq
caniszczyk Jul 1, 2015
0f6d5b5
Add TODOs for respective companies
caniszczyk Jul 2, 2015
7e1ad2b
Add Box to list of supporting companies
Jul 8, 2015
f68c455
Close #16
caniszczyk Jul 14, 2015
725c074
Fix companies
caniszczyk Jul 20, 2015
0493090
Add Yahoo
caniszczyk Jul 20, 2015
db677f8
Update README.md
jamesgpearce Jul 20, 2015
74cb104
Add GitHub via Atom Editor
caniszczyk Jul 20, 2015
1742d48
Minor nits
caniszczyk Jul 20, 2015
b00eff5
We can have an exhaustive list
fat16 Jul 20, 2015
3a1c88c
added consequences section
fat16 Jul 20, 2015
7704a1d
remove duplicate statement
fat16 Jul 20, 2015
988de42
loosen anti abuse team
fat16 Jul 20, 2015
f30a611
Fixing English in the bullet list ("Our open source community strives…
gianugo Jul 20, 2015
49509dc
Add attribution and acknowledgements to CoC itself.
christi3k Jul 20, 2015
0e031ad
Merge pull request #18 from christi3k/gh-pages
caniszczyk Jul 20, 2015
4d99990
Use hyperlink technology
bkeepers Jul 20, 2015
5b6c6df
maintain the list on one place
bkeepers Jul 20, 2015
1d1ea79
Merge pull request #19 from todogroup/clean-up-attribution
caniszczyk Jul 20, 2015
09ea585
Typo: commnities -> communities
aprescott Jul 20, 2015
561950f
Merge pull request #21 from aprescott/patch-1
caniszczyk Jul 20, 2015
d8db444
Fixes #20
caniszczyk Jul 20, 2015
0906a5a
Merge pull request #1 from gianugo/minor-language-fixes
gianugo Jul 21, 2015
5a76bef
clarify "everyone is equal"
bkeepers Jul 21, 2015
c95e6bf
add [COMMUNITY] place holder
fat16 Jul 23, 2015
473be93
:fire: remove loose terminology
fat16 Jul 23, 2015
8e255d3
Merge branch 'gh-pages' into add-back-explicit-definitions
fat16 Jul 23, 2015
6a8ae60
Modify impartiality clause
Addvilz Jul 23, 2015
87bcca4
Merge pull request #28 from todogroup/equal
bkeepers Jul 24, 2015
009b510
Rearrange wording of reporting clause
Addvilz Jul 24, 2015
a09e536
Word tweaks
fat16 Jul 24, 2015
a1038b0
:art:
fat16 Jul 24, 2015
fdcb29f
This is said upfront
fat16 Jul 24, 2015
7455009
update deadnaming section
fat16 Jul 28, 2015
10e57b2
Merge pull request #17 from todogroup/add-back-explicit-definitions
bkeepers Jul 29, 2015
1e9e66c
Merge pull request #32 from Addvilz/gh-pages
bkeepers Jul 30, 2015
16fc575
Merge remote-tracking branch 'origin/gh-pages' into gianugo-gh-pages
bkeepers Jul 30, 2015
176451b
Merge branch 'gianugo-gh-pages' into gh-pages
bkeepers Jul 30, 2015
21c7ee2
added closing quotation mark
shiftkey Jul 31, 2015
75bc62b
dropping the full stop to be consistent with other dot points
shiftkey Jul 31, 2015
3e4b520
Merge pull request #39 from shiftkey/patch-1
bkeepers Jul 31, 2015
a171ec0
Update README.md
bkeepers Aug 3, 2015
eb17e77
Merge pull request #57 from todogroup/recursion
caniszczyk Aug 3, 2015
38fc3a2
Update Django Code of Conduct link
manfre Aug 18, 2015
3665c6e
Merge pull request #92 from manfre/patch-1
bkeepers Aug 18, 2015
6ccc1b7
Creating an option for us to consider
gyehuda Aug 23, 2015
bb65e67
rename file
gyehuda Aug 23, 2015
36840f6
formatting fixes
gyehuda Aug 23, 2015
dfedf2c
more formatting (sorry)
gyehuda Aug 23, 2015
7df5080
more formatting.
gyehuda Aug 23, 2015
22de2be
Considering a table layout.
gyehuda Aug 24, 2015
160f39b
Added link to changes
gyehuda Aug 24, 2015
1c883a2
Initial commit of suggest improvements
gyehuda Aug 24, 2015
4bc71ca
Added "section #" and updated link to suggestions
gyehuda Aug 24, 2015
3a320e1
updated link
gyehuda Aug 24, 2015
9108b44
editing some text for clarity.
gyehuda Aug 24, 2015
d0b8686
editing the reporting clarification content.
gyehuda Aug 24, 2015
16902fc
Some minor grammatical clarifications
gyehuda Sep 4, 2015
b314088
Some clarifications on the text.
gyehuda Sep 4, 2015
6c3e8af
Update current status
Feb 26, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
_site
.sass-cache
53 changes: 5 additions & 48 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,10 @@
# Open Code of Conduct
_Update: We will not be continuing work on the open code of conduct. See [our followup post](http://todogroup.org/blog/followup-open-code-of-conduct/) for more information._

An easy to reuse open source code of conduct **template** for communities.
We recommend you adopt a code of conduct that fits the needs of your community. Here are a few communities and projects that established code of conducts and diversity statements:

Developed by the [@TODOGroup](https://twitter.com/todogroup) to promote code of conducts for open source communities.

## FAQ

#### Why a code of conduct?

We strongly believe that code of conducts help set the ground rules for participation in communities and more importantly, help build a culture of respect and improve diversity. According to the latest [FLOSS survey](http://floss2013.libresoft.es/results.en.html), we have lots of work to do in improving diversity across open source communities.

Furthermore, diversity is the spice of life. Having a diverse contributor community from different backgrounds and organizations will help set your community up for long term success. Also, the [research](http://www.scientificamerican.com/article/how-diversity-makes-us-smarter/) shows that diverse communities are more creative, diligent and innovative.

#### What license is this code of conduct under?

A very liberal CC-BY-4.0 (https://creativecommons.org/licenses/by/4.0/)

#### What do you mean that the open code of conduct is a template?

It's very hard to develop a one size fits all code of conduct for open source communities, so we took template approach inspired by the BSD license: http://opensource.org/licenses/BSD-3-Clause. This allows organizations to work off the core code of conduct while customizing it to their needs.

#### What companies support or use the open code of conducts?

* Square: https://corner.squareup.com/codeofconduct.html
* Twitter: https://engineering.twitter.com/opensource/code-of-conduct
* Eclipse Foundation: TODO

#### Can I apply this code of conduct for conferences or events?

It wasn't intended for that purpose, but we highly recommend you look at http://confcodeofconduct.com/

Also, Ashe Dryden has some great information on the topic: http://www.ashedryden.com/blog/codes-of-conduct-101-faq

#### Can I use something simpler? What about the Contributor Covenant?

The [contributor convenant](http://www.ashedryden.com/blog/codes-of-conduct-101-faq) is a great option and we recommend you take a look at it. However, we had a need to make a customizable by default code of conduct in template form, geared towards companies who run larger open source projects.

#### Can I contribute and improve this code of conduct?

Contributions are welcome on how to improve the open code of conduct!

Please send us a pull request with your suggestions.

## Thanks

We all stand on the shoulders of giants across many open source communities.

We'd like to thank the communities and projects that established code of conducts and diversity statements as our inspiration:
* Django: https://www.djangoproject.com/conduct/reporting/
* Django: https://www.djangoproject.com/conduct/
* Python: https://www.python.org/community/diversity/
* Ubuntu: http://www.ubuntu.com/about/about-ubuntu/conduct
* Contributor Covenant: http://contributor-covenant.org/
* Geek Feminism: http://geekfeminism.org/about/code-of-conduct/
* Citizen Code of Conduct: http://citizencodeofconduct.org/
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
title: Open Code of Conduct
description: An easy to reuse open source code of conduct for communities
markdown: kramdown
parenturl: http://todogroup.org/
30 changes: 30 additions & 0 deletions _layouts/code-of-conduct.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
layout: default
---

</div> <!-- .container -->

<div id="configure" class="unconfigured">
<div class="container">
<p><em>Update: We will not be continuing work on the open code of conduct. See <a href="http://todogroup.org/blog/followup-open-code-of-conduct/">our followup post</a> for more information.</em></p>

<p>We recommend you adopt a code of conduct that fits the needs of your community. Here are a few communities and projects that established code of conducts and diversity statements:</p>

<ul>
<li><a href="https://www.djangoproject.com/conduct/reporting/">Django</a></li>
<li><a href="https://www.python.org/community/diversity/">Python</a></li>
<li><a href="http://www.ubuntu.com/about/about-ubuntu/conduct">Ubuntu</a></li>
<li><a href="http://contributor-covenant.org/">Contributor Covenant</a></li>
<li><a href="http://geekfeminism.org/about/code-of-conduct/">Geek Feminism</a></li>
<li><a href="http://citizencodeofconduct.org/">Citizen Code of Conduct</a></li>
</ul>
</div> <!-- .container -->
</div>

<div class="container">

<div id="code-of-conduct">
{{ content }}
</div>

<script type="text/javascript" src="js/configure.js"></script>
61 changes: 52 additions & 9 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,62 @@
<meta charset="utf-8">
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{{ site.description }}">
<meta name='apple-mobile-web-app-capable' content='yes'>
<meta name='apple-mobile-web-app-status-bar-style' content='black'>
<meta name='viewport' content='width=device-width, initial-scale=1, user-scalable=no'>
<meta http-equiv='content-type' content='text/html; charset=utf-8'>
<meta
name='keywords'
content='open source,todo,talk openly,develop openly,code of conduct'
>
<meta
name='description'
content='TODO: talk openly, develop openly. We believe we can better improve our open source programs - and our contributions to the open source movement as a whole - by working together.'
>

<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="bootstrap.min.css" media="screen">
<meta property='og:type' content='website' />
<meta property='og:title' content='{{page.title}} // TODO: Talk openly, develop openly' />
<meta property='og:image' content='{{site.parenturl}}static/og.png' />
<meta
property='og:description'
content='TODO: talk openly, develop openly. We believe we can better improve our open source programs - and our contributions to the open source movement as a whole - by working together.'
/>

<link rel="shortcut icon" href="{{site.parenturl}}static/favicon.png" />
<link href='http://fonts.googleapis.com/css?family=Oswald:300,700,400|Open+Sans:400,700|Merriweather:300,400,700,900' rel='stylesheet' type='text/css'>
<link rel='stylesheet' href='{{site.parenturl}}static/style.css' type='text/css'>
<link rel='stylesheet' href='css/site.css' type='text/css'>


<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-54779798-1', 'auto');
ga('send', 'pageview');
</script>
</head>
<body>
<div class="container">
<div class="page-header">
<h1>{{ site.title }}</h1>
<p class="lead">{{ site.description }}</p>
</div>
<header id='header'>
<a href='{{site.parenturl}}'>
<img src='{{site.parenturl}}static/logo.svg' class='logo' alt='TODO'>
</a>
</header>

{{ content }}
<article id='article' class='page-{{page.title|downcase}}'>
<div class="container">
<div class="page-header">
<h1>
<a href="{{ site.url }}">{{ site.title }}</a>
{% if page.version %}<span class="version">{{page.version}}</span>{% endif %}
</h1>
</div>

{{ content }}

</div>
</article>

</div>
</body>
</html>
24 changes: 24 additions & 0 deletions _sass/configure.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#configure {
background-color: #333;
color: #ccc;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
padding: 1em 0;
margin: 2em 0;
}

#apply {
opacity: 0.5;
transition: opacity 0.3s;

.configuring & {
opacity: 1;
}
}

#snippet {
width: 100%;
max-width: none;
font-size: 0.8em;
height: 8em;
}
Loading