From e2a30d1ac6b3416a3cd8d0a996bdbab6473b93cd Mon Sep 17 00:00:00 2001
From: Jakub <jakub@cuth.sk>
Date: Thu, 21 Jan 2021 10:51:23 +0100
Subject: [PATCH] [GODT-958] Release notes per each channel

---
 Makefile                                      |  9 +--
 release-notes/bridge_early.md                 | 11 ++++
 release-notes/{bridge.md => bridge_stable.md} | 60 ++++++++++++++++++-
 release-notes/ie_early.md                     | 12 ++++
 release-notes/{ie.md => ie_stable.md}         | 27 ++++++++-
 unreleased.md                                 |  1 +
 utils/release_notes.sh                        | 21 ++++---
 7 files changed, 122 insertions(+), 19 deletions(-)
 create mode 100644 release-notes/bridge_early.md
 rename release-notes/{bridge.md => bridge_stable.md} (64%)
 create mode 100644 release-notes/ie_early.md
 rename release-notes/{ie.md => ie_stable.md} (50%)

diff --git a/Makefile b/Makefile
index 1a492412..d2c94a91 100644
--- a/Makefile
+++ b/Makefile
@@ -269,13 +269,10 @@ updates: install-go-mod-outdated
 doc:
 	godoc -http=:6060
 
-release-notes: release-notes/bridge.html release-notes/ie.html
+release-notes: release-notes/bridge_stable.html release-notes/bridge_early.html release-notes/ie_stable.html release-notes/ie_early.html
 
-release-notes/bridge.html:
-	./utils/release_notes.sh bridge
-
-release-notes/ie.html:
-	./utils/release_notes.sh ie
+release-notes/%.html: release-notes/%.md
+	./utils/release_notes.sh $^
 
 .PHONY: gofiles
 # Following files are for the whole app so it makes sense to have them in bridge package.
diff --git a/release-notes/bridge_early.md b/release-notes/bridge_early.md
new file mode 100644
index 00000000..8b09682d
--- /dev/null
+++ b/release-notes/bridge_early.md
@@ -0,0 +1,11 @@
+## v1.6.0
+- 2021-01-28
+
+### New
+
+In app silent updates
+
+### Fixed
+
+Performance
+
diff --git a/release-notes/bridge.md b/release-notes/bridge_stable.md
similarity index 64%
rename from release-notes/bridge.md
rename to release-notes/bridge_stable.md
index cf8ae251..b7984a08 100644
--- a/release-notes/bridge.md
+++ b/release-notes/bridge_stable.md
@@ -1,3 +1,59 @@
+## v1.5.6
+- 2021-01-21
+
+### New
+
+Improvements to message parsing
+
+Better error handling
+
+Ensured better message flow by refactoring both address and date parsing
+
+Improved secure connectivity checks
+
+Better deb packaging
+
+More robust error handling
+
+Improved package creation logic
+
+Refactor of sending functions to simplify code maintenance
+
+Added tests for package creation
+
+Support read confirmations
+
+Adding GPLv3 licence button to the GUI
+
+Improved testing
+
+### Fixed
+
+AppleMail crashes (related to timestamps)
+
+Sending messages from aliases in combined inbox mode
+
+Fedora font issues
+
+Ensured that conversations are properly threaded
+
+Fixed Linux font issues (Fedora)
+
+Better handling of Mime encrypted messages
+
+Bridge crashes related to labels handling
+
+GUI popup related to TLS connection error
+
+An issue where a random session key is included in the data payload
+
+Error handling (including improved detection)
+
+Encoding errors
+
+Installation issues on linux
+
+
 ## v1.4.5
 - 2020-10-22
 
@@ -27,6 +83,8 @@ Limited log size
 
 Fixed Linux font issues (mouse hover)
 
+
+
 ## v1.3.3
 - 2020-08-12
 
@@ -58,4 +116,4 @@ General stability improvements
 
 ### Fixed
 
-Fixed a slew of smaller bugs and some conditions which could cause the application to crash.
\ No newline at end of file
+Fixed a slew of smaller bugs and some conditions which could cause the application to crash.
diff --git a/release-notes/ie_early.md b/release-notes/ie_early.md
new file mode 100644
index 00000000..7bfd5d68
--- /dev/null
+++ b/release-notes/ie_early.md
@@ -0,0 +1,12 @@
+## v1.3.0
+- 2021-01-28
+
+### New
+
+In app silent updates
+
+### Fixed
+
+Performance
+
+
diff --git a/release-notes/ie.md b/release-notes/ie_stable.md
similarity index 50%
rename from release-notes/ie.md
rename to release-notes/ie_stable.md
index 806779a0..82222be5 100644
--- a/release-notes/ie.md
+++ b/release-notes/ie_stable.md
@@ -1,3 +1,28 @@
+## v1.2.2
+- 2020-11-27
+
+### New
+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
+
+Better handling and displaying of skipped messages
+
+Various enhancements of the import process related to parsing
+
+Cosmetic GUI changes
+
+Better error handling
+
+### Fixed
+
+Linux font issues - Fedora specific
+
+App response to the user pausing and canceling import or export
+
+Upgrade errors
+
+
 ## v1.1.2
 - 2020-09-23
 
@@ -23,4 +48,4 @@ Improved metrics
 Fixed issues causing failing of import
 
   * Import from mbox files with long lines
-  * Improvements to import from Yahoo accounts
\ No newline at end of file
+  * Improvements to import from Yahoo accounts
diff --git a/unreleased.md b/unreleased.md
index 72ff9941..f92b9881 100644
--- a/unreleased.md
+++ b/unreleased.md
@@ -5,6 +5,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 ## Unreleased
 
 ### Added
+* GODT-958 Release notes per eaach update channel.
 * GODT-906 Handle RFC2047-encoded content transfer encoding values.
 * GODT-875 Added GUI dialog on force update.
 * GODT-820 Added GUI notification on impossibility of update installation (both silent and manual).
diff --git a/utils/release_notes.sh b/utils/release_notes.sh
index bc871488..93234b17 100755
--- a/utils/release_notes.sh
+++ b/utils/release_notes.sh
@@ -19,22 +19,21 @@
 
 
 # Generate HTML release notes
-# hosted at https://protonmail.com/download/{ie,bridge}/release_notes.html
+# hosted at https://protonmail.com/download/{ie,bridge}/{stable,early}_releases.html
+INFILE=$1
+OUTFILE=${INFILE//.md/.html}
 
 # Load props
-APP_TYPE=$1
-if [ "$APP_TYPE" == "" ]; then
-    APP_TYPE="bridge"
+APP_NAME="Import-Export app"
+if [[ "$INFILE" =~ bridge ]]; then 
+    APP_NAME="Bridge"
 fi
 
-APP_NAME="Bridge"
-if [ "$APP_TYPE" == "ie" ]; then
-    APP_NAME="Import-Export app"
+CHANNEL=early
+if [[ "$INFILE" =~ stable ]]; then 
+    CHANNEL=stable
 fi
 
-INFILE="release-notes/${APP_TYPE}.md"
-OUTFILE="release-notes/${APP_TYPE}.html"
-
 # Check dependencies
 if ! which pandoc; then
   echo "PANDOC NOT FOUND!\nPlease install pandoc in order to build release notes."
@@ -42,4 +41,4 @@ if ! which pandoc; then
 fi
 
 # Build release notes
-pandoc $INFILE -f markdown -t html -s -o $OUTFILE -c utils/release_notes.css --self-contained --section-divs --metadata title="Release notes - ProtonMail $APP_NAME"
+pandoc $INFILE -f markdown -t html -s -o $OUTFILE -c utils/release_notes.css --self-contained --section-divs --metadata title="Release notes - ProtonMail $APP_NAME - $CHANNEL"