Merge branch 'master' into development

README.md

@@ -2,7 +2,7 @@
 [![Coverage Status](https://coveralls.io/repos/github/dlareau/puzzlehunt_server/badge.svg)](https://coveralls.io/github/dlareau/puzzlehunt_server)
 
 # puzzlehunt_server
-A server for running puzzlehunts. This project is mainly used by PuzzlehuntCMU to run their puzzlehunt, but is generic enough to be used for nearly any puzzlehunt. Includes basic features such as per-puzzle pages, automatic answer response, teams, customizable unlocking structure, and admin pages to manange submissions, teams, as well as hunt progress. It also includes automatic team creation from registration, privacy settings for hunts, cool charts, a built in chat, and automatic file fetching and hosting.
+A server for running puzzle hunts. This project is mainly used by Puzzlehunt CMU to run their puzzlehunt, but is generic enough to be used for nearly any puzzle hunt. Includes basic features such as per-puzzle pages, automatic answer response, teams, customizable unlocking structure, and admin pages to manange submissions, teams, as well as hunt progress. It also includes automatic team creation from registration, privacy settings for hunts, cool charts, a built in chat, and automatic file fetching and hosting.
 
 Documentation can be found at http://docs.puzzlehunt.club
 

docs/hunt_creation.rst

@@ -3,7 +3,7 @@ How to Create a Hunt
 
 .. contents:: Table of Contents
 
-This is a guide describing how to set up a new puzzlehunt on the PuzzlehuntCMU
+This is a guide describing how to set up a new puzzlehunt on the Puzzle Hunt CMU
 server. This guide assumes that the server itself is already set up and that you
 already have an account on the server with both "Staff" and "Superuser"
 permissions.

docs/index.rst

@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to PuzzlehuntCMU's Server documentation!
+Welcome to Puzzle Hunt CMU's Server documentation!
 ================================================
 
 If you're here as a user, start with the "How to Create a Hunt" and "How to Run

huntserver/templates/hunt_base.html

@@ -39,7 +39,7 @@
 <div class="container" >
   <div class="row" >
     <div class="content col-md-12" style="padding: 10px;">
-   	  <p>This is an archived Puzzlehunt. All parts may not work properly. We apologize for any issues you encounter.</p>
+   	  <p>This is an archived puzzle hunt. All parts may not work properly. We apologize for any issues you encounter.</p>
     </div>
   </div>
 </div>

huntserver/templates/index.html

@@ -46,15 +46,15 @@
   <div id='qa'>
     <h2>Who are we?</h2>
     <p>
-      We are PuzzlehuntCMU, a group of puzzle enthusiasts from Carnegie Mellon University. We work together to solve Puzzle Hunts such as the <a href="http://www.mit.edu/~puzzle/">MIT mystery hunt</a>, or any of the many tech company puzzlehunts (examples of such companies include Microsoft, APT and Palantir). We also write and host CMU's very own Puzzlehunt once a semester, with the goal of providing a fun-filled experience to as many members of the community as possible.
+      We are Puzzle Hunt CMU, a group of puzzle enthusiasts from Carnegie Mellon University. We work together to solve Puzzle Hunts such as the <a href="http://www.mit.edu/~puzzle/">MIT mystery hunt</a>, or any of the many tech company puzzle hunts (examples of such companies include Microsoft, APT and Palantir). We also write and host CMU's very own puzzle hunt once a semester, with the goal of providing a fun-filled experience to as many members of the community as possible.
     </p>
-    <h2>What is a Puzzlehunt?</h2>
+    <h2>What is a puzzle hunt?</h2>
     <p>
       Very simply put, it's an event where people get together to solve carefully designed puzzles which somehow link together on a larger scale.
       <br>
-      A puzzlehunt is typically characterized by its structure. In addition to several normal puzzles, each round has a meta-puzzle, which requires teams to have solved most of the normal puzzles to even unlock, and often requires solvers to incorporate answers from that round's normal puzzles to make sense of.
+      A puzzle hunt is typically characterized by its structure. In addition to several normal puzzles, each round has a meta-puzzle, which requires teams to have solved most of the normal puzzles to even unlock, and often requires solvers to incorporate answers from that round's normal puzzles to make sense of.
       <br>
-      Our puzzlehunt's structure changes from semester to semester so as to provide new challenges for solvers.
+      Our puzzle hunt's structure changes from semester to semester so as to provide new challenges for solvers.
     </p>
     <h2>Wait that sounds cool, can I participate?</h2>
     <p>Yeah, check out our <a href="{% url 'huntserver:current_hunt_info' %}">current hunt page</a>!</p>

huntserver/templates/login_selection.html

@@ -43,7 +43,7 @@ <h3> Forgot your password? </h3>
       <hr style="border-width:2px; border-color: black;">
       <p>
         If you are using a university account, please use their services to reset your password.
-	      If you are using a PuzzlehuntCMU account, you can <a href="{% url 'password_reset' %}">reset your password here.</a>
+	      If you are using a Puzzle Hunt CMU account, you can <a href="{% url 'password_reset' %}">reset your password here.</a>
       </p>
     </div>
   </div>

huntserver/templates/previous_hunts.html

@@ -21,6 +21,9 @@ <h4>
       <li>
         {{ hunt.display_start_date|date:" m/d/y " }} 
         {{ hunt.display_start_date|time:"P" }} - 
+        {% if hunt.display_start_date != hunt.display_end_date %}
+        {{ hunt.display_end_date|date:" m/d/y " }}
+        {% endif %}
         {{ hunt.display_end_date|time:"P" }}
       </li>
       <li>{{hunt.puzzle_set.all|length}} Puzzles</li>

huntserver/templates/registration/login.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div class="container">
   <div class="row content">
-    <p>Please enter your puzzlehunt username and password:<p>
+    <p>Please enter your Puzzle Hunt CMU username and password:<p>
     <form method="post" action="/accounts/login/">
       {% csrf_token %}
       {{ form|crispy }}

huntserver/templates/shib_register.html

@@ -2,7 +2,7 @@
 
 {% block content %}
 <div class="container">
-<h2>Register for PuzzlehuntCMU</h2>
+<h2>Register for Puzzle Hunt CMU</h2>
 {% if user_form.subject.errors %}
     <ol>
     {% for error in user_form.subject.errors %}
@@ -20,7 +20,7 @@ <h2>Register for PuzzlehuntCMU</h2>
 <form method="POST" action="/shib/login">
   {% csrf_token %}
   <div>
-    <p>By continuing, you agree to release the following attributes to PuzzlehuntCMU:</p>
+    <p>By continuing, you agree to release the following attributes to Puzzle Hunt CMU:</p>
     {{ user_form.as_p }}
     {{ person_form.as_p }}
   </div>

puzzlehunt_server/templates/registration/password_reset_email.html

@@ -1,6 +1,6 @@
 {% autoescape off %}
 
-We have recieved a password reset request for the user: {{ user.get_username }}
+We have received a password reset request for the user: {{ user.get_username }}
 
 If this is your account, and you have requested this password reset, you can
 click the link below to initiate the password reset process for your {{ site_name }} account:

puzzlehunt_server/templates/registration/password_reset_subject.txt

@@ -1 +1 @@
-PuzzlehuntCMU Password Reset
+Puzzle Hunt CMU Password Reset

requirements.txt

@@ -1,4 +1,4 @@
-Django==2.2.11
+Django==2.2.13
 decorator==4.1.2
 bootstrap-admin==0.4.*
 django-debug-toolbar==1.8