From 881cb64beb775ad2df32f9f129e81cc4e77e03f3 Mon Sep 17 00:00:00 2001
From: Jakub <jakub@cuth.sk>
Date: Thu, 29 Oct 2020 12:57:59 +0100
Subject: [PATCH] Release Danube: notes, version bump, change log

---
 Changelog.md                           |  3 ++-
 Makefile                               |  4 ++--
 internal/importexport/release_notes.go | 17 +++++++++--------
 release-notes/bugs-importexport.txt    |  5 +++--
 release-notes/notes-importexport.txt   | 10 +++++-----
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a6973edc..fe17d54c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,8 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 ## Unreleased
 
+## [IE 1.2.0] Elbe
+
 ### Added
 * GODT-763 Detect Gmail labels from All Mail mbox export (using X-Gmail-Label header).
 * GODT-834 Info about tags in BUILDS.md and link to Import-Export page in README.md.
@@ -12,7 +14,6 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 ### Fixed
 * GODT-677 Windows IE: global import settings not fit in window.
 * GODT-794 Congo fails to update to Danube
-* GODT-794 Congo fails to update to Danube.
 * GODT-749 Don't force PGP/Inline when sending plaintext messages.
 * GODT-764 Fix deadlock in integration tests for Import-Export.
 * GODT-662 Do not resume paused transfer progress after dismissing cancel popup.
diff --git a/Makefile b/Makefile
index 66b5cea4..f8b37a38 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ TARGET_OS?=${GOOS}
 .PHONY: build build-ie build-nogui build-ie-nogui check-has-go
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=1.4.0-git
-IE_APP_VERSION?=1.1.0-git
+BRIDGE_APP_VERSION?=1.4.5-git
+IE_APP_VERSION?=1.2.0-git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 SRC_ICO:=logo.ico
 SRC_ICNS:=Bridge.icns
diff --git a/internal/importexport/release_notes.go b/internal/importexport/release_notes.go
index 91c8b1d0..15fe457b 100644
--- a/internal/importexport/release_notes.go
+++ b/internal/importexport/release_notes.go
@@ -15,17 +15,18 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
-// Code generated by ./release-notes.sh at 'Wed Sep 23 01:31:53 PM CEST 2020'. DO NOT EDIT.
+// Code generated by ./release-notes.sh at 'Thu Oct 29 12:57:32 PM CET 2020'. DO NOT EDIT.
 
 package importexport
 
-const ReleaseNotes = `• Speed up import by implementing parallel processing (parallel fetch, encrypt and upload of messages)
-• Optimising the initial fetch of messages from external accounts
-• Better handling of attachments and non-standard formatting
-• Improved stability of the message parser
-• Added persistent anonymous API cookies
+const ReleaseNotes = `• Improvements to the import from large mbox files with multiple labels
+• Not allow to run multiple instances of the app or transfers at the same time
+• Various enhancements of the import process related to parsing
+• Cosmetic GUI changes
+• Better error handling
 `
 
-const ReleaseFixedBugs = `• Import from mbox files with long lines
-• Improvements to import from Yahoo accounts
+const ReleaseFixedBugs = `• Linux font issues - Fedora specific
+• App response to the user pausing and canceling import or export
+• Handling errors during update
 `
diff --git a/release-notes/bugs-importexport.txt b/release-notes/bugs-importexport.txt
index 46b04244..723741c7 100644
--- a/release-notes/bugs-importexport.txt
+++ b/release-notes/bugs-importexport.txt
@@ -1,2 +1,3 @@
-• Import from mbox files with long lines
-• Improvements to import from Yahoo accounts
+• Linux font issues - Fedora specific
+• App response to the user pausing and canceling import or export
+• Handling errors during update
diff --git a/release-notes/notes-importexport.txt b/release-notes/notes-importexport.txt
index 68581970..42701d51 100644
--- a/release-notes/notes-importexport.txt
+++ b/release-notes/notes-importexport.txt
@@ -1,5 +1,5 @@
-• Speed up import by implementing parallel processing (parallel fetch, encrypt and upload of messages)
-• Optimising the initial fetch of messages from external accounts
-• Better handling of attachments and non-standard formatting
-• Improved stability of the message parser
-• Added persistent anonymous API cookies
+• Improvements to the import from large mbox files with multiple labels
+• Not allow to run multiple instances of the app or transfers at the same time
+• Various enhancements of the import process related to parsing
+• Cosmetic GUI changes
+• Better error handling