From 3c9a64cb365f85ac94d5a082a14b10ff7185ef11 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Thu, 21 Mar 2024 10:05:19 -0700
Subject: [PATCH 1/3] Make feed sorting better

---
 _board/espressif_esp32s3_box_lite.md | 2 +-
 feed.html                            | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_board/espressif_esp32s3_box_lite.md b/_board/espressif_esp32s3_box_lite.md
index 9f2dae7f0f..d654e80f98 100644
--- a/_board/espressif_esp32s3_box_lite.md
+++ b/_board/espressif_esp32s3_box_lite.md
@@ -7,7 +7,7 @@ manufacturer: "Espressif"
 board_url:
  - "https://www.adafruit.com/product/5511"
 board_image: "espressif_esp32s3_box_lite.jpg"
-date_added: 22-07-08
+date_added: 2022-7-08
 family: esp32s3
 features:
   - Wi-Fi
diff --git a/feed.html b/feed.html
index 5a369a1473..0b3c077222 100644
--- a/feed.html
+++ b/feed.html
@@ -8,7 +8,8 @@
 <link>{{ "/" | absolute_url }}</link>
 <description>A list of CircuitPython and Blinka supported boards</description>
 <lastBuildDate>{{ "now" | date_to_rfc822 }}</lastBuildDate>
-{% for board in site.board %}
+{% assign cp_boards = site.board | sort: 'date_added' | reverse %}
+{% for board in cp_boards %}
   {%- if board.downloads_display == false -%}
     {%- continue -%}
   {%- endif -%}
@@ -23,7 +24,8 @@
   </item>
   {%- endif -%}
 {% endfor %}
-{% for board in site.blinka %}
+{% assign blinka_boards = site.board | sort: 'date_added' | reverse %}
+{% for board in blinka_boards %}
     <item>
       <title>{{ board.name }}</title>
       <link>{{ board.url | absolute_url }}</link>

From 7549a55530c7cd93e867e80a921340efc78fc879 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 25 Mar 2024 14:19:02 -0700
Subject: [PATCH 2/3] Fix merge conflict

---
 _board/espressif_esp32s3_box_lite.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/_board/espressif_esp32s3_box_lite.md b/_board/espressif_esp32s3_box_lite.md
index b234a1a973..c64d8e4b4d 100644
--- a/_board/espressif_esp32s3_box_lite.md
+++ b/_board/espressif_esp32s3_box_lite.md
@@ -7,11 +7,7 @@ manufacturer: "Espressif"
 board_url:
  - "https://www.adafruit.com/product/5511"
 board_image: "espressif_esp32s3_box_lite.jpg"
-<<<<<<< HEAD
-date_added: 2022-7-08
-=======
 date_added: 2022-07-08
->>>>>>> 3d693274c3dcb32e2dfaf508f90b599667e5e843
 family: esp32s3
 features:
   - Wi-Fi

From 34e0397995f054085c2484f19eba7f314e1b6f05 Mon Sep 17 00:00:00 2001
From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 25 Mar 2024 14:35:16 -0700
Subject: [PATCH 3/3] Point to specific web installer release

---
 _layouts/download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_layouts/download.html b/_layouts/download.html
index d443694902..37bd349e8f 100644
--- a/_layouts/download.html
+++ b/_layouts/download.html
@@ -28,6 +28,6 @@ <h2>Contribute</h2>
 </div>
 
 {% if page.family == 'esp32' or page.family == 'esp32s2' or page.family == 'esp32c3' or page.family == 'esp32s3' %}
-<script src="https://cdn.jsdelivr.net/gh/adafruit/web-firmware-installer-js@latest/dist/cpinstaller.min.js" type="module"></script>
+<script src="https://cdn.jsdelivr.net/gh/adafruit/web-firmware-installer-js@1.1.2/dist/cpinstaller.min.js" type="module"></script>
 {% endif %}
 <script src="/assets/javascript/download.js"></script>