Merge changes from 1.5.4 (#952)

* Backport fix to issue #950 * Bump version and update changelog and release notes
2022-01-04 21:12:32 +01:00
parent 9be2519406
commit 52efbcc89f
2 changed files with 31 additions and 2 deletions
@@ -1,5 +1,24 @@
 # novelWriter Changelog
 ## Version 1.5.4 [2022-01-04]
 ### Release Notes
 This is a bugfix release that fixes an issues with rendering 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.
 ### Detailed Changelog
 **Bugfixes**
 * Fixed a bug where a greater or lesser than symbol would crash the html converter loop if the text
  block did not have a format with a 'NoneType is not iterable' error. Most blocks that are not
  plain text have the format set to 'None'. Issue #950, PR #951.
 ----
 ## Version 1.5.3 [2021-12-31]
 ### Release Notes
@@ -2,6 +2,18 @@
 <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 rendering 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>
@@ -11,8 +23,6 @@ changed to a scene item. The second fix changes how the Create Root Folder subme
 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>
 <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.2</h2>