From 42e861fc2a9d476ade79c7b72d4a883d3c498d90 Mon Sep 17 00:00:00 2001
From: kwzrd <kwzrd@pythondiscord.com>
Date: Thu, 2 Apr 2020 18:08:13 +0200
Subject: Fix broken link to Game Jam banner

The asset was recently moved to a new directory.
---
 pydis_site/templates/home/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site')

diff --git a/pydis_site/templates/home/index.html b/pydis_site/templates/home/index.html
index bd713e55..c30cbee6 100644
--- a/pydis_site/templates/home/index.html
+++ b/pydis_site/templates/home/index.html
@@ -40,7 +40,7 @@
         {# Right column container #}
         <div class="column is-half-desktop">
           <a href="https://pythondiscord.com/pages/events/game-jam-2020/">
-            <img src="https://raw.githubusercontent.com/python-discord/branding/master/logos/logo_discord_banner/game%20jam%202020/game%20jam%202020%20-%20website%20banner.png">
+            <img src="https://raw.githubusercontent.com/python-discord/branding/master/events/game%20jam%202020/game%20jam%202020%20-%20website%20banner.png">
           </a>
         </div>
       </div>
-- 
cgit v1.2.3


From 0c1c59c0df9d7783e88482c8014a9f33f307cbd0 Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 20 Apr 2020 09:18:47 +0300
Subject: Added `news` to allowed bot setting names.

---
 pydis_site/apps/api/models/bot/bot_setting.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/models/bot/bot_setting.py b/pydis_site/apps/api/models/bot/bot_setting.py
index b1c3e47c..8d48eac7 100644
--- a/pydis_site/apps/api/models/bot/bot_setting.py
+++ b/pydis_site/apps/api/models/bot/bot_setting.py
@@ -9,6 +9,7 @@ def validate_bot_setting_name(name: str) -> None:
     """Raises a ValidationError if the given name is not a known setting."""
     known_settings = (
         'defcon',
+        'news',
     )
 
     if name not in known_settings:
-- 
cgit v1.2.3


From 36f9f1f1e116d37d28b6f049255d9c394da8097f Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Mon, 20 Apr 2020 09:55:40 +0300
Subject: Created migration fo Python News feature on bot

---
 .../api/migrations/0051_create_news_setting.py     | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 pydis_site/apps/api/migrations/0051_create_news_setting.py

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/migrations/0051_create_news_setting.py b/pydis_site/apps/api/migrations/0051_create_news_setting.py
new file mode 100644
index 00000000..3ba169c9
--- /dev/null
+++ b/pydis_site/apps/api/migrations/0051_create_news_setting.py
@@ -0,0 +1,26 @@
+from django.db import migrations
+
+
+def up(apps, schema_editor):
+    BotSetting = apps.get_model('api', 'BotSetting')
+    setting = BotSetting(
+        name='news',
+        data={}
+    ).save()
+
+
+def down(apps, schema_editor):
+    BotSetting = apps.get_model('api', 'BotSetting')
+    BotSetting.get(name='news').delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0050_remove_infractions_active_default_value'),
+    ]
+
+    operations = [
+        migrations.RunPython(up, down)
+    ]
+    
-- 
cgit v1.2.3


From 86538bba645e66caaef653ecdcef217e7ff1d39a Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 21 Apr 2020 08:49:47 +0300
Subject: Fixed migration 51 file end (`create_news_setting`)

---
 pydis_site/apps/api/migrations/0051_create_news_setting.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/migrations/0051_create_news_setting.py b/pydis_site/apps/api/migrations/0051_create_news_setting.py
index 3ba169c9..f8522e02 100644
--- a/pydis_site/apps/api/migrations/0051_create_news_setting.py
+++ b/pydis_site/apps/api/migrations/0051_create_news_setting.py
@@ -23,4 +23,3 @@ class Migration(migrations.Migration):
     operations = [
         migrations.RunPython(up, down)
     ]
-    
-- 
cgit v1.2.3


From 0dbc6e9165d188c55966eb267752eda42d274a0c Mon Sep 17 00:00:00 2001
From: ks129 <45097959+ks129@users.noreply.github.com>
Date: Tue, 21 Apr 2020 15:51:06 +0300
Subject: Fixed migration nr 51 `down` function object getting

---
 pydis_site/apps/api/migrations/0051_create_news_setting.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site')

diff --git a/pydis_site/apps/api/migrations/0051_create_news_setting.py b/pydis_site/apps/api/migrations/0051_create_news_setting.py
index f8522e02..f18fdfb1 100644
--- a/pydis_site/apps/api/migrations/0051_create_news_setting.py
+++ b/pydis_site/apps/api/migrations/0051_create_news_setting.py
@@ -11,7 +11,7 @@ def up(apps, schema_editor):
 
 def down(apps, schema_editor):
     BotSetting = apps.get_model('api', 'BotSetting')
-    BotSetting.get(name='news').delete()
+    BotSetting.objects.get(name='news').delete()
 
 
 class Migration(migrations.Migration):
-- 
cgit v1.2.3


From 2e6c22b996aa294e71adb699877b574df8a103ec Mon Sep 17 00:00:00 2001
From: Den4200 <dpham.42@hotmail.com>
Date: Tue, 12 May 2020 11:58:15 -0400
Subject: Update Game Jam from upcoming to most recent

---
 pydis_site/templates/base/navbar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pydis_site')

diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html
index 9b475189..d2ea9589 100644
--- a/pydis_site/templates/base/navbar.html
+++ b/pydis_site/templates/base/navbar.html
@@ -88,7 +88,7 @@
             <strong>Events</strong>
           </div>
           <a class="navbar-item" href="{% url 'wiki:get' path="events/game-jam-2020/" %}">
-            Upcoming: Game Jam 2020
+            Most Recent: Game Jam 2020
           </a>
           <a class="navbar-item" href="{% url 'wiki:get' path="events/" %}">
             All events
-- 
cgit v1.2.3