Merge branch 'master' into backoffice_invoice_scanning

src/camps/templates/bornhack-2016_camp_detail.html

@@ -11,7 +11,7 @@
 
     <div class="col-md-8 col-sm-8 text-container">
       <div class="lead">
-        <strong>Bornhack 2016</strong> was the first BornHack. It took place from <strong>August 27 to September 3rd 2016</strong> on the Danish island of Bornholm. The tagline of this event was <strong>Initial Commit</strong>.
+        <strong>BornHack 2016</strong> was the first BornHack. It took place from <strong>August 27 to September 3rd 2016</strong> on the Danish island of Bornholm. The tagline of this event was <strong>Initial Commit</strong>.
       </div>
     </div>
     <div class="col-md-4 col-sm-4 ">

src/camps/templates/bornhack-2017_camp_detail.html

@@ -27,7 +27,7 @@
         </div>
         <div class="col-md-9 col-sm-9 text-container">
             <div class="lead">
-                <strong>Bornhack 2017</strong> was the second BornHack. It will take place from <strong>August 22nd to August 29th 2017</strong> on the Danish island of Bornholm.
+                <strong>BornHack 2017</strong> was the second BornHack. It will take place from <strong>August 22nd to August 29th 2017</strong> on the Danish island of Bornholm.
             </div>
         </div>
 </div>

src/camps/templates/bornhack-2018_camp_detail.html

@@ -27,7 +27,7 @@
         </div>
         <div class="col-md-9 col-sm-9 text-container">
             <div class="lead">
-                <strong>Bornhack 2018</strong> was the third BornHack. It will take place from <strong>August 16th to August 23rd 2018</strong> on the Danish island of Bornholm.
+                <strong>BornHack 2018</strong> was the third BornHack. It will take place from <strong>August 16th to August 23rd 2018</strong> on the Danish island of Bornholm.
             </div>
         </div>
 </div>

src/camps/templates/bornhack-2019_camp_detail.html

@@ -35,7 +35,7 @@
         </div>
         <div class="col-md-9 col-sm-9 text-container">
             <div class="lead">
-                <strong>Bornhack 2019</strong> will be the fourth BornHack. It will take place from <strong>Thursday the 8th of August to Thursday the 15th of August 2019</strong> at a our new venue on the Danish island of Funen.
+                <strong>BornHack 2019</strong> will be the fourth BornHack. It will take place from <strong>Thursday the 8th of August to Thursday the 15th of August 2019</strong> at a our new venue on the Danish island of Funen.
             </div>
         </div>
 </div>

src/camps/templates/bornhack-2020_camp_detail.html

@@ -28,7 +28,7 @@
         </div>
         <div class="col-md-9 col-sm-9 text-container">
             <div class="lead">
-                <strong>Bornhack 2019</strong> will be the fourth BornHack. It will take place from <strong>Thursday the 8th of August to Thursday the 15th of August 2019</strong> at a our new venue on the Danish island of Funen.
+                <strong>BornHack 2019</strong> will be the fourth BornHack. It will take place from <strong>Thursday the 8th of August to Thursday the 15th of August 2019</strong> at a our new venue on the Danish island of Funen.
             </div>
         </div>
 </div>

src/camps/templates/bornhack-2021_camp_detail.html

@@ -28,7 +28,7 @@
         </div>
         <div class="col-md-9 col-sm-9 text-container">
             <div class="lead">
-                <strong>Bornhack 2019</strong> will be the fourth BornHack. It will take place from <strong>Thursday the 8th of August to Thursday the 15th of August 2019</strong> at a our new venue on the Danish island of Funen.
+                <strong>BornHack 2019</strong> will be the fourth BornHack. It will take place from <strong>Thursday the 8th of August to Thursday the 15th of August 2019</strong> at a our new venue on the Danish island of Funen.
             </div>
         </div>
 </div>

src/program/templates/emails/update_eventproposal.html

@@ -1,6 +1,6 @@
 Hello!<br>
 <br>
-Event "{{ proposal.name }}" for {{ proposal.camp }} was just updated!
+Event "{{ proposal.title }}" for {{ proposal.camp }} was just updated!
 <br>
 <br>
 More info <a href="https://bornhack.dk/admin/program/eventproposal/{{ proposal.uuid }}/change/">here</a>.

src/program/templates/emails/update_eventproposal.txt

@@ -1,6 +1,6 @@
 Hello!
 
-Event "{{ proposal.name }}" for {{ proposal.camp }} was just updated!
+Event "{{ proposal.title }}" for {{ proposal.camp }} was just updated!
 
 More info: https://bornhack.dk/admin/program/eventproposal/{{ proposal.uuid }}/change/
 

src/requirements/production.txt

@@ -3,7 +3,7 @@ channels==2.2.0
 channels-redis==2.3.2
 
 commonmark==0.9.0
-Pillow==6.0.0
+Pillow==6.1.0
 PyPDF2==1.26.0
 Unidecode==1.1.1
 asyncio==3.4.3
@@ -13,7 +13,7 @@ django-allauth==0.39.1
 django-allauth-2fa==0.6
 django-bleach==0.5.3
 django-bootstrap3==11.1.0
-django-extensions==2.1.9
+django-extensions==2.2.1
 django-wkhtmltopdf==3.2.0
 django-reversion==3.0.4
 django-betterforms==1.2