From c9935ffc2df834290cf951b90fcb89ff9cdf2099 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Mon, 23 Jan 2017 20:12:59 -0800
Subject: [PATCH 01/35] Make travis run on trusty (was precise)

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 87defef3110..44af9d69dd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: python
+dist: trusty
 sudo: required
 python:
   - "3.4"

From afa1b787ccd9b60b8f9b10eda42cdd205d0e7948 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Mon, 23 Jan 2017 20:14:04 -0800
Subject: [PATCH 02/35] Bump postgres to 9.6 #416

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 44af9d69dd5..6f602785761 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ python:
   - "3.5"
   - "3.6"
 addons:
-  postgresql: "9.5"
+  postgresql: "9.6"
 services:
   - postgresql
 install:

From 367aa1f66586ae7542a9eadb63cedc79d3ef6a6c Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Fri, 17 Feb 2017 20:16:50 +1100
Subject: [PATCH 03/35] Improve error page to account for tabbykitten accounts
 without email

---
 tabbycat/templates/500.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tabbycat/templates/500.html b/tabbycat/templates/500.html
index f87dadaae24..bd0c0c29174 100644
--- a/tabbycat/templates/500.html
+++ b/tabbycat/templates/500.html
@@ -15,12 +15,16 @@ <h2><span class="emoji">🙀</span>Internal Server Error (500)</h2>
     </div>
   </div>
 
-  <div class="panel panel-default" id="error-reporting" style="display: none;">
-    <div class="panel-body">
-      <strong>Tab Directors:</strong> if you're running this on Heroku, an error report has been e-mailed to the developers of Tabbycat. If you encounter this error repeatedly, please let us know by
-      <a id="report-link" href="https://github.com/czlee/tabbycat/issues/new/?title=Internal%20server%20error%20report&body=I%20hit%20an%20internal%20server%20error%20while%20trying%20to%20load%20this%20URL:%0A[please%20copy%20and%20paste%20the%20URL%20of%20the%20page%20here]%0A%0APlease%20describe%20what%20you%20were%20doing%20when%20the%20error%20happened,%20along%20with%20any%20other%20useful%20information:%0A&labels=error-report">
-      opening an issue on GitHub</a> (preferred) or by posting in our <a href="https://www.facebook.com/groups/tabbycat.debate/">Facebook group</a>, and we'll try our best to assist. Please be sure to include the URL of this page <small id="page-url"></small> in your post.
-    </div>
+  <div class="alert alert-warning" id="error-reporting" style="display: none;">
+      <p>
+        <strong>Tab Directors:</strong>
+        {% if 'k' in tabbycat_version %}
+           because you are running the Tabbykitten version an error report cannot be sent to the developers of Tabbycat. Please let us know of this error directly by
+        {% else %}
+          if you're running this on Heroku, an error report has been e-mailed to the developers of Tabbycat. If you encounter this error repeatedly, please let us know by
+        {% endif %}
+        <a id="report-link" href="https://github.com/czlee/tabbycat/issues/new/?title=Internal%20server%20error%20report&body=I%20hit%20an%20internal%20server%20error%20while%20trying%20to%20load%20this%20URL:%0A[please%20copy%20and%20paste%20the%20URL%20of%20the%20page%20here]%0A%0APlease%20describe%20what%20you%20were%20doing%20when%20the%20error%20happened,%20along%20with%20any%20other%20useful%20information:%0A&labels=error-report">
+      opening an issue on GitHub</a> (preferred) or by posting in our <a href="https://www.facebook.com/groups/tabbycat.debate/">Facebook group</a>, and we'll try our best to assist. Please be sure to include the URL of this page <span id="page-url"></span> in your post.</p>
   </div>
 
   <script>

From 0bda7a8d87f319f790bb4cb2e4aad28bcd6f29a5 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Fri, 17 Feb 2017 20:33:31 +1100
Subject: [PATCH 04/35] Better validate data when calculating average scores

---
 tabbycat/adjfeedback/utils.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tabbycat/adjfeedback/utils.py b/tabbycat/adjfeedback/utils.py
index d9eb980f32b..65b197f8ee1 100644
--- a/tabbycat/adjfeedback/utils.py
+++ b/tabbycat/adjfeedback/utils.py
@@ -121,9 +121,15 @@ def scoring_stats(adj, scores, debate_adjudications, reply_position):
     adj.avg_margin = None
 
     if len(scores) > 0:
+        # Cleaning
+        scores = [s.score for s in scores if hasattr(s, 'ballot_submission')]
+        scores = [s.score for s in scores if hasattr(s, 'position')]
+        scores = [s.score for s in scores if hasattr(s, 'score')]
+
         # Figure out average speaks given (filter out replyes)
         substantives = [s for s in scores if s.position != reply_position]
-        adj.avg_score = sum(s.score for s in substantives) / len(substantives)
+        if len(substantives) > 0:
+            adj.avg_score = sum(s.score for s in substantives) / len(substantives)
 
         # Figure out average margin by summing speaks (post splitting them in 2)
         ballot_ids = [score.ballot_submission for score in scores]

From 121eecd4e196607fb497a5969f6549de7b443068 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Fri, 17 Feb 2017 09:01:57 -0800
Subject: [PATCH 05/35] Add migrations to release checklist [skip ci]

---
 CONTRIBUTING.rst | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index e6769647da4..3a80d44ddd3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -62,13 +62,14 @@ You should then be able to preview the docs at `127.0.0.1:7999 <http://127.0.0.1
 Release Checklist
 =================
 
-1. Bump version numbers in ``docs/conf.py`` and ``tabbycat/settings.py``
-2. Update the main ``CHANGELOG.rst`` file
-3. Shift remaining issues from the Github Milestone
-4. Create and finish the release branch as per git-flow
-5. Ensure the tag is correct (``vX.Y.Z``) and published to Github
-6. Back-merge ``master`` to the ``kitten`` branch
-7. Back-merge ``develop`` to the in-progress feature branches
-8. Push ``master`` to the release pipeline repository
-9. Issue a formal release with change notes on Github
-10. Post change notes on the Facebook group
+1. Check that all migrations have been generated and committed into Git.
+2. Bump version numbers in ``docs/conf.py`` and ``tabbycat/settings.py``
+3. Update the main ``CHANGELOG.rst`` file
+4. Shift remaining issues from the Github Milestone
+5. Create and finish the release branch as per git-flow
+6. Ensure the tag is correct (``vX.Y.Z``) and published to Github
+7. Back-merge ``master`` to the ``kitten`` branch
+8. Back-merge ``develop`` to the in-progress feature branches
+9. Push ``master`` to the release pipeline repository
+10. Issue a formal release with change notes on Github
+11. Post change notes on the Facebook group

From 2c1a5daeb055ab2fecb06c45398f412c817721a3 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 18 Feb 2017 14:08:22 +1100
Subject: [PATCH 06/35] Properly fix feedback

---
 tabbycat/adjfeedback/utils.py | 85 +++++++++++++++++------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/tabbycat/adjfeedback/utils.py b/tabbycat/adjfeedback/utils.py
index d9eb980f32b..5579a5a48a7 100644
--- a/tabbycat/adjfeedback/utils.py
+++ b/tabbycat/adjfeedback/utils.py
@@ -53,28 +53,29 @@ def expected_feedback_targets(debateadj, feedback_paths=None, debate=None):
 
 def get_feedback_overview(t, adjudicators):
 
-    all_debate_adjudicators = list(DebateAdjudicator.objects.all().select_related(
-        'adjudicator'))
-    all_adj_feedbacks = list(AdjudicatorFeedback.objects.filter(confirmed=True).select_related(
-        'adjudicator', 'source_adjudicator', 'source_team',
-        'source_adjudicator__debate__round', 'source_team__debate__round').exclude(
-            source_adjudicator__type=DebateAdjudicator.TYPE_TRAINEE))
-    all_adj_scores = list(SpeakerScoreByAdj.objects.filter(
-        ballot_submission__confirmed=True).select_related(
-        'debate_adjudicator__adjudicator', 'ballot_submission'))
-    rounds = t.prelim_rounds(until=t.current_round)
+    rounds = list(t.prelim_rounds(until=t.current_round))
+    debate_adjudicators = DebateAdjudicator.objects.filter(debate__round__tournament=t)
+    adj_feedbacks = AdjudicatorFeedback.objects.filter(
+                        confirmed=True,
+                        source_adjudicator__debate__round__in=rounds).select_related(
+                        'adjudicator', 'source_adjudicator', 'source_team', 'source_adjudicator__debate__round', 'source_team__debate__round').exclude(
+                        source_adjudicator__type=DebateAdjudicator.TYPE_TRAINEE)
+    adj_scores = SpeakerScoreByAdj.objects.filter(
+                        ballot_submission__confirmed=True,
+                        debate_adjudicator__debate__round__in=rounds).select_related(
+                        'debate_adjudicator__adjudicator', 'ballot_submission').exclude(
+                        position=t.REPLY_POSITION)
 
     for adj in adjudicators:
         # Gather feedback scores for graphs
-        feedbacks = [f for f in all_adj_feedbacks if f.adjudicator == adj]
-        debate_adjudications = [a for a in all_debate_adjudicators if a.adjudicator.id is adj.id]
-        scores = [s for s in all_adj_scores if s.debate_adjudicator.adjudicator.id is adj.id]
+        feedbacks = [f for f in adj_feedbacks if f.adjudicator == adj]
+        debate_adjudications = [a for a in debate_adjudicators if a.adjudicator == adj]
+        scores = [s for s in adj_scores if s.debate_adjudicator.adjudicator == adj]
 
         # Gather a dict of round-by-round feedback for the graph
-        adj.feedback_data = feedback_stats(adj, rounds, feedbacks, all_debate_adjudicators)
+        adj.feedback_data = feedback_stats(adj, rounds, feedbacks, debate_adjudicators)
         # Sum up remaining stats
-        reply_position = t.REPLY_POSITION
-        adj = scoring_stats(adj, scores, debate_adjudications, reply_position)
+        adj = scoring_stats(adj, scores, debate_adjudications)
 
     return adjudicators
 
@@ -114,37 +115,35 @@ def feedback_stats(adj, rounds, feedbacks, all_debate_adjudicators):
     return feedback_data
 
 
-def scoring_stats(adj, scores, debate_adjudications, reply_position):
-    # Processing scores to get average margins
+def scoring_stats(adj, scores, debate_adjudications):
     adj.debates = len(debate_adjudications)
     adj.avg_score = None
     adj.avg_margin = None
 
-    if len(scores) > 0:
-        # Figure out average speaks given (filter out replyes)
-        substantives = [s for s in scores if s.position != reply_position]
-        adj.avg_score = sum(s.score for s in substantives) / len(substantives)
-
-        # Figure out average margin by summing speaks (post splitting them in 2)
-        ballot_ids = [score.ballot_submission for score in scores]
-        ballot_ids = sorted(set([b.id for b in ballot_ids])) # Deduplicate
-        ballot_margins = []
-
-        for id in ballot_ids:
-            # For each unique ballot id make an array of all its scores
-            scores = [s.score for s in scores if s.ballot_submission.id is id]
-            speakers = int(len(scores) / 2)
-            try:
-                # Get the team totals by summing each half of the scores array
-                aff_pts, neg_pts = sum(scores[:speakers]), sum(scores[speakers:])
-                # The margin is the largest team pt difference - the smallest
-                ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
-            except TypeError:
-                print(scores)
-
-        if ballot_margins:
-            print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
-            adj.avg_margin = sum(ballot_margins) / len(ballot_margins)
+    if len(scores) == 0 or len(debate_adjudications) == 0:
+        return adj
+
+    adj.avg_score = sum(s.score for s in scores) / len(scores)
+    # Figure out average margin by summing speaks (post splitting them in 2)
+    ballot_ids = [s.ballot_submission for s in scores]
+    ballot_ids = sorted(set([b.id for b in ballot_ids])) # Deduplicate
+    ballot_margins = []
+
+    for id in ballot_ids:
+        # For each unique ballot id make an array of all its scores
+        scores = [s.score for s in scores if s.ballot_submission.id == id]
+        speakers = int(len(scores) / 2)
+        try:
+            # Get the team totals by summing each half of the scores array
+            aff_pts, neg_pts = sum(scores[:speakers]), sum(scores[speakers:])
+            # The margin is the largest team pt difference - the smallest
+            ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
+        except TypeError:
+            print(scores)
+
+    if ballot_margins:
+        print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
+        adj.avg_margin = sum(ballot_margins) / len(ballot_margins)
 
     return adj
 

From 26fbadea363debae492cb91e703f182b7eb38404 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 18 Feb 2017 14:08:22 +1100
Subject: [PATCH 07/35] Properly fix feedback

# Conflicts:
#	tabbycat/adjfeedback/utils.py
---
 tabbycat/adjfeedback/utils.py | 91 ++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 49 deletions(-)

diff --git a/tabbycat/adjfeedback/utils.py b/tabbycat/adjfeedback/utils.py
index 65b197f8ee1..5579a5a48a7 100644
--- a/tabbycat/adjfeedback/utils.py
+++ b/tabbycat/adjfeedback/utils.py
@@ -53,28 +53,29 @@ def expected_feedback_targets(debateadj, feedback_paths=None, debate=None):
 
 def get_feedback_overview(t, adjudicators):
 
-    all_debate_adjudicators = list(DebateAdjudicator.objects.all().select_related(
-        'adjudicator'))
-    all_adj_feedbacks = list(AdjudicatorFeedback.objects.filter(confirmed=True).select_related(
-        'adjudicator', 'source_adjudicator', 'source_team',
-        'source_adjudicator__debate__round', 'source_team__debate__round').exclude(
-            source_adjudicator__type=DebateAdjudicator.TYPE_TRAINEE))
-    all_adj_scores = list(SpeakerScoreByAdj.objects.filter(
-        ballot_submission__confirmed=True).select_related(
-        'debate_adjudicator__adjudicator', 'ballot_submission'))
-    rounds = t.prelim_rounds(until=t.current_round)
+    rounds = list(t.prelim_rounds(until=t.current_round))
+    debate_adjudicators = DebateAdjudicator.objects.filter(debate__round__tournament=t)
+    adj_feedbacks = AdjudicatorFeedback.objects.filter(
+                        confirmed=True,
+                        source_adjudicator__debate__round__in=rounds).select_related(
+                        'adjudicator', 'source_adjudicator', 'source_team', 'source_adjudicator__debate__round', 'source_team__debate__round').exclude(
+                        source_adjudicator__type=DebateAdjudicator.TYPE_TRAINEE)
+    adj_scores = SpeakerScoreByAdj.objects.filter(
+                        ballot_submission__confirmed=True,
+                        debate_adjudicator__debate__round__in=rounds).select_related(
+                        'debate_adjudicator__adjudicator', 'ballot_submission').exclude(
+                        position=t.REPLY_POSITION)
 
     for adj in adjudicators:
         # Gather feedback scores for graphs
-        feedbacks = [f for f in all_adj_feedbacks if f.adjudicator == adj]
-        debate_adjudications = [a for a in all_debate_adjudicators if a.adjudicator.id is adj.id]
-        scores = [s for s in all_adj_scores if s.debate_adjudicator.adjudicator.id is adj.id]
+        feedbacks = [f for f in adj_feedbacks if f.adjudicator == adj]
+        debate_adjudications = [a for a in debate_adjudicators if a.adjudicator == adj]
+        scores = [s for s in adj_scores if s.debate_adjudicator.adjudicator == adj]
 
         # Gather a dict of round-by-round feedback for the graph
-        adj.feedback_data = feedback_stats(adj, rounds, feedbacks, all_debate_adjudicators)
+        adj.feedback_data = feedback_stats(adj, rounds, feedbacks, debate_adjudicators)
         # Sum up remaining stats
-        reply_position = t.REPLY_POSITION
-        adj = scoring_stats(adj, scores, debate_adjudications, reply_position)
+        adj = scoring_stats(adj, scores, debate_adjudications)
 
     return adjudicators
 
@@ -114,43 +115,35 @@ def feedback_stats(adj, rounds, feedbacks, all_debate_adjudicators):
     return feedback_data
 
 
-def scoring_stats(adj, scores, debate_adjudications, reply_position):
-    # Processing scores to get average margins
+def scoring_stats(adj, scores, debate_adjudications):
     adj.debates = len(debate_adjudications)
     adj.avg_score = None
     adj.avg_margin = None
 
-    if len(scores) > 0:
-        # Cleaning
-        scores = [s.score for s in scores if hasattr(s, 'ballot_submission')]
-        scores = [s.score for s in scores if hasattr(s, 'position')]
-        scores = [s.score for s in scores if hasattr(s, 'score')]
-
-        # Figure out average speaks given (filter out replyes)
-        substantives = [s for s in scores if s.position != reply_position]
-        if len(substantives) > 0:
-            adj.avg_score = sum(s.score for s in substantives) / len(substantives)
-
-        # Figure out average margin by summing speaks (post splitting them in 2)
-        ballot_ids = [score.ballot_submission for score in scores]
-        ballot_ids = sorted(set([b.id for b in ballot_ids])) # Deduplicate
-        ballot_margins = []
-
-        for id in ballot_ids:
-            # For each unique ballot id make an array of all its scores
-            scores = [s.score for s in scores if s.ballot_submission.id is id]
-            speakers = int(len(scores) / 2)
-            try:
-                # Get the team totals by summing each half of the scores array
-                aff_pts, neg_pts = sum(scores[:speakers]), sum(scores[speakers:])
-                # The margin is the largest team pt difference - the smallest
-                ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
-            except TypeError:
-                print(scores)
-
-        if ballot_margins:
-            print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
-            adj.avg_margin = sum(ballot_margins) / len(ballot_margins)
+    if len(scores) == 0 or len(debate_adjudications) == 0:
+        return adj
+
+    adj.avg_score = sum(s.score for s in scores) / len(scores)
+    # Figure out average margin by summing speaks (post splitting them in 2)
+    ballot_ids = [s.ballot_submission for s in scores]
+    ballot_ids = sorted(set([b.id for b in ballot_ids])) # Deduplicate
+    ballot_margins = []
+
+    for id in ballot_ids:
+        # For each unique ballot id make an array of all its scores
+        scores = [s.score for s in scores if s.ballot_submission.id == id]
+        speakers = int(len(scores) / 2)
+        try:
+            # Get the team totals by summing each half of the scores array
+            aff_pts, neg_pts = sum(scores[:speakers]), sum(scores[speakers:])
+            # The margin is the largest team pt difference - the smallest
+            ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
+        except TypeError:
+            print(scores)
+
+    if ballot_margins:
+        print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
+        adj.avg_margin = sum(ballot_margins) / len(ballot_margins)
 
     return adj
 

From 06e753d31be91c1064e1bfe7a7175522dc9f780c Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 18 Feb 2017 14:47:00 +1100
Subject: [PATCH 08/35] Fix variable reassignment bug; (hopefully) actually fix
 adj scores

---
 tabbycat/adjfeedback/utils.py | 39 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/tabbycat/adjfeedback/utils.py b/tabbycat/adjfeedback/utils.py
index 5579a5a48a7..e677f586b18 100644
--- a/tabbycat/adjfeedback/utils.py
+++ b/tabbycat/adjfeedback/utils.py
@@ -55,12 +55,12 @@ def get_feedback_overview(t, adjudicators):
 
     rounds = list(t.prelim_rounds(until=t.current_round))
     debate_adjudicators = DebateAdjudicator.objects.filter(debate__round__tournament=t)
-    adj_feedbacks = AdjudicatorFeedback.objects.filter(
+    all_feedbacks = AdjudicatorFeedback.objects.filter(
                         confirmed=True,
                         source_adjudicator__debate__round__in=rounds).select_related(
                         'adjudicator', 'source_adjudicator', 'source_team', 'source_adjudicator__debate__round', 'source_team__debate__round').exclude(
                         source_adjudicator__type=DebateAdjudicator.TYPE_TRAINEE)
-    adj_scores = SpeakerScoreByAdj.objects.filter(
+    all_scores = SpeakerScoreByAdj.objects.filter(
                         ballot_submission__confirmed=True,
                         debate_adjudicator__debate__round__in=rounds).select_related(
                         'debate_adjudicator__adjudicator', 'ballot_submission').exclude(
@@ -68,14 +68,14 @@ def get_feedback_overview(t, adjudicators):
 
     for adj in adjudicators:
         # Gather feedback scores for graphs
-        feedbacks = [f for f in adj_feedbacks if f.adjudicator == adj]
-        debate_adjudications = [a for a in debate_adjudicators if a.adjudicator == adj]
-        scores = [s for s in adj_scores if s.debate_adjudicator.adjudicator == adj]
+        adj_feedbacks = [f for f in all_feedbacks if f.adjudicator == adj]
+        adj_adjudications = [a for a in debate_adjudicators if a.adjudicator == adj]
+        adj_scores = [s for s in all_scores if s.debate_adjudicator.adjudicator == adj]
 
         # Gather a dict of round-by-round feedback for the graph
-        adj.feedback_data = feedback_stats(adj, rounds, feedbacks, debate_adjudicators)
+        adj.feedback_data = feedback_stats(adj, rounds, adj_feedbacks, debate_adjudicators)
         # Sum up remaining stats
-        adj = scoring_stats(adj, scores, debate_adjudications)
+        adj = scoring_stats(adj, adj_scores, adj_adjudications)
 
     return adjudicators
 
@@ -115,12 +115,12 @@ def feedback_stats(adj, rounds, feedbacks, all_debate_adjudicators):
     return feedback_data
 
 
-def scoring_stats(adj, scores, debate_adjudications):
-    adj.debates = len(debate_adjudications)
+def scoring_stats(adj, scores, adjudications):
+    adj.debates = len(adjudications)
     adj.avg_score = None
     adj.avg_margin = None
 
-    if len(scores) == 0 or len(debate_adjudications) == 0:
+    if len(scores) == 0 or len(adjudications) == 0:
         return adj
 
     adj.avg_score = sum(s.score for s in scores) / len(scores)
@@ -131,18 +131,17 @@ def scoring_stats(adj, scores, debate_adjudications):
 
     for id in ballot_ids:
         # For each unique ballot id make an array of all its scores
-        scores = [s.score for s in scores if s.ballot_submission.id == id]
-        speakers = int(len(scores) / 2)
-        try:
-            # Get the team totals by summing each half of the scores array
-            aff_pts, neg_pts = sum(scores[:speakers]), sum(scores[speakers:])
-            # The margin is the largest team pt difference - the smallest
-            ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
-        except TypeError:
-            print(scores)
+        ballot_scores = [s.score for s in scores if s.ballot_submission.id == id]
+        speakers = int(len(ballot_scores) / 2)
+
+        # Get the team totals by summing each half of the scores array
+        aff_pts = sum(ballot_scores[:speakers])
+        neg_pts = sum(ballot_scores[speakers:])
+        # The margin is the largest team pt difference - the smallest
+        ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
 
     if ballot_margins:
-        print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
+        # print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
         adj.avg_margin = sum(ballot_margins) / len(ballot_margins)
 
     return adj

From fa8d5537412c738f61d9e34b1446744506cbc331 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 18 Feb 2017 14:47:00 +1100
Subject: [PATCH 09/35] Fix variable reassignment bug; (hopefully) actually fix
 adj scores

---
 tabbycat/adjfeedback/utils.py | 39 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/tabbycat/adjfeedback/utils.py b/tabbycat/adjfeedback/utils.py
index 5579a5a48a7..e677f586b18 100644
--- a/tabbycat/adjfeedback/utils.py
+++ b/tabbycat/adjfeedback/utils.py
@@ -55,12 +55,12 @@ def get_feedback_overview(t, adjudicators):
 
     rounds = list(t.prelim_rounds(until=t.current_round))
     debate_adjudicators = DebateAdjudicator.objects.filter(debate__round__tournament=t)
-    adj_feedbacks = AdjudicatorFeedback.objects.filter(
+    all_feedbacks = AdjudicatorFeedback.objects.filter(
                         confirmed=True,
                         source_adjudicator__debate__round__in=rounds).select_related(
                         'adjudicator', 'source_adjudicator', 'source_team', 'source_adjudicator__debate__round', 'source_team__debate__round').exclude(
                         source_adjudicator__type=DebateAdjudicator.TYPE_TRAINEE)
-    adj_scores = SpeakerScoreByAdj.objects.filter(
+    all_scores = SpeakerScoreByAdj.objects.filter(
                         ballot_submission__confirmed=True,
                         debate_adjudicator__debate__round__in=rounds).select_related(
                         'debate_adjudicator__adjudicator', 'ballot_submission').exclude(
@@ -68,14 +68,14 @@ def get_feedback_overview(t, adjudicators):
 
     for adj in adjudicators:
         # Gather feedback scores for graphs
-        feedbacks = [f for f in adj_feedbacks if f.adjudicator == adj]
-        debate_adjudications = [a for a in debate_adjudicators if a.adjudicator == adj]
-        scores = [s for s in adj_scores if s.debate_adjudicator.adjudicator == adj]
+        adj_feedbacks = [f for f in all_feedbacks if f.adjudicator == adj]
+        adj_adjudications = [a for a in debate_adjudicators if a.adjudicator == adj]
+        adj_scores = [s for s in all_scores if s.debate_adjudicator.adjudicator == adj]
 
         # Gather a dict of round-by-round feedback for the graph
-        adj.feedback_data = feedback_stats(adj, rounds, feedbacks, debate_adjudicators)
+        adj.feedback_data = feedback_stats(adj, rounds, adj_feedbacks, debate_adjudicators)
         # Sum up remaining stats
-        adj = scoring_stats(adj, scores, debate_adjudications)
+        adj = scoring_stats(adj, adj_scores, adj_adjudications)
 
     return adjudicators
 
@@ -115,12 +115,12 @@ def feedback_stats(adj, rounds, feedbacks, all_debate_adjudicators):
     return feedback_data
 
 
-def scoring_stats(adj, scores, debate_adjudications):
-    adj.debates = len(debate_adjudications)
+def scoring_stats(adj, scores, adjudications):
+    adj.debates = len(adjudications)
     adj.avg_score = None
     adj.avg_margin = None
 
-    if len(scores) == 0 or len(debate_adjudications) == 0:
+    if len(scores) == 0 or len(adjudications) == 0:
         return adj
 
     adj.avg_score = sum(s.score for s in scores) / len(scores)
@@ -131,18 +131,17 @@ def scoring_stats(adj, scores, debate_adjudications):
 
     for id in ballot_ids:
         # For each unique ballot id make an array of all its scores
-        scores = [s.score for s in scores if s.ballot_submission.id == id]
-        speakers = int(len(scores) / 2)
-        try:
-            # Get the team totals by summing each half of the scores array
-            aff_pts, neg_pts = sum(scores[:speakers]), sum(scores[speakers:])
-            # The margin is the largest team pt difference - the smallest
-            ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
-        except TypeError:
-            print(scores)
+        ballot_scores = [s.score for s in scores if s.ballot_submission.id == id]
+        speakers = int(len(ballot_scores) / 2)
+
+        # Get the team totals by summing each half of the scores array
+        aff_pts = sum(ballot_scores[:speakers])
+        neg_pts = sum(ballot_scores[speakers:])
+        # The margin is the largest team pt difference - the smallest
+        ballot_margins.append(max(aff_pts, neg_pts) - min(aff_pts, neg_pts))
 
     if ballot_margins:
-        print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
+        # print('%s has %s margins %s' % (adj, len(ballot_margins), ballot_margins))
         adj.avg_margin = sum(ballot_margins) / len(ballot_margins)
 
     return adj

From c834d36198fc2b3e31a7e08d71b744a050ce81fb Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 11:18:34 -0800
Subject: [PATCH 10/35] Add release dates to changelog [skip ci]

---
 CHANGELOG.rst | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 13e0c23b212..0f68c5ec2a2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,7 @@ Change Log
 
 1.2.0 (Foldex)
 --------------
+*Release date: 15 February 2017*
 
 - Changed the core workflow by splitting display- and motion- related activities into separate pages to simplify each stage of running a round
 - Added support for Docker-based installations to make local/offline installations much more simple
@@ -19,6 +20,7 @@ Change Log
 
 1.1.7
 -----
+*Release date: 31 January 2017*
 
 - Yet more minor bug fixes
 - The auto-allocation UI will now detail your minimum rating setting better
@@ -27,6 +29,7 @@ Change Log
 
 1.1.6
 -----
+*Release date: 19 January 2017*
 
 - A number of minor bug fixes
 - Added basic infrastructure for creating tabbycat translations
@@ -34,12 +37,14 @@ Change Log
 
 1.1.5
 -----
+*Release date: 12 January 2017*
 
 - A number of minor bug fixes and improvements to documentation
 
 
 1.1.4
 -----
+*Release date: 25 November 2016*
 
 - Redesigned the footer area to better describe Tabbycat and to promote donations and related projects
 - Slight tweaks to the site homepage and main menus to better accomodate the login/log out links
@@ -48,6 +53,7 @@ Change Log
 
 1.1.3
 -----
+*Release date: 15 September 2016*
 
 - Fixed bug affecting some migrations from earlier versions
 - Made latest results show question mark rather than crash if a team is missing
@@ -57,6 +63,7 @@ Change Log
 
 1.1.2
 -----
+*Release date: 14 September 2016*
 
 - Allow panels with even number of adjudicators (with warnings), by giving chair the casting vote
 - Removed defunct person check-in, which hasn't been used since 2010
@@ -69,12 +76,14 @@ Change Log
 
 1.1.1
 -----
+*Release date: 8 September 2016*
 
 - Fixed a bug where the team standings and team tab would crash when some emoji were not set
 
 
 1.1.0 (Egyptian Mau)
 --------------------
+*Release date: 3 September 2016*
 
 - Added support for the United Asian Debating Championships style
 - Added support for the World Schools Debating Championships style
@@ -85,6 +94,7 @@ Change Log
 
 1.0.1
 -----
+*Release date: 19 August 2016*
 
 - Fixed a minor bug with the visual importer affecting similarly named institutions
 - Fixed error message when user tries to auto-allocate adjudicators on unconfirmed or released draw
@@ -93,6 +103,8 @@ Change Log
 
 1.0.0 (Devon Rex)
 -----------------
+*Release date: 16 August 2016*
+
 Redesigned and redeveloped adjudicator allocation page
   - Redesigned interface, featuring clearer displays of conflict and diversity information
   - Changes to importances and panels are now automatically saved
@@ -120,6 +132,8 @@ Feedback
 
 0.9.0 (Chartreux)
 -----------------
+*Release date: 13 June 2016*
+
 - Added a beta implementation of the break rounds workflow
 - Added venue constraints, to allow participants or divisions to preferentially be given venues from predefined groups
 - Added a button to regenerate draws
@@ -134,6 +148,8 @@ Feedback
 
 0.8.3
 -----
+*Release date: 4 April 2016*
+
 - Restored and reworking printing functionality for scoresheets/feedback
 - Restored Edit Venues and Edit Matchups on the draw pages
 - Reworked tournament data importers to use csv.DictReader, so that column order in files doesn't matter
@@ -144,12 +160,15 @@ Feedback
 
 0.8.2
 -----
+*Release date: 20 March 2016*
+
 - Fixed issue where scores from individual ballots would be deleted when any other panel in the round was edited
 - Fixed issue where page crashes for URLs with "tab" in it but that aren't recognized tab pages
 
 
 0.8.1
 -----
+*Release date: 15 March 2016*
 
 - Fixed a bug where editing a Team in the admin section could cause an error
 - Added instructions on how to account for speakers speaking twice to docs
@@ -158,6 +177,7 @@ Feedback
 
 0.8.0 (Bengal)
 --------------
+*Release date: 29 February 2016*
 
 - Upgraded to Python 3.4, dropped support for Python 2
 - Restructured directories and, as a consequence, changed database schema
@@ -174,6 +194,7 @@ Feedback
 
 0.7.0 (Abyssinian)
 ------------------
+*Release date: 31 July 2015*
 
 - Support for multiple tournaments
 - Improved and extensible tournament data importer

From 804ffa96c15806080ff3528c590974bcce89233f Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 11:40:51 -0800
Subject: [PATCH 11/35] Add symlink for manage.py in root directory

---
 manage.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 manage.py

diff --git a/manage.py b/manage.py
new file mode 120000
index 00000000000..36ee5e1610a
--- /dev/null
+++ b/manage.py
@@ -0,0 +1 @@
+tabbycat/manage.py
\ No newline at end of file

From d6a364362ecaff9fb9b9c767f5f81fd27c35a40f Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 18:08:30 -0800
Subject: [PATCH 12/35] Change auto adj allocation to POST #287

---
 tabbycat/adjallocation/views.py                        | 10 +++++-----
 .../templates/js-vue/allocations/AllocationActions.vue |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tabbycat/adjallocation/views.py b/tabbycat/adjallocation/views.py
index 2e0b210b5be..7fabf8ec21b 100644
--- a/tabbycat/adjallocation/views.py
+++ b/tabbycat/adjallocation/views.py
@@ -14,7 +14,7 @@
 from participants.utils import regions_ordered
 from tournaments.models import Round
 from tournaments.mixins import RoundMixin
-from utils.mixins import JsonDataResponseView, SuperuserRequiredMixin
+from utils.mixins import JsonDataResponsePostView, SuperuserRequiredMixin
 from utils.views import admin_required, expect_post, round_view
 
 from .allocator import allocate_adjudicators
@@ -277,23 +277,23 @@ def get_context_data(self, **kwargs):
         return super().get_context_data(**kwargs)
 
 
-class CreateAutoAllocation(LogActionMixin, RoundMixin, SuperuserRequiredMixin, JsonDataResponseView):
+class CreateAutoAllocation(LogActionMixin, RoundMixin, SuperuserRequiredMixin, JsonDataResponsePostView):
 
     action_log_type = ActionLogEntry.ACTION_TYPE_ADJUDICATORS_AUTO
 
-    def get_data(self):
+    def post_data(self):
         round = self.get_round()
         allocate_adjudicators(round, HungarianAllocator)
         return debates_to_json(round.debate_set_with_prefetches(), self.get_tournament(), round)
 
-    def get(self, request, *args, **kwargs):
+    def post(self, request, *args, **kwargs):
         round = self.get_round()
         if round.draw_status == Round.STATUS_RELEASED:
             return HttpResponseBadRequest("Draw is already released, unrelease draw to redo auto-allocations.")
         if round.draw_status != Round.STATUS_CONFIRMED:
             return HttpResponseBadRequest("Draw is not confirmed, confirm draw to run auto-allocations.")
         self.log_action()
-        return super().get(request, *args, **kwargs)
+        return super().post(request, *args, **kwargs)
 
 
 class SaveDebateInfo(SuperuserRequiredMixin, RoundMixin, LogActionMixin, View):
diff --git a/tabbycat/templates/js-vue/allocations/AllocationActions.vue b/tabbycat/templates/js-vue/allocations/AllocationActions.vue
index 666d7f798ae..c7770320d1f 100644
--- a/tabbycat/templates/js-vue/allocations/AllocationActions.vue
+++ b/tabbycat/templates/js-vue/allocations/AllocationActions.vue
@@ -126,7 +126,7 @@ export default {
     createAutoAllocation: function(event) {
       var self = this
       $(event.target).button('loading')
-      $.getJSON({
+      $.post({
         url: this.roundInfo.createAutoAllocationURL,
         success: function(data, textStatus, jqXHR) {
           self.resetAutoAllocationModal(event.target)
@@ -139,7 +139,8 @@ export default {
         error: function(data, textStatus, jqXHR) {
           self.resetAutoAllocationModal(event.target)
           $.fn.showAlert('danger', '<strong>Auto Allocation failed:</strong> ' + data.responseText, 0)
-        }
+        },
+        dataType: "json"
       });
     },
     showRegion: function() {

From 92382811e6faeb24e28374236a26afa7686fc1d8 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 18:09:28 -0800
Subject: [PATCH 13/35] Fix deprecation warnings

---
 tabbycat/adjallocation/allocator.py |  2 +-
 tabbycat/adjallocation/hungarian.py | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/tabbycat/adjallocation/allocator.py b/tabbycat/adjallocation/allocator.py
index eff526d5762..e9c81999d54 100644
--- a/tabbycat/adjallocation/allocator.py
+++ b/tabbycat/adjallocation/allocator.py
@@ -3,7 +3,7 @@ def allocate_adjudicators(round, alloc_class):
     if round.draw_status != round.STATUS_CONFIRMED:
         raise RuntimeError("Tried to allocate adjudicators on unconfirmed draw")
 
-    debates = round.get_draw()
+    debates = round.debate_set.all()
     adjs = list(round.active_adjudicators.filter(novice=False))
     allocator = alloc_class(debates, adjs, round)
 
diff --git a/tabbycat/adjallocation/hungarian.py b/tabbycat/adjallocation/hungarian.py
index 6b78f74d0d5..f2fc37c5f73 100644
--- a/tabbycat/adjallocation/hungarian.py
+++ b/tabbycat/adjallocation/hungarian.py
@@ -30,6 +30,12 @@ def __init__(self, *args, **kwargs):
 
         self.DUPLICATE_ALLOCATIONS = t.pref('duplicate_adjs')
 
+        self.FEEDBACK_WEIGHT = t.current_round.feedback_weight
+
+    def populate_adj_scores(self, adjudicators):
+        for adj in adjudicators:
+            adj._hungarian_score = adj.weighted_score(self.FEEDBACK_WEIGHT)
+
     def calc_cost(self, debate, adj, adjustment=0):
         cost = 0
 
@@ -39,12 +45,12 @@ def calc_cost(self, debate, adj, adjustment=0):
         # Similarly normalise adj scores to the 0-5 range expected
         score_min = self.MIN_SCORE
         score_range = self.MAX_SCORE - score_min
-        normalised_adj_score = (adj.score - score_min) / score_range * 5 + 0
+        normalised_adj_score = (adj._hungarian_score - score_min) / score_range * 5 + 0
 
         if normalised_adj_score > 5.0:
-            logger.warning("%s's score %s is larger than the range" % (adj.name, adj.score))
+            logger.warning("%s's score %s is larger than the range" % (adj.name, adj._hungarian_score))
         elif normalised_adj_score < 0.0:
-            logger.warning("%s's score %s is smaller than the range" % (adj.name, adj.score))
+            logger.warning("%s's score %s is smaller than the range" % (adj.name, adj._hungarian_score))
 
         cost += self.CONFLICT_PENALTY * adj.conflict_with(debate.aff_team)
         cost += self.CONFLICT_PENALTY * adj.conflict_with(debate.neg_team)
@@ -52,25 +58,27 @@ def calc_cost(self, debate, adj, adjustment=0):
         cost += self.HISTORY_PENALTY * adj.seen_team(debate.neg_team, debate.round)
 
         impt = (normalised_importance or self.DEFAULT_IMPORTANCE) + adjustment
-        diff = 5 + impt - adj.score
+        diff = 5 + impt - adj._hungarian_score
         if diff > 0.25:
             cost += 100000 * exp(diff - 0.25)
 
-        cost += (self.MAX_SCORE - adj.score) * 100
+        cost += (self.MAX_SCORE - adj._hungarian_score) * 100
 
         return cost
 
     def allocate(self):
         from adjallocation.allocation import AdjudicatorAllocation
 
+        self.populate_adj_scores(self.adjudicators)
+
         # Remove trainees
-        self.adjudicators = [a for a in self.adjudicators if a.score >= self.MIN_VOTING_SCORE]
+        self.adjudicators = [a for a in self.adjudicators if a._hungarian_score >= self.MIN_VOTING_SCORE]
         logger.info("There are %s non-trainee adjudidcators", len(self.adjudicators))
 
         # Sort adjudicators and debates in descending score/importance
         self.adjudicators_sorted = list(self.adjudicators)
         shuffle(self.adjudicators_sorted)  # Randomize equally-ranked judges
-        self.adjudicators_sorted.sort(key=lambda a: a.score, reverse=True)
+        self.adjudicators_sorted.sort(key=lambda a: a._hungarian_score, reverse=True)
         self.debates_sorted = list(self.debates)
         self.debates_sorted.sort(key=lambda a: a.importance, reverse=True)
 
@@ -185,7 +193,7 @@ def allocate(self):
             # that the chair is the highest-ranked adjudicator in the panel
             for i, d in enumerate(panel_debates):
                 a = AdjudicatorAllocation(d)
-                p[i].sort(key=lambda a: a.score, reverse=True)
+                p[i].sort(key=lambda a: a._hungarian_score, reverse=True)
                 a.chair = p[i].pop(0)
                 a.panellists = p[i]
                 alloc.append(a)

From cc5e7967976a69e9ed2af3f410c492bac8c71d73 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sun, 19 Feb 2017 13:17:49 +1100
Subject: [PATCH 14/35] Fix issue where cross-tournament pages could call
 tournament_side_names (no tournament var) and fix issue where times were not
 shown for a divisions page

---
 .../draw/templates/public_all_draws_for_venue.html    |  3 ++-
 tabbycat/tournaments/mixins.py                        |  8 ++++++--
 tabbycat/utils/templatetags/debate_tags.py            | 11 +++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tabbycat/draw/templates/public_all_draws_for_venue.html b/tabbycat/draw/templates/public_all_draws_for_venue.html
index c0da7d0bc41..fca649e0647 100644
--- a/tabbycat/draw/templates/public_all_draws_for_venue.html
+++ b/tabbycat/draw/templates/public_all_draws_for_venue.html
@@ -6,6 +6,7 @@
 {% block page-title %}All Debates at {{ venue_group.name}}{% endblock %}
 
 {% block content %}
+
 <div class="panel panel-default">
   <div class="panel-body">
     <table id="draw" class="h4 table">
@@ -41,7 +42,7 @@
             {% else %}
               <td>{{ debate.venue.group.short_name }}</td>
             {% endif %}
-            {% if pref.enable_debate_scheduling %}{% include "tables/debate_status.html" %}{% endif %}
+            {% include "tables/debate_status.html" %}
             <td >
               {{ debate.aff_team.short_name }}
             </td>
diff --git a/tabbycat/tournaments/mixins.py b/tabbycat/tournaments/mixins.py
index 8deca508ed7..9dcacdcd805 100644
--- a/tabbycat/tournaments/mixins.py
+++ b/tabbycat/tournaments/mixins.py
@@ -148,13 +148,17 @@ def dispatch(self, request, *args, **kwargs):
 
 class CrossTournamentPageMixin(PublicTournamentPageMixin):
     """Mixin for views that show pages with data drawn from multiple tournaments
-    but are optionally viewed. They check the first available tournament object
+    but are optionally viewed. They check the last available tournament object
     and check its preferences"""
 
     def get_tournament(self):
-        tournament = Tournament.objects.order_by('id').first()
+        tournament = Tournament.objects.order_by('id').last()
         return tournament
 
+    def get_context_data(self, **kwargs):
+        kwargs['tournament'] = self.get_tournament()
+        return super().get_context_data(**kwargs)
+
 
 class SingleObjectFromTournamentMixin(SingleObjectMixin, TournamentMixin):
     """Mixin for views that relate to a single object that is part of a
diff --git a/tabbycat/utils/templatetags/debate_tags.py b/tabbycat/utils/templatetags/debate_tags.py
index 44d4f2ee569..26a444cc078 100644
--- a/tabbycat/utils/templatetags/debate_tags.py
+++ b/tabbycat/utils/templatetags/debate_tags.py
@@ -47,13 +47,16 @@ def team_status_classes(team):
 
 @register.simple_tag
 def debate_draw_status_class(debate):
-    if debate.aff_team.type == 'B' or debate.neg_team.type == 'B':
+    if debate.aff_team and debate.aff_team.type == 'B':
+        return "active text-muted"
+    elif debate.neg_team and debate.neg_team.type == 'B':
         return "active text-muted"
     elif debate.result_status == "P":
         return "active text-muted"
-    elif debate.confirmed_ballot:
-        if debate.confirmed_ballot.forfeit:
-            return "active text-muted"
+    elif debate.confirmed_ballot and debate.confirmed_ballot.forfeit:
+        return "active text-muted"
+
+    return ""
 
 
 @register.simple_tag

From d26770bea617f42978e05934bb370f838e4ff4bd Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sun, 19 Feb 2017 13:26:37 +1100
Subject: [PATCH 15/35] Fix minutes display for times <10m

---
 tabbycat/templates/js-vue/allocations/AllocationActions.vue | 6 ++++--
 tabbycat/templates/js-vue/mixins/AjaxMixin.vue              | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tabbycat/templates/js-vue/allocations/AllocationActions.vue b/tabbycat/templates/js-vue/allocations/AllocationActions.vue
index 666d7f798ae..a357b1e0e05 100644
--- a/tabbycat/templates/js-vue/allocations/AllocationActions.vue
+++ b/tabbycat/templates/js-vue/allocations/AllocationActions.vue
@@ -133,8 +133,10 @@ export default {
           $.fn.showAlert('success', '<strong>Success:</strong> loaded the auto allocation', 10000)
           self.$dispatch('set-debate-panels', JSON.parse(data))
           // Update the save counter (this normally goes through AjaxMixin.vue)
-          var now = new Date()
-          $('#saveTime').text("Saved at " + now.getHours() + ":" + now.getMinutes())
+          var savedAt = new Date()
+          var hours = savedAt.getHours()
+          var minutes = ('0'+ savedAt.getMinutes()).slice(-2); // ":09" not ":9"
+          $('#saveTime').text("Saved at " + hours + ":" + minutes)
         },
         error: function(data, textStatus, jqXHR) {
           self.resetAutoAllocationModal(event.target)
diff --git a/tabbycat/templates/js-vue/mixins/AjaxMixin.vue b/tabbycat/templates/js-vue/mixins/AjaxMixin.vue
index 00aa4ad4ade..4617ee5ccf4 100644
--- a/tabbycat/templates/js-vue/mixins/AjaxMixin.vue
+++ b/tabbycat/templates/js-vue/mixins/AjaxMixin.vue
@@ -20,8 +20,10 @@ export default {
         success: function() {
           console.log("Saved change for " + resourceType)
           // If an autosave counter exists; update it
-          var now = new Date()
-          $('#saveTime').text("Saved at " + now.getHours() + ":" + now.getMinutes())
+          var savedAt = new Date()
+          var hours = savedAt.getHours()
+          var minutes = ('0'+ savedAt.getMinutes()).slice(-2); // ":09" not ":9"
+          $('#saveTime').text("Saved at " + hours + ":" + minutes)
         }
       });
     }

From 50f6c6f16eabb4605047b27873afa6d9f097bc04 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sun, 19 Feb 2017 13:51:17 +1100
Subject: [PATCH 16/35] WADL page fix

---
 tabbycat/draw/templates/public_all_draws_for_institution.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabbycat/draw/templates/public_all_draws_for_institution.html b/tabbycat/draw/templates/public_all_draws_for_institution.html
index df1ec06d367..a66351aad73 100644
--- a/tabbycat/draw/templates/public_all_draws_for_institution.html
+++ b/tabbycat/draw/templates/public_all_draws_for_institution.html
@@ -35,7 +35,7 @@
               {% else %}
                 <td>{{ debate.venue.group.short_name }}</td>
               {% endif %}
-            {% if pref.enable_debate_scheduling %}{% include "tables/debate_status.html" %}{% endif %}
+            {% include "tables/debate_status.html" %}
             <td >
               {% if debate.aff_team.institution == institution %}
                 {{ debate.aff_team.short_name }}

From 3cd0b751979dc1066ecad837a06417bd334e7063 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 20:50:47 -0800
Subject: [PATCH 17/35] Point footer links at stable docs (not latest docs)
 [skip ci]

---
 tabbycat/templates/footer.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tabbycat/templates/footer.html b/tabbycat/templates/footer.html
index 6298681eb56..f13ac09604a 100644
--- a/tabbycat/templates/footer.html
+++ b/tabbycat/templates/footer.html
@@ -55,20 +55,20 @@ <h6>{% blocktrans trimmed %}Need ballots?{% endblocktrans %}</h6>
             <a class="nav-link " href="https://github.com/czlee/tabbycat/"><span class="glyphicon glyphicon-console"></span> {% trans "GitHub" %}</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link " href="http://tabbycat.readthedocs.io/en/latest/"><span class="glyphicon glyphicon-info-sign"></span> {% trans "Documentation" %}</a>
+            <a class="nav-link " href="http://tabbycat.readthedocs.io/en/stable/"><span class="glyphicon glyphicon-info-sign"></span> {% trans "Documentation" %}</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link " href="http://tabbycat.readthedocs.io/en/latest/about/support.html"><span class="glyphicon glyphicon-question-sign"></span> {% trans "Support" %}</a>
+            <a class="nav-link " href="http://tabbycat.readthedocs.io/en/stable/about/support.html"><span class="glyphicon glyphicon-question-sign"></span> {% trans "Support" %}</a>
           </li>
           <li class="nav-item">
             <a class="nav-link " href="https://www.facebook.com/groups/tabbycat.debate/"><span class="glyphicon glyphicon-user"></span> {% trans "Facebook Group" %}</a>
           </li>
           <li class="nav-item">
-            <a class="nav-link " href="http://tabbycat.readthedocs.io/en/latest/install/heroku.html#installation-the-short-way"><span class="glyphicon glyphicon-open"></span> {% trans "Set Up A Copy" %}</a>
+            <a class="nav-link " href="http://tabbycat.readthedocs.io/en/stable/install/heroku.html#installation-the-short-way"><span class="glyphicon glyphicon-open"></span> {% trans "Set Up A Copy" %}</a>
           </li>
         </ul>
       </div>
     </div>
 
   </div>
-</div>
\ No newline at end of file
+</div>

From 62323b226870999f3561f924d2b2aded52bf1c25 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 20:53:37 -0800
Subject: [PATCH 18/35] Egyptian Mau -> Foldex

This should've been done for version 1.2.0!
---
 tabbycat/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabbycat/settings.py b/tabbycat/settings.py
index 57ccad70764..74b424618ff 100644
--- a/tabbycat/settings.py
+++ b/tabbycat/settings.py
@@ -24,7 +24,7 @@
 USE_I18N = True
 
 TABBYCAT_VERSION = '1.2.0'
-TABBYCAT_CODENAME = 'Egyptian Mau'
+TABBYCAT_CODENAME = 'Foldex'
 READTHEDOCS_VERSION = 'v1.2.0'
 
 LOCALE_PATHS = [

From ea2bc0154ab075d3e0aa2183755489c8607f8d58 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 23:42:54 -0800
Subject: [PATCH 19/35] Force text before concatenating strings

---
 tabbycat/tournaments/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tabbycat/tournaments/models.py b/tabbycat/tournaments/models.py
index 38ab82819aa..37d1f7d4f34 100644
--- a/tabbycat/tournaments/models.py
+++ b/tabbycat/tournaments/models.py
@@ -5,6 +5,7 @@
 from django.db.models import Count, Prefetch, Q
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+from django.utils.encoding import force_text
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 
@@ -273,7 +274,7 @@ def clean(self):
         # Draw type must be consistent with stage
         valid_draw_types = Round.VALID_DRAW_TYPES_BY_STAGE[self.stage]
         if self.draw_type not in valid_draw_types:
-            display_names = [name for value, name in Round.DRAW_CHOICES if value in valid_draw_types]
+            display_names = [force_text(name) for value, name in Round.DRAW_CHOICES if value in valid_draw_types]
             errors['draw_type'] = ValidationError(_("A round in the %(stage)s stage must have a "
                 "draw type that is one of: %(valid)s"), params={
                     'stage': self.get_stage_display().lower(),

From 7f96e2f3baedc2aa2dbaa4700d8361a19f5b6093 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sat, 18 Feb 2017 23:42:26 -0800
Subject: [PATCH 20/35] Fix bug causing availability index to crash in weird
 cases

---
 .../availability/templates/availability_index.html  | 13 +++++++++++++
 tabbycat/availability/views.py                      |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/tabbycat/availability/templates/availability_index.html b/tabbycat/availability/templates/availability_index.html
index df25d9e0fdb..d6fda79f175 100644
--- a/tabbycat/availability/templates/availability_index.html
+++ b/tabbycat/availability/templates/availability_index.html
@@ -189,6 +189,19 @@
     </div>
   {% endif %}
 
+  {% if error_type == 'bad_draw_type_for_break_round' %}
+    <div class="alert alert-danger">
+      This is an elimination round, but its draw type is
+      <strong>{{ round.get_draw_type_display|lower }}</strong>.
+      This combination isn't allowed — the draw type of elimination rounds must
+      be either <strong>first elimination</strong> (if it's the first
+      elimination round in its break category) or <strong>subsequent
+      elimination</strong>. Please
+      <a href="{% url 'admin:tournaments_round_change' round.id %}" class="alert-link">
+        change this round's draw type in the Edit Database area.</a>
+    </div>
+  {% endif %}
+
 {% endblock %}
 
 {% block content %}
diff --git a/tabbycat/availability/views.py b/tabbycat/availability/views.py
index 33463356579..c89897feaf6 100644
--- a/tabbycat/availability/views.py
+++ b/tabbycat/availability/views.py
@@ -83,6 +83,15 @@ def _get_breaking_teams_dict(self):
                 'message'   : '%s advancing teams are debating this round' % advancing_teams
             }
 
+        else: # this should never happen, but it did once...
+            self.error_type = 'bad_draw_type_for_break_round'
+            return {
+                'type' : 'Team',
+                'total': 0,
+                'in_now' : 0,
+                'message': "status unclear — see message above"
+            }
+
     def _get_dict(self, queryset_all):
         contenttype = ContentType.objects.get_for_model(queryset_all.model)
         availability_queryset = RoundAvailability.objects.filter(content_type=contenttype)

From 10415c3644555b365a9e72908c467b543569078b Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sun, 19 Feb 2017 22:30:02 +1100
Subject: [PATCH 21/35] Ensure the motions tab/standings page always shows all
 motions

---
 tabbycat/options/dynamic_preferences_registry.py | 4 ++--
 tabbycat/standings/views.py                      | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tabbycat/options/dynamic_preferences_registry.py b/tabbycat/options/dynamic_preferences_registry.py
index 95000797e28..0e5102ae620 100644
--- a/tabbycat/options/dynamic_preferences_registry.py
+++ b/tabbycat/options/dynamic_preferences_registry.py
@@ -483,7 +483,7 @@ class RepliesTabReleased(BooleanPreference):
 
 @tournament_preferences_registry.register
 class MotionTabReleased(BooleanPreference):
-    help_text = "Enables public display of the motions tab. Intended for use after the tournament."
+    help_text = "Enables public display of all motions and win/loss/selection information. This includes all motions — whether they have been marked as released or not. Intended for use after the tournament."
     verbose_name = "Release motions tab to public"
     section = tab_release
     name = "motion_tab_released"
@@ -645,7 +645,7 @@ class PublicResults(BooleanPreference):
 
 @tournament_preferences_registry.register
 class PublicMotions(BooleanPreference):
-    help_text = "Enables the public page showing released motions"
+    help_text = "Enables the public page showing motions that have been explicitly released to the public"
     verbose_name = "Enable public view of motions"
     section = public_features
     name = "public_motions"
diff --git a/tabbycat/standings/views.py b/tabbycat/standings/views.py
index 643e8217391..2d4972b2e5e 100644
--- a/tabbycat/standings/views.py
+++ b/tabbycat/standings/views.py
@@ -323,6 +323,10 @@ class BaseMotionStandingsView(BaseStandingsView):
     page_title = 'Motions Tab'
     page_emoji = '💭'
 
+    def get_rounds(self):
+        """Returns all of the rounds that should be included in the tab."""
+        return self.get_tournament().round_set.order_by('seq')
+
     def get_table(self):
         motions = motion_statistics.statistics(tournament=self.get_tournament(), rounds=self.get_rounds())
         table = TabbycatTableBuilder(view=self, sort_key="Order")

From cfc3a3362b0cef7831bdb7d11d152b7cc9f9aa57 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sun, 19 Feb 2017 12:06:24 -0800
Subject: [PATCH 22/35] Update CONTRIBUTING.rst

---
 CONTRIBUTING.rst | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 3a80d44ddd3..f3ca37aceb6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -62,14 +62,17 @@ You should then be able to preview the docs at `127.0.0.1:7999 <http://127.0.0.1
 Release Checklist
 =================
 
-1. Check that all migrations have been generated and committed into Git.
-2. Bump version numbers in ``docs/conf.py`` and ``tabbycat/settings.py``
-3. Update the main ``CHANGELOG.rst`` file
-4. Shift remaining issues from the Github Milestone
-5. Create and finish the release branch as per git-flow
-6. Ensure the tag is correct (``vX.Y.Z``) and published to Github
-7. Back-merge ``master`` to the ``kitten`` branch
-8. Back-merge ``develop`` to the in-progress feature branches
-9. Push ``master`` to the release pipeline repository
-10. Issue a formal release with change notes on Github
-11. Post change notes on the Facebook group
+1. Check that all migrations have been generated and committed into Git
+2. Bump version number in ``docs/conf.py``
+3. Bump version number and (if applicable) codename in ``tabbycat/settings.py``
+4. Update the main ``CHANGELOG.rst`` file
+5. Check that the last Travis CI build passed
+6. Check that ``deploy_heroku.py`` still works
+7. Shift remaining issues from the Github Milestone
+8. Create and finish the release branch as per git-flow
+9. Ensure the tag is correct (``vX.Y.Z``) and published to GitHub
+10. Back-merge ``master`` to the ``kitten`` branch
+11. Back-merge ``develop`` to the in-progress feature branches
+12. Push ``master`` to the release pipeline repository
+13. Issue a formal release with change notes on GitHub
+14. Post change notes on the Facebook group

From 1ed01d831402090cebeddd96efac21bb24811f96 Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sun, 19 Feb 2017 12:09:25 -0800
Subject: [PATCH 23/35] flake8

---
 tabbycat/options/dynamic_preferences_registry.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tabbycat/options/dynamic_preferences_registry.py b/tabbycat/options/dynamic_preferences_registry.py
index 0e5102ae620..383e666ade6 100644
--- a/tabbycat/options/dynamic_preferences_registry.py
+++ b/tabbycat/options/dynamic_preferences_registry.py
@@ -483,7 +483,9 @@ class RepliesTabReleased(BooleanPreference):
 
 @tournament_preferences_registry.register
 class MotionTabReleased(BooleanPreference):
-    help_text = "Enables public display of all motions and win/loss/selection information. This includes all motions — whether they have been marked as released or not. Intended for use after the tournament."
+    help_text = ("Enables public display of all motions and win/loss/selection information. "
+        "This includes all motions — whether they have been marked as released or not. "
+        "Intended for use after the tournament.")
     verbose_name = "Release motions tab to public"
     section = tab_release
     name = "motion_tab_released"

From 07da57af21cd8c1f2da3a7e10b906954cdcd4794 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Mon, 20 Feb 2017 11:32:55 +1100
Subject: [PATCH 24/35] Bump postgres

---
 .travis.yml          | 2 +-
 docs/install/osx.rst | 2 +-
 docs/install/wsl.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87defef3110..b70197293f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
   - "3.5"
   - "3.6"
 addons:
-  postgresql: "9.5"
+  postgresql: "9.6"
 services:
   - postgresql
 install:
diff --git a/docs/install/osx.rst b/docs/install/osx.rst
index 6bb18a1f7df..cd4aef5d33c 100644
--- a/docs/install/osx.rst
+++ b/docs/install/osx.rst
@@ -87,7 +87,7 @@ Download and run the `node.js Mac OS X Installer (.pkg) <https://nodejs.org/en/d
 
 3. In terminal type in::
 
-    $ PATH="/Applications/Postgres.app/Contents/Versions/9.5/bin:$PATH"
+    $ PATH="/Applications/Postgres.app/Contents/Versions/9.6/bin:$PATH"
 
 4. Install Tabbycat
 ================================================================================
diff --git a/docs/install/wsl.rst b/docs/install/wsl.rst
index fbe3fdda5ca..f89f8c07201 100644
--- a/docs/install/wsl.rst
+++ b/docs/install/wsl.rst
@@ -41,7 +41,7 @@ First, install `PostgreSQL for Windows <https://www.postgresql.org/download/wind
 .. parsed-literal::
 
   curl -sL https\:\/\/deb.nodesource.com/setup_5.x | sudo -E bash -    # add Node.js source repository
-  sudo apt-get install python3-dev python3-venv libpq-dev postgresql-client-9.5 nodejs
+  sudo apt-get install python3-dev python3-venv libpq-dev postgresql-client-9.6 nodejs
 
   # either
   wget https\:\/\/github.com/czlee/tabbycat/archive/|vrelease|.tar.gz

From 5a30bafc4d512598e4b33d9e393f0e7554cd574d Mon Sep 17 00:00:00 2001
From: Chuan-Zheng Lee <czlee@stanford.edu>
Date: Sun, 19 Feb 2017 21:17:31 -0800
Subject: [PATCH 25/35] docs: Slight brevity edits [skip ci]

---
 docs/install/heroku.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/install/heroku.rst b/docs/install/heroku.rst
index c8740abb41e..d4843b03938 100644
--- a/docs/install/heroku.rst
+++ b/docs/install/heroku.rst
@@ -59,9 +59,9 @@ If you want to :ref:`import tournament data <importing-initial-data>` from CSV f
 1. Install dependencies
 -----------------------
 
-- Install the `Heroku Command Line Interface (CLI) <https://devcenter.heroku.com/articles/heroku-cli>`_. Then open a command shell and log in using ``heroku login``.
+- Install the `Heroku Command Line Interface (CLI) <https://devcenter.heroku.com/articles/heroku-cli>`_, then log in with the command ``heroku login``.
 
-- Windows users need to install **Python**. Follow the instructions in (only!) :ref:`part 1(a) of our Windows instructions <install-python-windows>`.
+- Windows users need to install **Python**. Follow (only!) :ref:`part 1(a) of our Windows instructions <install-python-windows>`.
 
 - If you don't already have **Git**, follow the `instructions on the GitHub website <https://help.github.com/articles/set-up-git>`_ to set up Git.
 

From edaeb1679b5a53fbe0fb7f7b20b9c0ea75b8c218 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Tue, 21 Feb 2017 12:57:15 +1100
Subject: [PATCH 26/35] Bump version numbers and changelog

---
 CHANGELOG.rst        | 6 ++++++
 docs/conf.py         | 4 ++--
 tabbycat/settings.py | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 13e0c23b212..e1fe4a01bd6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,12 @@ Change Log
 ==========
 
 
+1.2.1
+-----
+
+- A number of minor bug fixes
+
+
 1.2.0 (Foldex)
 --------------
 
diff --git a/docs/conf.py b/docs/conf.py
index d9d0cfbc25c..506a5f797f5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,7 +50,7 @@
 
 # General information about the project.
 project = 'Tabbycat'
-copyright = '2016, Philip Belesky, Chuan-Zheng Lee'
+copyright = '2017, Philip Belesky, Chuan-Zheng Lee'
 author = 'Philip Belesky, Chuan-Zheng Lee'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -60,7 +60,7 @@
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.2.1'
 
 rst_epilog = """
 .. |vrelease| replace:: v{release}
diff --git a/tabbycat/settings.py b/tabbycat/settings.py
index 74b424618ff..a8bffb21803 100644
--- a/tabbycat/settings.py
+++ b/tabbycat/settings.py
@@ -23,9 +23,9 @@
 LANGUAGE_CODE = 'en'
 USE_I18N = True
 
-TABBYCAT_VERSION = '1.2.0'
+TABBYCAT_VERSION = '1.2.1'
 TABBYCAT_CODENAME = 'Foldex'
-READTHEDOCS_VERSION = 'v1.2.0'
+READTHEDOCS_VERSION = 'v1.2.1'
 
 LOCALE_PATHS = [
     os.path.join(BASE_DIR, 'locale'),

From 2eb6c6f7101cf704b11bd4c2fb8303fa321f6e9f Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Tue, 21 Feb 2017 18:26:51 +1100
Subject: [PATCH 27/35] Ensure public motion tab always shows all motions

---
 tabbycat/standings/views.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tabbycat/standings/views.py b/tabbycat/standings/views.py
index 2d4972b2e5e..19591f565cf 100644
--- a/tabbycat/standings/views.py
+++ b/tabbycat/standings/views.py
@@ -349,6 +349,10 @@ class MotionStandingsView(SuperuserRequiredMixin, BaseMotionStandingsView):
 class PublicMotionsTabView(PublicTabMixin, BaseMotionStandingsView):
     public_page_preference = 'motion_tab_released'
 
+    def get_rounds(self):
+        """Returns all of the rounds that should be included in the tab."""
+        return self.get_tournament().round_set.order_by('seq')
+
 
 # ==============================================================================
 # Current team standings (win-loss records only)

From b43cfe11dac94e3d952d7b058e2d5e9f081d4f92 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Tue, 21 Feb 2017 18:57:13 +1100
Subject: [PATCH 28/35] Fix feedback form printing to respect
 feedback_from_teams setting

---
 tabbycat/printing/views.py | 47 +++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/tabbycat/printing/views.py b/tabbycat/printing/views.py
index a17fba86af0..b2fb347caca 100644
--- a/tabbycat/printing/views.py
+++ b/tabbycat/printing/views.py
@@ -103,34 +103,49 @@ def construct_info(self, venue, source, source_p, target, target_p):
             'target': target.name, 'targetPosition': target_p
         }
 
+    def get_team_feedbacks(self, debate, team):
+        team_paths = self.get_tournament().pref('feedback_from_teams')
+        ballots = []
+
+        if team_paths == 'orallist':
+            target = debate.adjudicators.chair
+            ballots.append(self.construct_info(debate.venue, team, "Team",
+                                               target.adjudicator, ""))
+        elif team_paths == 'all-adjs':
+            for target in debate.debateadjudicator_set.all():
+                ballots.append(self.construct_info(debate.venue, team, "Team",
+                                                   target.adjudicator, ""))
+
+        return ballots
+
+    def get_adj_feedbacks(self, debate):
+        adj_paths = self.get_tournament().pref('feedback_paths')
+        ballots = []
+
+        debateadjs = debate.debateadjudicator_set.all()
+        for debateadj in debateadjs:
+            sadj = debateadj.adjudicator
+            spos = debate.adjudicators.get_position(sadj)
+            targets = expected_feedback_targets(debateadj, feedback_paths=adj_paths, debate=debate)
+            for tadj, tpos in targets:
+                ballots.append(self.construct_info(debate.venue, sadj, spos, tadj, tpos))
+
+        return ballots
+
     def get_context_data(self, **kwargs):
         kwargs['questions'] = self.questions_json_dict()
         kwargs['ballots'] = []
 
-        feedback_paths_option = self.get_tournament().pref('feedback_paths')
         draw = self.get_round().debate_set_with_prefetches(ordering=(
             'venue__group__name', 'venue__name'))
 
         for debate in draw:
-            chair = debate.adjudicators.chair
-            if not chair:
-                continue
-
             if self.from_team():
                 for team in debate.teams:
-                    kwargs['ballots'].append(self.construct_info(
-                        debate.venue, team, "Team", chair, ""))
+                    kwargs['ballots'].extend(self.get_team_feedbacks(debate, team))
 
             if self.from_adj():
-                debateadjs = debate.debateadjudicator_set.all()
-                for debateadj in debateadjs:
-                    sadj = debateadj.adjudicator
-                    spos = debate.adjudicators.get_position(sadj)
-                    targets = expected_feedback_targets(debateadj, feedback_paths=feedback_paths_option,
-                            debate=debate)
-                    for tadj, tpos in targets:
-                        kwargs['ballots'].append(self.construct_info(
-                            debate.venue, sadj, spos, tadj, tpos))
+                kwargs['ballots'].extend(self.get_adj_feedbacks(debate))
 
         return super().get_context_data(**kwargs)
 

From ff406d8de7000397fc4c81512645267899194b10 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Tue, 21 Feb 2017 19:31:40 +1100
Subject: [PATCH 29/35] Add warnings when questions have not been set (but
 still show the forms)

---
 tabbycat/printing/views.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/tabbycat/printing/views.py b/tabbycat/printing/views.py
index b2fb347caca..8a4760295c9 100644
--- a/tabbycat/printing/views.py
+++ b/tabbycat/printing/views.py
@@ -1,5 +1,6 @@
 import json
 
+from django.contrib import messages
 from django.views.generic.base import TemplateView
 
 from adjfeedback.models import AdjudicatorFeedbackQuestion
@@ -69,11 +70,11 @@ class PrintFeedbackFormsView(RoundMixin, SuperuserRequiredMixin, TemplateView):
 
     template_name = 'feedback_list.html'
 
-    def from_team(self):
+    def has_team_questions(self):
         return AdjudicatorFeedbackQuestion.objects.filter(
             tournament=self.get_round().tournament, from_team=True).exists()
 
-    def from_adj(self):
+    def has_adj_questions(self):
         return AdjudicatorFeedbackQuestion.objects.filter(
             tournament=self.get_round().tournament, from_adj=True).exists()
 
@@ -139,13 +140,20 @@ def get_context_data(self, **kwargs):
         draw = self.get_round().debate_set_with_prefetches(ordering=(
             'venue__group__name', 'venue__name'))
 
+        if not self.has_team_questions():
+            messages.info(self.request, "No feedback questions have been added "
+                          " for teams on adjudicators. Check the documentation "
+                          " for information on how to add these.")
+        if not self.has_adj_questions():
+            messages.info(self.request, "No feedback questions have been added "
+                          " for adjudicators on adjudicators. Check the "
+                          "documentation for information on how to add these.")
+
         for debate in draw:
-            if self.from_team():
-                for team in debate.teams:
-                    kwargs['ballots'].extend(self.get_team_feedbacks(debate, team))
+            for team in debate.teams:
+                kwargs['ballots'].extend(self.get_team_feedbacks(debate, team))
 
-            if self.from_adj():
-                kwargs['ballots'].extend(self.get_adj_feedbacks(debate))
+            kwargs['ballots'].extend(self.get_adj_feedbacks(debate))
 
         return super().get_context_data(**kwargs)
 

From 8b7c62df093857fac792014e4c7d9cd5bae0e378 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Wed, 22 Feb 2017 20:40:20 +1100
Subject: [PATCH 30/35] Make sure alerts are not shown in print views

---
 tabbycat/printing/templates/printables_list.html | 2 +-
 tabbycat/templates/base.html                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tabbycat/printing/templates/printables_list.html b/tabbycat/printing/templates/printables_list.html
index aff3621d220..4e1b13912f5 100644
--- a/tabbycat/printing/templates/printables_list.html
+++ b/tabbycat/printing/templates/printables_list.html
@@ -6,7 +6,7 @@
 {% block body-class %}override-sidebar-offset{% endblock %}
 
 {% block page-alerts %}
-  <div class="alert alert-info db-hide">
+  <div class="alert alert-info">
     Use CTRL+P for printing or saving to PDF. Be sure to set the appropriate <strong>orientation</strong>, to turn off <strong>headers/footers</strong> and turn on <strong>background graphics</strong>. Works best in Safari or Firefox.</small>
   </div>
 {% endblock %}
diff --git a/tabbycat/templates/base.html b/tabbycat/templates/base.html
index 0eaad0c3817..29767acec96 100644
--- a/tabbycat/templates/base.html
+++ b/tabbycat/templates/base.html
@@ -70,7 +70,7 @@ <h3>
 
         <div class="row {% if 'admin/' in request.path and user.is_superuser %}nav-sidebar-offset{% endif %}">
           <div class="col-md-12">
-            <div class="form-inline messages" id="messages-container">
+            <div class="form-inline messages" id="messages-container db-hide">
               {% if messages %}
                 {% for message in messages %}
                   <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %} updated">

From f868d75206c20233f696b84ece196600d5143a6f Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Wed, 22 Feb 2017 20:49:12 +1100
Subject: [PATCH 31/35] Ensure Standings Overview only shows data from the
 current tournament

---
 .../standings/templates/standings_index.html  | 66 ++++++++++---------
 tabbycat/standings/views.py                   | 21 ++++--
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/tabbycat/standings/templates/standings_index.html b/tabbycat/standings/templates/standings_index.html
index c91403b5872..1814b6415f8 100644
--- a/tabbycat/standings/templates/standings_index.html
+++ b/tabbycat/standings/templates/standings_index.html
@@ -35,21 +35,21 @@ <h4 class="panel-title">Top Speaker Scores</h4>
         </ul>
       </div>
     </div>
-    <div class="{% if pref.motion_vetoes_enabled %}col-md-4{% else %}col-md-6{% endif %}">
+    {% if pref.motion_vetoes_enabled %}
+    <div class="col-md-4">
       <div class="panel panel-default">
         <!-- Default panel contents -->
         <div class="panel-heading">
-          <h4 class="panel-title">Top Debate Margins</h4>
+          <h4 class="panel-title">Most Popular Motions</h4>
         </div>
         <!-- List group -->
         <ul class="list-group">
-          {% if top_margins %}
-            {% for top_margin in top_margins %}
+          {% if top_motions %}
+            {% for top_motion in top_motions %}
               <li class="list-group-item">
-                {{ top_margin.debate_team.team.short_name }}  vs
-                {{ top_margin.debate_team.opponent.team.short_name }} in
-                {{ top_margin.debate_team.debate.round.abbreviation }}
-                <span class="badge pull-right">{{ top_margin.margin|floatformat }}</span>
+                {{ top_motion.reference }} in
+                {{ top_motion.round.abbreviation }}
+                <span class="badge pull-right">{{ top_motion.ballotsubmission__count }}</span>
               </li>
             {% endfor %}
           {% else %}
@@ -60,20 +60,22 @@ <h4 class="panel-title">Top Debate Margins</h4>
         </ul>
       </div>
     </div>
-    {% if pref.motion_vetoes_enabled %}
-    <div class="col-md-4">
+    {% endif %}
+    <div class="{% if pref.motion_vetoes_enabled %}col-md-4{% else %}col-md-6{% endif %}">
       <div class="panel panel-default">
         <!-- Default panel contents -->
         <div class="panel-heading">
-          <h4 class="panel-title">Most Popular Motions</h4>
+          <h4 class="panel-title">Top Debate Margins</h4>
         </div>
         <!-- List group -->
         <ul class="list-group">
-          {% if top_motions %}
-            {% for top_motion in top_motions %}
+          {% if top_margins %}
+            {% for top_margin in top_margins %}
               <li class="list-group-item">
-                {{ top_motion.reference }}
-                <span class="badge pull-right">{{ top_motion.ballotsubmission__count }}</span>
+                {{ top_margin.debate_team.team.short_name }}  vs
+                {{ top_margin.debate_team.opponent.team.short_name }} in
+                {{ top_margin.debate_team.debate.round.abbreviation }}
+                <span class="badge pull-right">{{ top_margin.margin|floatformat }}</span>
               </li>
             {% endfor %}
           {% else %}
@@ -84,7 +86,6 @@ <h4 class="panel-title">Most Popular Motions</h4>
         </ul>
       </div>
     </div>
-    {% endif %}
 
   </div>
   <div class="row">
@@ -113,21 +114,21 @@ <h4 class="panel-title">Bottom Speaker Scores</h4>
         </ul>
       </div>
     </div>
-    <div class="{% if pref.motion_vetoes_enabled %}col-md-4{% else %}col-md-6{% endif %}">
+    {% if pref.motion_vetoes_enabled %}
+    <div class="col-md-4">
       <div class="panel panel-default">
         <!-- Default panel contents -->
         <div class="panel-heading">
-          <h4 class="panel-title">Closest Debate Margins</h4>
+          <h4 class="panel-title">Least Popular Motions</h4>
         </div>
         <!-- List group -->
         <ul class="list-group">
-          {% if bottom_margins %}
-            {% for bottom_margin in bottom_margins %}
+          {% if bottom_motions %}
+            {% for bottom_motion in bottom_motions %}
               <li class="list-group-item">
-                {{ bottom_margin.debate_team.team.short_name }} vs
-                {{ bottom_margin.debate_team.opponent.team.short_name }} in
-                {{ bottom_margin.debate_team.debate.round.abbreviation }}
-                <span class="badge pull-right">{{ bottom_margin.margin|floatformat }}</span>
+                {{ bottom_motion.reference }} in
+                {{ bottom_motion.round.abbreviation }}
+                <span class="badge pull-right">{{ bottom_motion.ballotsubmission__count }}</span>
               </li>
             {% endfor %}
           {% else %}
@@ -138,20 +139,22 @@ <h4 class="panel-title">Closest Debate Margins</h4>
         </ul>
       </div>
     </div>
-    {% if pref.motion_vetoes_enabled %}
-    <div class="col-md-4">
+    {% endif %}
+    <div class="{% if pref.motion_vetoes_enabled %}col-md-4{% else %}col-md-6{% endif %}">
       <div class="panel panel-default">
         <!-- Default panel contents -->
         <div class="panel-heading">
-          <h4 class="panel-title">Least Popular Motions</h4>
+          <h4 class="panel-title">Closest Debate Margins</h4>
         </div>
         <!-- List group -->
         <ul class="list-group">
-          {% if bottom_motions %}
-            {% for bottom_motion in bottom_motions %}
+          {% if bottom_margins %}
+            {% for bottom_margin in bottom_margins %}
               <li class="list-group-item">
-                {{ bottom_motion.reference }}
-                <span class="badge pull-right">{{ bottom_motion.ballotsubmission__count }}</span>
+                {{ bottom_margin.debate_team.team.short_name }} vs
+                {{ bottom_margin.debate_team.opponent.team.short_name }} in
+                {{ bottom_margin.debate_team.debate.round.abbreviation }}
+                <span class="badge pull-right">{{ bottom_margin.margin|floatformat }}</span>
               </li>
             {% endfor %}
           {% else %}
@@ -162,6 +165,5 @@ <h4 class="panel-title">Least Popular Motions</h4>
         </ul>
       </div>
     </div>
-    {% endif %}
   </div>
 {% endblock %}
diff --git a/tabbycat/standings/views.py b/tabbycat/standings/views.py
index 19591f565cf..6a269d533c9 100644
--- a/tabbycat/standings/views.py
+++ b/tabbycat/standings/views.py
@@ -26,22 +26,29 @@ class StandingsIndexView(SuperuserRequiredMixin, RoundMixin, TemplateView):
     template_name = 'standings_index.html'
 
     def get_context_data(self, **kwargs):
+        t = self.get_tournament()
         round = self.get_round()
 
-        speaks = SpeakerScore.objects.filter(ballot_submission__confirmed=True).exclude(
-            position=round.tournament.REPLY_POSITION).select_related('debate_team__debate__round')
+        speaks = SpeakerScore.objects.filter(
+                    ballot_submission__confirmed=True,
+                    speaker__team__tournament=t).exclude(
+                    position=t.REPLY_POSITION).select_related(
+                    'debate_team__debate__round')
         kwargs["top_speaks"] = speaks.order_by('-score')[:10]
         kwargs["bottom_speaks"] = speaks.order_by('score')[:10]
 
         margins = TeamScore.objects.filter(
-            ballot_submission__confirmed=True, margin__gte=0).select_related(
-            'debate_team__team', 'debate_team__debate__round',
-            'debate_team__team__institution')
+                    ballot_submission__confirmed=True,
+                    debate_team__team__tournament=t,
+                    margin__gte=0).select_related(
+                    'debate_team__team', 'debate_team__debate__round',
+                    'debate_team__team__institution')
         kwargs["top_margins"] = margins.order_by('-margin')[:10]
         kwargs["bottom_margins"] = margins.order_by('margin')[:10]
 
-        motions = Motion.objects.filter(round__seq__lte=round.seq).annotate(
-            Count('ballotsubmission'))
+        motions = Motion.objects.filter(
+                    round__seq__lte=round.seq, round__tournament=t).annotate(
+                    Count('ballotsubmission'))
         kwargs["top_motions"] = motions.order_by('-ballotsubmission__count')[:10]
         kwargs["bottom_motions"] = motions.order_by('ballotsubmission__count')[:10]
 

From 7eb9a7a7056c92acb448b3000ea6ea22f7b77dd5 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Wed, 22 Feb 2017 22:05:53 +1100
Subject: [PATCH 32/35] Add some extra filters to the database area

---
 tabbycat/motions/admin.py      | 2 +-
 tabbycat/participants/admin.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tabbycat/motions/admin.py b/tabbycat/motions/admin.py
index c7a7932fd72..996b792967b 100644
--- a/tabbycat/motions/admin.py
+++ b/tabbycat/motions/admin.py
@@ -11,7 +11,7 @@
 
 class MotionAdmin(TabbycatModelAdminFieldsMixin, admin.ModelAdmin):
     list_display = ('reference', 'round', 'seq', 'get_tournament')
-    list_filter = ('round', 'divisions')
+    list_filter = ('round__tournament', 'round', 'divisions')
 
 admin.site.register(Motion, MotionAdmin)
 
diff --git a/tabbycat/participants/admin.py b/tabbycat/participants/admin.py
index 1150f144838..8bb02d4cf09 100644
--- a/tabbycat/participants/admin.py
+++ b/tabbycat/participants/admin.py
@@ -38,6 +38,7 @@ class InstitutionAdmin(admin.ModelAdmin):
 # ==============================================================================
 
 class SpeakerAdmin(admin.ModelAdmin):
+    list_filter = ('team__tournament',)
     list_display = ('name', 'team', 'novice', 'gender')
     search_fields = ('name', )
     raw_id_fields = ('team', )

From 0bf87c879715d62206867894b7cbdbe341a238f2 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 25 Feb 2017 12:55:27 +1100
Subject: [PATCH 33/35] Add default numeric scale to printable feedback forms

---
 tabbycat/adjfeedback/models.py                | 11 +++-
 .../adjfeedback/templates/add_feedback.html   |  2 +
 tabbycat/printing/views.py                    | 55 ++++++++++++-------
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/tabbycat/adjfeedback/models.py b/tabbycat/adjfeedback/models.py
index b34686f7fe6..1b38534d4b1 100644
--- a/tabbycat/adjfeedback/models.py
+++ b/tabbycat/adjfeedback/models.py
@@ -138,8 +138,15 @@ def choices_for_field(self):
 
     @property
     def choices_for_number_scale(self):
-        step = max((int(self.max_value) - int(self.min_value)) / 10, 1)
-        options = list(range(int(self.min_value), int(self.max_value + 1), int(step)))
+        return self.construct_number_scale(self.min_value, self.max_value)
+
+    def construct_number_scale(self, min_value, max_value):
+        print(min_value, max_value)
+        """Used to build up a semi-intelligent range of options for numeric scales.
+        Shifted here rather than the class so it can be more easily used to
+        construct the default values for printed forms."""
+        step = max((int(max_value) - int(min_value)) / 10, 1)
+        options = list(range(int(min_value), int(max_value + 1), int(step)))
         return options
 
 
diff --git a/tabbycat/adjfeedback/templates/add_feedback.html b/tabbycat/adjfeedback/templates/add_feedback.html
index 66e8389c2ff..7c8fadb4157 100644
--- a/tabbycat/adjfeedback/templates/add_feedback.html
+++ b/tabbycat/adjfeedback/templates/add_feedback.html
@@ -5,6 +5,8 @@
 {% block head-title %}Who is the feedback from?{% endblock %}
 {% block page-title %}Enter Feedback{% endblock %}
 
+{% block page-subnav-actions %}{% endblock %}
+
 {% block content %}
 <div class="row">
   <div class="col-md-6">
diff --git a/tabbycat/printing/views.py b/tabbycat/printing/views.py
index 8a4760295c9..8004c9f8ee2 100644
--- a/tabbycat/printing/views.py
+++ b/tabbycat/printing/views.py
@@ -78,21 +78,36 @@ def has_adj_questions(self):
         return AdjudicatorFeedbackQuestion.objects.filter(
             tournament=self.get_round().tournament, from_adj=True).exists()
 
+    def question_to_json(self, question):
+        qdict = {
+            'text': question.text,
+            'seq': question.seq,
+            'type': question.answer_type,
+            'required': json.dumps(question.answer_type),
+            'from_team': json.dumps(question.from_team),
+            'from_adj': json.dumps(question.from_adj),
+        }
+        if question.choices:
+            qdict['choice_options'] = question.choices.split(AdjudicatorFeedbackQuestion.CHOICE_SEPARATOR)
+        elif question.min_value is not None and question.max_value is not None:
+            qdict['choice_options'] = question.choices_for_number_scale
+        return qdict
+
+    def add_default_scale(self):
+        default_scale_question = AdjudicatorFeedbackQuestion(
+            text='Overall Score', seq=0,
+            answer_type=AdjudicatorFeedbackQuestion.ANSWER_TYPE_INTEGER_SCALE,
+            required=True, from_team=True, from_adj=True,
+            min_value=self.get_tournament().pref('adj_min_score'),
+            max_value=self.get_tournament().pref('adj_max_score')
+        )
+        return self.question_to_json(default_scale_question)
+
     def questions_json_dict(self):
-        questions = []
-        for q in self.get_round().tournament.adj_feedback_questions:
-            q_set = {
-                'text': q.text, 'seq': q.seq, 'type': q.answer_type,
-                'required': json.dumps(q.answer_type),
-                'from_team': json.dumps(q.from_team),
-                'from_adj': json.dumps(q.from_adj),
-            }
-            if q.choices:
-                q_set['choice_options'] = q.choices.split(AdjudicatorFeedbackQuestion.CHOICE_SEPARATOR)
-            elif q.min_value is not None and q.max_value is not None:
-                q_set['choice_options'] = q.choices_for_number_scale
+        questions = [self.add_default_scale()]
+        for question in self.get_round().tournament.adj_feedback_questions:
+            questions.append(self.question_to_json(question))
 
-            questions.append(q_set)
         return questions
 
     def construct_info(self, venue, source, source_p, target, target_p):
@@ -140,14 +155,16 @@ def get_context_data(self, **kwargs):
         draw = self.get_round().debate_set_with_prefetches(ordering=(
             'venue__group__name', 'venue__name'))
 
+        message = ""
         if not self.has_team_questions():
-            messages.info(self.request, "No feedback questions have been added "
-                          " for teams on adjudicators. Check the documentation "
-                          " for information on how to add these.")
+            message += "No feedback questions have been added " + \
+                       "for teams on adjudicators."
         if not self.has_adj_questions():
-            messages.info(self.request, "No feedback questions have been added "
-                          " for adjudicators on adjudicators. Check the "
-                          "documentation for information on how to add these.")
+            message += "No feedback questions have been added " + \
+                       "for adjudicators on adjudicators. "
+        if message is not "":
+            messages.warning(self.request, message + "Check the " +
+                "documentation for information on how to add these.")
 
         for debate in draw:
             for team in debate.teams:

From 2c0ccf717b87f3d7ac395fe9b9e973259634dfcc Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 25 Feb 2017 13:06:49 +1100
Subject: [PATCH 34/35] Also include the feedback form's default 'help' text in
 the printable forms

---
 tabbycat/printing/views.py                    | 23 +++++++++++++++----
 .../js-vue/printables/FeedbackQuestion.vue    | 10 ++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/tabbycat/printing/views.py b/tabbycat/printing/views.py
index 8004c9f8ee2..ac840dca54e 100644
--- a/tabbycat/printing/views.py
+++ b/tabbycat/printing/views.py
@@ -93,18 +93,31 @@ def question_to_json(self, question):
             qdict['choice_options'] = question.choices_for_number_scale
         return qdict
 
-    def add_default_scale(self):
+    def add_defaults(self):
+        t = self.get_tournament()
+        default_questions = []
+
+        if t.pref('feedback_introduction'):
+            default_scale_info = AdjudicatorFeedbackQuestion(
+                text=t.pref('feedback_introduction'), seq=0,
+                answer_type='comment', # Custom type just for print display
+                required=True, from_team=True, from_adj=True
+            )
+            default_questions.append(self.question_to_json(default_scale_info))
+
         default_scale_question = AdjudicatorFeedbackQuestion(
             text='Overall Score', seq=0,
             answer_type=AdjudicatorFeedbackQuestion.ANSWER_TYPE_INTEGER_SCALE,
             required=True, from_team=True, from_adj=True,
-            min_value=self.get_tournament().pref('adj_min_score'),
-            max_value=self.get_tournament().pref('adj_max_score')
+            min_value=t.pref('adj_min_score'),
+            max_value=t.pref('adj_max_score')
         )
-        return self.question_to_json(default_scale_question)
+        default_questions.append(self.question_to_json(default_scale_question))
+
+        return default_questions
 
     def questions_json_dict(self):
-        questions = [self.add_default_scale()]
+        questions = self.add_defaults()
         for question in self.get_round().tournament.adj_feedback_questions:
             questions.append(self.question_to_json(question))
 
diff --git a/tabbycat/templates/js-vue/printables/FeedbackQuestion.vue b/tabbycat/templates/js-vue/printables/FeedbackQuestion.vue
index 56fbd470178..e35fecc019b 100644
--- a/tabbycat/templates/js-vue/printables/FeedbackQuestion.vue
+++ b/tabbycat/templates/js-vue/printables/FeedbackQuestion.vue
@@ -74,6 +74,16 @@
     </section>
   </template>
 
+  <template v-if="question.type === 'comment'">
+    <section class="db-margins-m db-bordered db-flex-row db-flex-item-1">
+      <div class="db-padding-horizontal db-flex-item-1 db-flex-row">
+        <div class="db-align-vertical-center db-padding-horizontal db-flex-item db-vertical-center-text">
+          <em>{{ question.text }}</em>
+        </div>
+      </div>
+    </section>
+  </template>
+
 </template>
 
 <script>

From 6f4e16cdee62261fffdcbcc72947816744e3ab8c Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sat, 25 Feb 2017 13:15:53 +1100
Subject: [PATCH 35/35] Finalise changelog

---
 CHANGELOG.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b47e7fc7d66..c43fb72b2b8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,8 +5,10 @@ Change Log
 
 1.2.1
 -----
+*Release date: 25 February 2017*
 
-- A number of minor bug fixes
+- Printable feedback forms will now display the default rating scale, any configured introduction text, and better prompt you to add additional questions
+- A number of other minor bug fixes
 
 
 1.2.0 (Foldex)