From c72e3a15856389bd7174badbfbd80eac14e5bf73 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Mon, 1 Feb 2021 21:17:30 +0100
Subject: [PATCH] Bumped version to 1.0.4 and updated changelog

---
 CHANGELOG.md        | 37 +++++++++++++++++++++++++++++++++++++
 docs/source/conf.py |  4 ++--
 nw/__init__.py      |  6 +++---
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99087d0d..cd4d872d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,42 @@
 # novelWriter Change Log
 
+## Version 1.0.4 [2021-02-07]
+
+### Release Notes
+
+### Detailed Changelog
+
+**Bug Fixes**
+
+* Fixed an issue where the  setting for justified text in the text editor was in the Preferences
+  dialog mixed with the setting for fixed text width in the editor. This meant that the justified
+  text setting could potentially get overridden when the Preferences dialog was used. Issue #623,
+  PR #625.
+* Fixed an issue with the Open Project dialog where the list of recent projects would contain
+  duplicate entries if the dialog was opened multiple times. PR #627.
+
+**User Interface**
+
+* The `Ctrl+Del` keyboard shortcut is now only active when the project tree has focus. Since this
+  is also a common used shortcut in many application for deleting the next word, the deletion of a
+  file when the key combination is used in the editor is unexpected. Issue #629, PR #631.
+
+**Installation**
+
+* A new command has been added to the `setup.py` script. The new command, `win-install`, will
+  create a desktop and start menu icon for novelWriter when run in the source folder. A windows
+  batch file, `win_install.bat`, has also been added. Running this file from the source folder,
+  either by command line or by double-click, will install dependencies from PyPi and set up the
+  icons. This should make it easier to run novelWriter from the source folder on Windows. PR #634.
+
+**Documentation**
+
+* The documentation on how to setup and install novelWriter has been extended and reorganised into
+  one file per operating system. Some of the other documentation files have also been moved to a
+  new section. PR #634.
+
+----
+
 ## Version 1.0.3 [2021-01-24]
 
 ### Release Notes
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 707ae026..e93f7bcc 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -25,9 +25,9 @@ copyright = "2018–2021, Veronica Berglyd Olsen"
 author = "Veronica Berglyd Olsen"
 
 # The short X.Y version
-version = "1.0.3"
+version = "1.0.4"
 # The full version, including alpha/beta/rc tags
-release = "1.0.3"
+release = "1.0.4"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/nw/__init__.py b/nw/__init__.py
index 38c98cda..7f91572e 100644
--- a/nw/__init__.py
+++ b/nw/__init__.py
@@ -63,9 +63,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "1.0.3"
-__hexversion__ = "0x010003f0"
-__date__       = "2021-01-24"
+__version__    = "1.0.4"
+__hexversion__ = "0x010004f0"
+__date__       = "2021-02-07"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"