Merge branch 'main' into dev

2021-01-11 21:19:56 +01:00
parent 778adc2f39 b5631aa1df
commit beb425bbd0
12 changed files with 308 additions and 180 deletions
@@ -2,6 +2,22 @@
 <html>
 <body>

+<h2>Release Notes for 1.0.1</h2>
+<p><i>Released on 10 January 2021</i></p>
+<p>This release is mainly to bring the documentation up to date, as I forgot to update the install
+instructions in the original 1.0 release. I also forgot to change the various settings and help
+texts that describe novelWriter as under initial development (beta state).</p>
+<p>Some minor improvements have been made to the "Edit Project Item" dialog and some restrictions
+on the settings available for documents created in the "Outtakes" folder relaxed. A few minor
+issues with the document and project changed icons on the status bar have also been resolved. The
+indicators were previously set to changed status even if no actual change had been made to the
+project.</p>
+
+<p><i>The full changelog is available
+<a href="https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md">here</a>.</i></p>
+
+<hr/>
+
 <h2>Release Notes for 1.0</h2>
 <p><i>Released on 3 January 2021</i></p>
 <p>Based on my own testing and usage, and no serious bugs discovered in quite some time (aside from
@@ -27,9 +43,6 @@ suggestions to consider and implement. New ideas and suggestions are welcome. Ei
 requests in the issue tracker, or if not fully formed, can be discussed on the
 <a href="https://github.com/vkbo/novelWriter/discussions">discussions page</a>.

-<p><i>The full changelog is available
-<a href="https://github.com/vkbo/novelWriter/blob/main/CHANGELOG.md">here</a>.</i></p>
-
 <hr/>

 <h2>Release Notes for 1.0 RC2</h2>
@@ -290,10 +290,12 @@ class NWIndex():
            "updated" : round(time()),
        }
        if itemLayout == nwItemLayout.NOTE:
+            self._novelIndex.pop(tHandle, None)
            self._noteIndex[tHandle] = {}
            isNovel = False
        else:
            self._novelIndex[tHandle] = {}
+            self._noteIndex.pop(tHandle, None)
            isNovel = True

        # Also clear references to file in tag index