From 69b7bb2e23985f37d1846d69bf24b8f9cc4d0218 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Fri, 13 May 2016 15:57:03 -0700
Subject: [PATCH] bump(version): 0.4.36 and changelog

---
 CHANGELOG.md                      | 40 +++++++++++++++++++++++++++++++
 build/tasks/nylaslint-task.coffee |  6 +++++
 package.json                      |  2 +-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dadd80b2d..6b0b96079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,45 @@
 # N1 Changelog
 
+### 0.4.36 (5/13/16)
+
+- Features:
+  + Keyboard Shortcuts: Edit your keyboard shortcuts directly from the keyboard
+    shortcuts preferences screen.
+  + You can now include variables in the subject line of mail merge emails.
+
+- Fixes:
+  + The `--background` flag now properly opens N1 in the background.
+  + Switching to `dev` mode from the Developer menu works as expected.
+  + Dragging files onto the dock icon to attach them to a new email works properly.
+  + N1 handles HTTP errors in addition to socket errors during attachment download.
+  + N1 asks you to re-authenticate if your account has been cleaned up after a long period of inactivity.
+  + N1 no longer gets stuck into an infinite loop in some scenarios when your sync token is very old.
+  + The INBOX. folder prefix is hidden for FastMail accounts.
+  + When viewing your spam folder, you can now "Unmark" something as spam.
+  + When resuming from sleep, N1 no longer plays the "new mail" sound repeatedly / loudly.
+  + Search queries with double quotes (") now work as expected.
+  + Changes to your accounts no longer cause the account's inbox to become focused.
+  + Replies honor the ReplyTo field, even if the message is from one of your accounts.
+  + Using the Apple Mail keyboard layout, Cmd+[ and Cmd+] move between threads.
+  + The Message Viewer always appears in the Window menu and is bound to Cmd/Ctrl+0.
+  + `?` now shows your keyboard shortcuts.
+
+- Design:
+  + The confusing spam icon has been replaced with "thumbs down".
+  + The standard "Dark" theme uses more balanced dark colors.
+  + The personal level indicators are better designed.
+  + The search bar hides properly in `Darkside` when items are selected.
+
+- Development:
+  + We've upgraded to Babel 6 and the latest version of ESLint.
+  + N1 no longer builds on Node 0.10, Node 0.11 or Node 0.12. Use Node 4+ when
+    running `script/build` or `script/bootstrap`
+  + N1 now uses the native implementations of all available ES2016 features.
+  + N1 now uses Electron 1.0.1.
+  + The codebase is now only 50% CoffeeScript
+  + `script/bootstrap` no longer produces red-herring errors.
+
+
 ### 0.4.33 (5/4/16)
 
 - Fixes a critical issue with "Send Later" state not sticking.
diff --git a/build/tasks/nylaslint-task.coffee b/build/tasks/nylaslint-task.coffee
index afc7adb1b..977011205 100644
--- a/build/tasks/nylaslint-task.coffee
+++ b/build/tasks/nylaslint-task.coffee
@@ -10,6 +10,12 @@ normalizeRequirePath = (requirePath, fPath) ->
 module.exports = (grunt) ->
   grunt.registerMultiTask 'nylaslint', 'Check requires for file extensions compiled away', ->
     done = @async()
+
+    # Enable once path errors are fixed.
+    if process.platform is 'win32'
+      done()
+      return
+
     extensionRegex = /require ['"].*\.(coffee|cjsx|jsx|es6|es)['"]/i
 
     for fileset in @files
diff --git a/package.json b/package.json
index f6d3cc4af..3d2f0b838 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nylas",
   "productName": "Nylas N1",
-  "version": "0.4.35",
+  "version": "0.4.36",
   "description": "An extensible, open-source mail client built on the modern web.",
   "main": "./src/browser/main.js",
   "repository": {