Bump version and update changelog and release notes

vkbo · Jan 5, 2022 · 5cb48de · 5cb48de
1 parent 97ee7b4
commit 5cb48de
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # novelWriter Changelog
 
+## Version 1.5.5 [2022-01-05]
+
+### Release Notes
+
+This is a bugfix release that fixes an issues with the backup tool crashing the app if the project
+path and backup path are on different drive locations. This issue only affects Windows.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed a bug with using the commonpath command in Python which will raise an error if the two
+  paths don't have a common root. This is particularly an issue on Windows where the paths can be
+  on different drives. The command was used in the project backup function, and has now been
+  replaced by a safer check. Issue #954.
+
+----
+
 ## Version 1.5.4 [2022-01-04]
 
 ### Release Notes

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -19,9 +19,9 @@
 author = "Veronica Berglyd Olsen"
 
 # The short X.Y version
-version = "1.5.4"
+version = "1.5.5"
 # The full version, including alpha/beta/rc tags
-release = "1.5.4"
+release = "1.5.5"
 
 # -- General Configuration ---------------------------------------------------
 

diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
@@ -61,9 +61,9 @@
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "[email protected]"
-__version__    = "1.5.4"
-__hexversion__ = "0x010504f0"
-__date__       = "2022-01-04"
+__version__    = "1.5.5"
+__hexversion__ = "0x010505f0"
+__date__       = "2022-01-05"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"

diff --git a/novelwriter/assets/text/release_notes.htm b/novelwriter/assets/text/release_notes.htm
@@ -2,51 +2,9 @@
 <html>
 <body>
 
-<h2>Release Notes for 1.5.4</h2>
-<p><i>Released on 4 January 2022</i></p>
-
-<p>This is a bugfix release that fixes an issues with renderring HTML from a document, either in
-the viewer or the build tool, when there is a greater or lesser than symbol in a text block that
-isn't a plain text paragraph, like for instance a comment or a heading. Any such document would
-fail to render.</p>
-
-<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
-
-<hr/>
-
-<h2>Release Notes for 1.5.3</h2>
-<p><i>Released on 31 December 2021</i></p>
-
-<p>This is a bugfix release that fixes two cosmetic issues. The first fix resolves and issue with
-the emphasis of partition or chapter items in the project tree not changing when the item is
-changed to a scene item. The second fix changes how the Create Root Folder submenu works. Instead
-of disabling the menu entries that are no longer available, they are instead removed. Disabled menu
-entries are not displayed correctly in all colour themes.</p>
-
-<hr/>
-
-<h2>Release Notes for 1.5.2</h2>
-<p><i>Released on 12 December 2021</i></p>
-
-<p>This is a bugfix release that fixes two issues. The first is an issue with an error in the HTML
-output if a paragraph has alignment or indentation tags while at the same time containing
-emphasised text. The second is an issue where the application cannot load a project with spell
-checking enabled if there is something wrong with the spell check package.</p>
-
-<hr/>
-
-<h2>Release Notes for 1.5.1</h2>
-<p><i>Released on 23 October 2021</i></p>
-
-<p>This is a bugfix release that fixes two issues. One related to the Project Details dialog
-missing its translated labels for non-English languages, and a fix concerning switching focus to
-the project tree when the Novel tab is visible. If the Novel tab is selected, the focus shift now
-correctly gives focus to the Novel tree.</p>
-
-<hr/>
-
 <h2>Release Notes for 1.5</h2>
 <p><i>Released on 19 September 2021</i></p>
+<p><b>Latest Patch is 1.5.5 from 5 January 2022</b></p>
 
 <p>This release reduces the number of document layouts from eight to two. The full list of changes
 is described in the "Novel Document Layouts" section below.</p>
@@ -117,5 +75,43 @@ <h4>Other Changes</h4>
 it is available, a "User Manual (PDF)" option should be visible in the Help menu. This should give
 you access to the documentation also when you don't have an active internet connection.</p>
 
+<p><i>See also the <a href="https://github.com/vkbo/novelWriter/releases">Releases</a> page.</i></p>
+
+<h2>Patch Notes</h2>
+
+<h3>Patch 1.5.1 &ndash; 23 October 2021</h3>
+
+<p>This is a bugfix release that fixes two issues. One related to the Project Details dialog
+missing its translated labels for non-English languages, and a fix concerning switching focus to
+the project tree when the Novel tab is visible. If the Novel tab is selected, the focus shift now
+correctly gives focus to the Novel tree.</p>
+
+<h3>Patch 1.5.2 &ndash; 12 December 2021</h3>
+
+<p>This is a bugfix release that fixes two issues. The first is an issue with an error in the HTML
+output if a paragraph has alignment or indentation tags while at the same time containing
+emphasised text. The second is an issue where the application cannot load a project with spell
+checking enabled if there is something wrong with the spell check package.</p>
+
+<h3>Patch 1.5.3 &ndash; 31 December 2021</h3>
+
+<p>This is a bugfix release that fixes two cosmetic issues. The first fix resolves and issue with
+the emphasis of partition or chapter items in the project tree not changing when the item is
+changed to a scene item. The second fix changes how the Create Root Folder submenu works. Instead
+of disabling the menu entries that are no longer available, they are instead removed. Disabled menu
+entries are not displayed correctly in all colour themes.</p>
+
+<h3>Patch 1.5.4 &ndash; 4 January 2022</h3>
+
+<p>This is a bugfix release that fixes an issues with renderring HTML from a document, either in
+the viewer or the build tool, when there is a greater or lesser than symbol in a text block that
+isn't a plain text paragraph, like for instance a comment or a heading. Any such document would
+fail to render.</p>
+
+<h3>Patch 1.5.5 &ndash; 5 January 2022</h3>
+
+<p>This is a bugfix release that fixes an issues with the backup tool crashing the app if the
+project path and backup path are on different drive locations. This issue only affects Windows.</p>
+
 </body>
 </html>
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.5.3" hexVersion="0x010503f0" fileVersion="1.3" timeStamp="2021-12-31 14:37:03">
+<novelWriterXML appVersion="1.5.5" hexVersion="0x010505f0" fileVersion="1.3" timeStamp="2022-01-05 16:03:30">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>1265</saveCount>
+    <saveCount>1267</saveCount>
     <autoCount>198</autoCount>
-    <editTime>62076</editTime>
+    <editTime>62543</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>