From cac347c3d6aaa7e43396a6d9dfbd1906c0551f8c Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sat, 6 Mar 2021 11:08:00 +0000
Subject: [PATCH] Changelogs for v1.2.3-WikiMed

# Conflicts:
#	CHANGELOG.md
#	www/index.html


Former-commit-id: 6b4c1814d2a87b764be69a4268e5e0893943e22e [formerly f7702205594434f4202ff13dc2a35d5296d42e24 [formerly 5a6c0d206bdbd5a2e9d6ce275da8a1fe35c8b8ce]]
Former-commit-id: 45283a5b04461f22d6a074764ab29e31991ed471
Former-commit-id: 6fe9c3e6272726f6b24957786ecdb13e3e6c47ea
---
 CHANGELOG.md   |  7 ++++++-
 www/index.html | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9123575..2dbd1a07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
-## Release 1.2.2
+## In-progress release 1.2.3
+
+* UPDATE: Better messaging around 'failure' to load SW mode (not a real failure)
+* FIX: Calculation of appRoot directory
+
+## Release 1.2.2
 
 * ENHANCEMENT: Use a list of customized start pages even if the app is generic 
 * FIX: Map markers not showing in Service Worker mode
diff --git a/www/index.html b/www/index.html
index 0f2196d5..6d49cab1 100644
--- a/www/index.html
+++ b/www/index.html
@@ -115,12 +115,12 @@
                     <div id="update" class="update">
                         <h3 style="margin-top:0;">Changes in version <span class="version">1.0</span></h3>
                         <ul style="padding-left: 15px;">
-                            <li>Use customized Start Pages if available</li>
-                            <li>Critical update to prevent race condition in switch to PWA</li>
-                            <li>Fix map markers not showing in SW mode</li>
-                            <li>Minor update to improve handover between local and PWA code</li>
-                            <li>Further implementation of Service Worker mode in UWP app (PC, not mobile)</li>
-                            <li>Fix display of masonry tiles in JQuery mode with latest ZIMs</li>
+                            <li>Use customized Start Pages if available</li>
+                            <li>Critical update to prevent race condition in switch to PWA</li>
+                            <li>Fix map markers not showing in SW mode</li>
+                            <li>Minor update to improve handover between local and PWA code</li>
+                            <li>Further implementation of Service Worker mode in UWP app (PC, not mobile)</li>
+                            <li>Fix display of masonry tiles in JQuery mode with latest ZIMs</li>
                         </ul>
                         <p><a href="https://github.com/kiwix/kiwix-js-windows/blob/master/CHANGELOG.md" target="_blank">Full changelog...<img src="I/s/Icon_External_Link.png"></a></p>
                     </div>