From 3d1d09f4041362518456c9535ee872d483a3da5c Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Mon, 11 Jan 2021 21:20:42 +0000
Subject: [PATCH] Release Preview with in-progress changelog

Former-commit-id: 9a129846f301db3da5b712338971331b23daeb0e [formerly 109a70c0ca1f8894fc17c10c39c6fb29905df69f [formerly 43e1a7051f4afd0ea989f60844dadad7c186036e]]
Former-commit-id: 5a2d9d15e6ac275e7bc2d9e882182ee0a315e06c
Former-commit-id: 4dcfe95d97af68882665225d911869fa39c227e2
---
 CHANGELOG.md     |  8 ++++++++
 pwabuilder-sw.js |  2 +-
 www/index.html   | 10 +++++-----
 www/js/init.js   |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7622098..45b469b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Release 1.1.4-dev (in progress)
+
+* ENHANCEMENT: Provide more robust upgrade process for PWAs
+* FIX: Disable HTTP cache when pre-caching upgraded app files
+* FIX: Switching to jQuery mode in the PWA app no longer prevents the app working offline
+* FIX: Display of masonry-style landing pages in SW mode
+* FIX: Inconsistent use of Settings Store during app initialization
+
 ## Release 1.1.3
 
 * UPDATE: Included ZIM updated to `wikipedia_en_100_maxi_2020-12.zim`
diff --git a/pwabuilder-sw.js b/pwabuilder-sw.js
index fbcc9d34..c78da6cb 100644
--- a/pwabuilder-sw.js
+++ b/pwabuilder-sw.js
@@ -4,7 +4,7 @@
 // App version number - ENSURE IT MATCHES VALUE IN init.js
 // DEV: Changing this will cause the browser to recognize that the Service Worker has changed, and it will download and
 // install a new copy
-const appVersion = '1.1.4-dev';
+const appVersion = '1.1.4-RP1';
 
 // Kiwix ZIM Archive Download Server in regex form
 // DEV: The server URL is defined in init.js, but is not available to us in SW
diff --git a/www/index.html b/www/index.html
index 63482c75..00107569 100644
--- a/www/index.html
+++ b/www/index.html
@@ -112,11 +112,11 @@
                     <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>Included ZIM updated to wikipedia_en_100_maxi_2020-12.zim (smaller size)</li>
-                            <li>Upgrade Settings Store</li>
-                            <li>Support new location of mobile and desktop styles in Wikimedia archives</li>
-                            <li>Enable use of Native File System in NWJS apps</li>
-                            <li>Fix styling of index-based landing pages</li>
+                            <li>Provide a more robust upgrade process for PWAs</li>
+                             <li>Disable HTTP cache when pre-caching upgraded app files</li>
+                             <li>Switching to jQuery mode in the PWA app no longer prevents app working offline</li>
+                             <li>Fix display of masonry-style landing pages in SW mode</li>
+                             <li>Fix inconsistent use of Settings Store during app initialization</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>
diff --git a/www/js/init.js b/www/js/init.js
index 8bf86a7e..97203ff4 100644
--- a/www/js/init.js
+++ b/www/js/init.js
@@ -49,7 +49,7 @@ var params = {};
  */
 var appstate = {};
 /******** UPDATE VERSION IN pwabuilder-sw.js TO MATCH VERSION *******/
-params['version'] = "1.1.4-dev"; //DEV: Manually update this version when there is a new release: it is compared to the Settings Store "version" in order to show first-time info, and the cookie is updated in app.js
+params['version'] = "1.1.4-RP1"; //DEV: Manually update this version when there is a new release: it is compared to the Settings Store "version" in order to show first-time info, and the cookie is updated in app.js
 /******* UPDATE THIS ^^^^^^ IN serveice worker!! ********************/
 params['packagedFile'] = "wikipedia_en_100_maxi.zim"; //For packaged Kiwix JS (e.g. with Wikivoyage file), set this to the filename (for split files, give the first chunk *.zimaa) and place file(s) in default storage
 params['archivePath'] = "archives"; //The directory containing the packaged archive(s) (relative to app's root directory)