From e86250b41e12c86c7c1fdf48164123aaff9d25da Mon Sep 17 00:00:00 2001
From: Miklos Sarosi <miklos.sarosi@gmail.com>
Date: Mon, 26 Oct 2020 20:50:50 +0000
Subject: [PATCH 1/2] Pull changes from upstream and update

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 0b3983f9..4e24bc0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ env.py
 settings.json
 .gitpod.yml
 venv/
-.idea/
\ No newline at end of file
+.idea/
+MYNOTES.md
\ No newline at end of file

From 9402f88adda3747f9e6ff47b09d52dacd13e0fdf Mon Sep 17 00:00:00 2001
From: Miklos Sarosi <miklos.sarosi@gmail.com>
Date: Wed, 8 Dec 2021 21:06:33 +0000
Subject: [PATCH 2/2] M26 Add condition to prevent participants to unenroll if
 hack_in_progress or further

---
 hackathon/templates/hackathon/includes/enrollstaff.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hackathon/templates/hackathon/includes/enrollstaff.html b/hackathon/templates/hackathon/includes/enrollstaff.html
index 0b6a5999..bc81203a 100644
--- a/hackathon/templates/hackathon/includes/enrollstaff.html
+++ b/hackathon/templates/hackathon/includes/enrollstaff.html
@@ -21,7 +21,7 @@
     {% csrf_token %}
     <input type="hidden" name="hackathon-id" value="{{ hackathon.id }}" />
     <button id="enroll-judge" type="submit" class="dropdown-item" 
-        {% if hackathon.status == 'finished' or hackathon.status == 'deleted' %}
+        {% if hackathon.status == 'finished' or hackathon.status == 'deleted' or hackathon.status == 'hack_in_progress' or hackathon.status == 'judging' %}
             disabled
         {% endif %}
     >