Adding Code of Conduct.

.gitignore

@@ -1,3 +1,4 @@
 _site
 _posts
-vendor
+vendor
+.bundle

.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+rvm:
+  - 2.2
 sudo: false
 cache: bundler
 install:

CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+./conduct/index.md

Gemfile.lock

@@ -2,19 +2,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
-    celluloid (0.16.0.pre)
-      timers (~> 2.0.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
-    coffee-script (2.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.11.1)
     colorator (0.1)
-    execjs (2.0.2)
+    execjs (2.7.0)
     fast-stemmer (1.0.2)
-    ffi (1.9.3)
-    hitimes (1.2.1)
+    ffi (1.9.18)
+    hitimes (1.2.6)
     jekyll (2.0.3)
       classifier (~> 1.3)
       colorator (~> 0.1)
@@ -28,33 +28,38 @@ GEM
       redcarpet (~> 3.1)
       safe_yaml (~> 1.0)
       toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.0)
+    jekyll-coffeescript (1.0.2)
       coffee-script (~> 2.2)
-    jekyll-sass-converter (1.0.0)
-      sass (~> 3.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
     kramdown (1.3.3)
     liquid (2.5.5)
-    listen (2.7.5)
-      celluloid (>= 0.15.2)
+    listen (2.10.1)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mercenary (0.3.3)
+    mercenary (0.3.6)
     parslet (1.5.0)
       blankslate (~> 2.0)
-    posix-spawn (0.3.8)
+    posix-spawn (0.3.13)
     pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rake (10.1.1)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.4)
-      ffi (>= 0.5.0)
-    redcarpet (3.1.2)
-    safe_yaml (1.0.3)
-    sass (3.3.7)
-    timers (2.0.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    redcarpet (3.4.0)
+    safe_yaml (1.0.4)
+    sass (3.5.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    timers (4.0.4)
       hitimes
-    toml (0.1.1)
+    toml (0.1.2)
       parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
@@ -65,3 +70,6 @@ DEPENDENCIES
   jekyll (~> 2.0.3)
   kramdown (~> 1.3.3)
   rake (~> 10.1.1)
+
+BUNDLED WITH
+   1.15.1

Rakefile

@@ -19,10 +19,8 @@ DESTINATION_REPO = USERNAME + "/" + (CONFIG["repo"] || "#{USERNAME}.github.io")
 # Name of source branch for user/organization defaults to "source"
 SOURCE_REPO = ENV['TRAVIS_REPO_SLUG']
 if DESTINATION_REPO == "timvideos/#{USERNAME}.github.io"
-  SOURCE_BRANCH = CONFIG['branch'] || "source"
   DESTINATION_BRANCH = "master"
 else
-  SOURCE_BRANCH = "master"
   DESTINATION_BRANCH = "gh-pages"
 end
 
@@ -211,7 +209,8 @@ namespace :site do
     # Make sure destination folder exists as git repo
     check_destination
 
-    sh "git checkout #{SOURCE_BRANCH}"
+    sh "git fetch origin --unshallow"
+    sh "git fetch origin --tags"
     Dir.chdir(CONFIG["destination"]) { sh "rm -rf *" }
     Dir.chdir(CONFIG["destination"]) { sh "git checkout #{DESTINATION_BRANCH}" }
 

_config.yml

@@ -9,7 +9,7 @@ lsi: false
 markdown: kramdown
 kramdown:
   entity_output: as_input
-exclude: [Gemfile, Gemfile.lock, planet.yml, vendor, .travis.yml, Rakefile, README.md, DEPLOY.md]
+exclude: [Gemfile, Gemfile.lock, planet.yml, vendor, .travis.yml, Rakefile, README.md, DEPLOY.md, CODE_OF_CONDUCT.md]
 auto_permalinks: true 
 name: Tim Videos - Live Event Streaming - Developers Website
 description: News, information, instructions and how to contribute

_includes/sidebar.html

@@ -28,6 +28,16 @@
     <li class="{% active_class contribute %}">
       <a href="{% page_url contribute %}">CONTRIBUTE</a>
     </li>
+    <li class="{% active_class conduct %}">
+      <a href="/conduct/">CONDUCT</a></li>
+    </li>
+    <li class="{% active_class reporting %}">
+     <ul>
+      <li><a href="{% page_url reporting %}">Reporting</a></li>
+     </ul>
+    </li>
+
+
     <li class="{% active_class people %}">
       <a href="{% page_url people %}">PEOPLE</a>
     </li>

conduct/Reporting.md

@@ -0,0 +1,107 @@
+---
+layout: default
+title: Code of Conduct - Reporting Guide
+tagline: Code of Conduct - Reporting Guide
+tags: conduct reporting
+permalink: /conduct/reporting/
+---
+
+# Code Of Conduct - Reporting Guide
+
+If you believe someone is violating the code of conduct we ask that you report
+it to the Django Software Foundation by emailing
+[report@timvideos.us](mailto:report@timvideos.us).
+
+**All reports will be kept confidential.** In some cases we may determine that
+a public statement will need to be made. If that's the case, the identities of
+all victims and reporters will remain confidential unless those individuals
+instruct us otherwise.
+
+**If you believe anyone is in physical danger, please notify appropriate
+law enforcement first.** If you are unsure what law enforcement agency is
+appropriate, please include this in your report and we will attempt to notify
+them.
+
+If you are unsure whether the incident is a violation, or whether the space
+where it happened is covered by the [Code of Conduct](code.md), we encourage
+you to still report it. We would much rather have a few extra reports where we
+decide to take no action, rather than miss a report of an actual violation. We
+do not look negatively on you if we find the incident is not a violation. And
+knowing about incidents that are not violations, or happen outside our spaces,
+can also help us to improve the [Code of Conduct](code.md) or the processes
+surrounding it.
+
+In your report please include:
+
+ * Your contact info (so we can get in touch with you if we need to follow up).
+ * Names (real, nicknames, or pseudonyms) of any individuals involved. If there
+   were other witnesses besides you, please try to include them as well.
+ * When and where the incident occurred. Please be as specific as possible.
+ * Your account of what occurred. If there is a publicly available record (e.g.
+   a mailing list archive or a public IRC logger) please include a link.
+ * Any extra context you believe existed for the incident.
+ * If you believe this incident is ongoing.
+ * Any other information you believe we should have.
+
+## What happens after you file a report?
+
+You will receive an email from a TimVideos Code of Conduct representative
+acknowledging receipt as soon as possible. We promise to try and acknowledge
+receipt within 24 hours (and will aim for much quicker than that).
+
+The representative will immediately meet to review the incident and determine:
+
+ * What happened.
+ * Whether this event constitutes a code of conduct violation.
+ * Who the bad actor was.
+ * Whether this is an ongoing situation, or if there is a threat to anyone's
+   physical safety.
+
+If needed the representative will include other Code of Conduct representatives
+to make sure the review is handled correctly & promptly.
+
+If this is determined to be an ongoing incident or a threat to physical safety,
+the representative's immediate priority will be to protect everyone involved.
+This means we may delay an "official" response until we believe that the
+situation has ended and that everyone is physically safe.
+
+Once the working group has a complete account of the events they will make a
+decision as to how to response. Responses may include:
+
+ * Nothing (if we determine no violation occurred).
+ * A private reprimand from the working group to the individual(s) involved.
+ * A public reprimand.
+ * An imposed vacation (i.e. asking someone to "take a week off" from a mailing
+   list or IRC).
+ * A permanent or temporary ban from some or all Django spaces (mailing lists,
+   IRC, etc.)
+ * A request for a public or private apology.
+
+We'll respond within one week to the person who filed the report with either a
+resolution or an explanation of why the situation is not yet resolved.
+
+Once we've determined our final action, we'll contact the original reporter to
+let them know what action (if any) we'll be taking. We'll take into account
+feedback from the reporter on the appropriateness of our response, but we don't
+guarantee we'll act on it.
+
+## Reconsideration
+
+Any of the parties directly involved or affected can request reconsideration
+of the representative’s decision. To make such a request, contact either
+[report@timvideos.us](mailto:report@timvideos.us) or the TimVideos' BDFL
+[Tim 'mithro' Ansell](mailto:mithro@mithis.com) with your request and
+motivation and we will review the case.
+
+## Source
+
+This Code of Conduct Reporting Guide was mostly copied from
+[the Django Project's Conduct Reporting Guide](https://www.djangoproject.com/conduct/reporting/)
+with small modifications to deal with the fact that TimVideos project does not
+have the equivalent to the
+[Django Software Foundation](https://www.djangoproject.com/foundation/).
+
+## License
+
+The document is released under
+[Creative Commons Attribution 3.0 Unported (CC BY 3.0)](https://creativecommons.org/licenses/by/3.0/).