From 90137f11fe9b312aa1f9233bb3b29e2af8cb78df Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Tue, 19 Jan 2021 12:14:41 -0600
Subject: [PATCH] Bump to 1.8.0, update Changelog

---
 .travis.yml           |  3 +--
 CHANGELOG.md          | 28 ++++++++++++++++++++++++++++
 app/package-lock.json |  2 +-
 app/package.json      |  2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9e790c53..22e5c8a43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,8 +88,7 @@ after_success:
   # Grab the version number from the .deb product and update the snapcraft.yml file
   - sed "s/MAILSPRING_VERSION/$(grep -E -o '([0-9]+.[0-9]+.[0-9]+)' <<< "$(find app/dist -type f -name mailspring-*.deb)")/g" snap/snapcraft.template.yaml > snap/snapcraft.yaml
   # Decrypt the snapcraft login information
-  - openssl aes-256-cbc -K $encrypted_d506bd5213c4_key -iv $encrypted_d506bd5213c4_iv
-  -in .snapcraft/credentials.enc -out .snapcraft/credentials -d
+  - openssl aes-256-cbc -K $encrypted_d506bd5213c4_key -iv $encrypted_d506bd5213c4_iv -in .snapcraft/credentials.enc -out .snapcraft/credentials -d
   - snapcraft login --with .snapcraft/credentials
 
 services:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c10e31f9..ca8d87df2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Mailspring Changelog
 
+### 1.8.0 (1/19/2021)
+
+**Features:**
+
+- You can now choose a color for each account in Preferences > Accounts and conversations in the unified mailbox are colorized! (#2240, thanks @Phylu)
+
+**Fixes:**
+
+- The search bar's placeholder text now reflects the accounts you're viewing (#2252, thanks @Phylu)
+
+- The "equal to" mail rule logic now supports matching against empty strings (eg subject = "No Subject") correctly (#2254, thanks @Phylu)
+
+- Updated Turkish, Bengali, Chinese, and French translations (thanks @emintufan, @EwenQuim, @Aftabuzzaman and @johnpoint)
+
+- Support for pasting files sent in the text/uri-list format or as a secondary pasteboard item (@akdor1154)
+
+- Autofill for the Hostinger email provider (@merkys7)
+
+- The Yandex connection screen now includes instructions to enable IMAP #2111
+
+- The event header that appears when an email contains an ICS attachment now shows the correct timezone. #2093, #2255
+
+- On Linux, Mailspring no longer specifies `python` or `git` as package dependencies unnecessarily.
+
+**Developer:**
+
+- Mailspring now uses Electron 4.2.12 in preparation for a jump to Electron 8+.
+
 ### 1.7.8 (5/24/2020)
 
 **Fixes:**
diff --git a/app/package-lock.json b/app/package-lock.json
index 90dec0e93..4179a0644 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "mailspring",
-  "version": "1.7.8",
+  "version": "1.8.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/app/package.json b/app/package.json
index 8c0f0ce31..a7141883d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mailspring",
   "productName": "Mailspring",
-  "version": "1.7.8",
+  "version": "1.8.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/foundry376/mailspring.git"