From bda342b05b656a1a6407423a3392305dcb44de7f Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan.tuomi@eficode.com>
Date: Mon, 28 Jan 2019 21:39:30 +0200
Subject: [PATCH 1/5] Add gunicorn to production requirements

---
 requirements.production.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.production.txt b/requirements.production.txt
index 496884e..aaa5468 100644
--- a/requirements.production.txt
+++ b/requirements.production.txt
@@ -1 +1,2 @@
 uWSGI==2.0.14
+gunicorn==19.9.0

From 95c29d85286d300aee2767a448579cd739d5e119 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan.tuomi@eficode.com>
Date: Mon, 28 Jan 2019 21:39:45 +0200
Subject: [PATCH 2/5] Increase JWT expiration time to 1 week

---
 sikweb/base.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sikweb/base.py b/sikweb/base.py
index 1619797..8f1ffe6 100644
--- a/sikweb/base.py
+++ b/sikweb/base.py
@@ -1,5 +1,6 @@
 import os
 import logging
+import datetime
 from os.path import expanduser
 from django.utils.translation import ugettext_lazy as _
 
@@ -315,3 +316,5 @@ SUIT_CONFIG = {
     # misc
     # 'LIST_PER_PAGE': 15
 }
+
+JWT_EXPIRATION_DELTA = datetime.timedelta(days=7)
\ No newline at end of file

From 95e028d546cec621a8c0f5e6e8e1b1181342a833 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Tue, 29 Jan 2019 12:53:26 +0200
Subject: [PATCH 3/5] Revert "Remove underscore.js"

This reverts commit 50268b98a9f65fc95d6c292610d9be56b69f22ec.
---
 infoscreen/templates/base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/infoscreen/templates/base.html b/infoscreen/templates/base.html
index 5562bfc..c4c3c70 100644
--- a/infoscreen/templates/base.html
+++ b/infoscreen/templates/base.html
@@ -17,6 +17,7 @@
         <script src="{% static "js/lib/angular.js" %}"></script>
         <script src="{% static "js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js" %}"></script>
         <script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
+        <script src="{% static "js/lib/underscore-min.js" %}"></script>
         <script src="{% static "js/lib/moment.js" %}"></script>
         <script src="{% static "js/lib/angular-route.js" %}"></script>
         <script src="{% static "js/lib/angular-animate.js" %}"></script>

From 005d34daf5c3c77110a810d00cc93e5ab2a9bbba Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Tue, 29 Jan 2019 13:35:59 +0200
Subject: [PATCH 4/5] Add EOF blank line base.py

---
 sikweb/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sikweb/base.py b/sikweb/base.py
index 8f1ffe6..9987d68 100644
--- a/sikweb/base.py
+++ b/sikweb/base.py
@@ -317,4 +317,4 @@ SUIT_CONFIG = {
     # 'LIST_PER_PAGE': 15
 }
 
-JWT_EXPIRATION_DELTA = datetime.timedelta(days=7)
\ No newline at end of file
+JWT_EXPIRATION_DELTA = datetime.timedelta(days=7)

From 061c9c8483fb887a7ff11a6b20574a09aa91b86b Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Mon, 4 Feb 2019 18:24:49 +0200
Subject: [PATCH 5/5] Fix Ohlhafv email date

---
 ohlhafv/templates/email.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ohlhafv/templates/email.html b/ohlhafv/templates/email.html
index ad6d6ca..7ee88e5 100644
--- a/ohlhafv/templates/email.html
+++ b/ohlhafv/templates/email.html
@@ -5,6 +5,6 @@
 
 {{ challenge.message }}
 
-{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 15.2" %}.
+{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 14.2" %}.
 
 {% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}
\ No newline at end of file