From 85b9262b674bd4ae9be3421f247346d55ecbb25b Mon Sep 17 00:00:00 2001
From: plowsof <plowsof@lol.com>
Date: Sun, 28 Aug 2022 18:58:31 +0100
Subject: [PATCH] update roadmap

---
 _i18n/en.yml               | 10 ++++++++-
 resources/roadmap/index.md | 44 ++++++++++++++++++++++++--------------
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/_i18n/en.yml b/_i18n/en.yml
index aecb9e73..f386a37f 100644
--- a/_i18n/en.yml
+++ b/_i18n/en.yml
@@ -801,7 +801,15 @@ roadmap:
   p2pool: P2Pool released
   haveno: Haveno
 
-
+  ringsize-sera-tryp: increase ring size to >100
+  seraphis-jamtis: Seraphis & jamtis
+  ospead: OSPEAD
+  released-0-18: CLI and GUI 0.18 "Flourine Fermi" released
+  hardfork-v15: Network upgrade v15 Hardfork
+  xmr-eth-atomicswaps: Monero <-> Ethereum Atomic Swaps
+  bp++: Bulletproofs++
+  lws-subaddress: Light Wallet Server subaddress support
+   
 research-lab:
   intro: Monero is not only committed to making a fungible currency, but also to continued research into the realm of financial privacy as it involves cryptocurrencies. Below you'll find the work of our very own Monero Research Lab, with more papers to come.
   intro_email: "To contact the Monero Research Lab, please email lab@getmonero.org."
diff --git a/resources/roadmap/index.md b/resources/roadmap/index.md
index 5c21410c..d2551995 100644
--- a/resources/roadmap/index.md
+++ b/resources/roadmap/index.md
@@ -24,7 +24,7 @@ permalink: /resources/roadmap/index.html
                 <div class="tabPanel-widget">
                     <label for="tab-1" tabindex="0"></label>
                     <input id="tab-1" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2014-2016</h2>
+                    <h2>2014-2017</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2014</h2>
                             <ul>
@@ -58,11 +58,6 @@ permalink: /resources/roadmap/index.html
                                     <li class="completed"><a href="{{ site.baseurl_root }}/2016/12/14/monero-0.10.1-released.html" target="_blank" rel="noreferrer noopener">{% t roadmap.released-0-10-1 %}</a></li>
                                     <li class="completed"><a href="{{ site.baseurl_root }}/2016/12/22/monero-core-gui-beta-released.html" target="_blank" rel="noreferrer noopener">{% t roadmap.guibeta1 %}</a></li>
                             </ul>
-                    </div>
-                    <label for="tab-2" tabindex="0"></label>
-                    <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
-                    <h2>2017</h2>
-                    <div class="tabPanel-content info-block">
                         <h2>2017</h2>
                             <ul>
                                 <h3 class="months">{% t roadmap.jan %}</h3>
@@ -91,8 +86,8 @@ permalink: /resources/roadmap/index.html
                                     <li class="completed">{% t roadmap.multisig %}</li>
                             </ul>
                     </div>
-                    <label for="tab-3" tabindex="0"></label>
-                    <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
+                    <label for="tab-2" tabindex="0"></label>
+                    <input id="tab-2" type="radio" name="tabs" aria-hidden="true">
                     <h2>2018</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2018</h2>
@@ -132,8 +127,8 @@ permalink: /resources/roadmap/index.html
                                     <li class="completed">{% t roadmap.mms %}</li>
                             </ul>
                     </div>
-                    <label for="tab-4" tabindex="0"></label>
-                    <input id="tab-4" type="radio" name="tabs" aria-hidden="true">
+                    <label for="tab-3" tabindex="0"></label>
+                    <input id="tab-3" type="radio" name="tabs" aria-hidden="true">
                     <h2>2019</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2019</h2>
@@ -165,8 +160,8 @@ permalink: /resources/roadmap/index.html
                                     <li class="completed">{% t roadmap.randomx %}</li>
                             </ul>
                     </div>
-                    <label for="tab-5" tabindex="0"></label>
-                    <input id="tab-5" type="radio" name="tabs" aria-hidden="true">
+                    <label for="tab-4" tabindex="0"></label>
+                    <input id="tab-4" type="radio" name="tabs" aria-hidden="true">
                     <h2>2020</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2020</h2>
@@ -187,8 +182,8 @@ permalink: /resources/roadmap/index.html
                                     <li class="completed">{% t roadmap.released-0-17 %}</li>
                             </ul>
                     </div>
-                    <label for="tab-6" tabindex="0"></label>
-                    <input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
+                    <label for="tab-5" tabindex="0"></label>
+                    <input id="tab-5" type="radio" name="tabs" aria-hidden="true" checked>
                     <h2>2021</h2>
                     <div class="tabPanel-content info-block">
                         <h2>2021</h2>
@@ -196,11 +191,23 @@ permalink: /resources/roadmap/index.html
                                 <h3 class="months">{% t roadmap.feb %}</h3>
                                     <li class="completed">{% t roadmap.onionaddress %}</li>
                                 <h3 class="months">{% t roadmap.aug %}</h3>
-                                    <li class="completed">{% t roadmap.atomicswaps %}</li>
+                                    <li class="completed"><a href="{{ site.baseurl }}/2021/08/20/atomic-swaps.html">{% t roadmap.atomicswaps %}</a></li>
                                 <h3 class="months">{% t roadmap.oct %}</h3>
                                     <li class="completed"><a href="{{ site.baseurl }}/2021/10/05/p2pool-released.html">{% t roadmap.p2pool %}</a></li>
                             </ul>
                     </div>
+                    <label for="tab-6" tabindex="0"></label>
+                    <input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
+                    <h2>2022</h2>
+                    <div class="tabPanel-content info-block">
+                        <h2>2022</h2>
+                            <ul>
+                                <h3 class="months">{% t roadmap.jul %}</h3>
+                                    <li class="completed"><a href="{{ site.baseurl }}/2022/07/19/monero-0.18.0.0-released.html">{% t roadmap.released-0-18 %}</a></li>
+                                <h3 class="months">{% t roadmap.aug %}</h3>
+                                    <li class="completed"><a href="{{ site.baseurl }}/2022/04/20/network-upgrade-july-2022.html">{% t roadmap.hardfork-v15 %}</a></li>
+                            </ul>
+                    </div>
                     <label for="tab-7" tabindex="0"></label>
                     <input id="tab-7" type="radio" name="tabs" aria-hidden="true">
                     <h2>{% t roadmap.future %}</h2>
@@ -209,8 +216,13 @@ permalink: /resources/roadmap/index.html
                             <ul>
                                 <h3 class="months">{% t roadmap.comingsoon %}</h3>
                                     <li class="ongoing"><a href="https://haveno.exchange">{% t roadmap.haveno %}</a></li>
-                                    <li class="ongoing">{% t roadmap.bplus %}</li>
+                                    <li class="ongoing">{% t roadmap.seraphis-jamtis %}</li>
+                                    <li class="ongoing"><a href="https://github.com/Rucknium/OSPEAD">{% t roadmap.ospead %}</a></li>
+                                    <li class="ongoing">{% t roadmap.ringsize-sera-tryp %}</li>
                                     <li class="ongoing">{% t roadmap.tryptych %}</li>
+                                    <li class="ongoing">{% t roadmap.xmr-eth-atomicswaps %}</li>
+                                    <li class="ongoing">{% t roadmap.bp++ %}</li>
+                                    <li class="ongoing">{% t roadmap.lws-subaddress %}</li>
                                     <li class="upcoming">{% t roadmap.returnaddr %}</li>
                                     <li class="upcoming">{% t roadmap.layer2 %}</li>
                             </ul>