From b40c2465f6763b3b7ce92124dde2e98c62029d9c Mon Sep 17 00:00:00 2001
From: mbilker <me@mbilker.us>
Date: Fri, 15 Jan 2016 12:12:15 -0500
Subject: [PATCH 1/3] fix(N1.sh): allow additional parameters specified on
 command line

This prevents Electron saying it cannot find the main entrypoint, when
using the `--test -s` parameters on the command line to spec test plugins.
---
 N1.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/N1.sh b/N1.sh
index b562ae7c2..a995798f7 100755
--- a/N1.sh
+++ b/N1.sh
@@ -22,5 +22,5 @@ if [ ! -e "$ELECTRON_PATH" ]; then
   exit 1
 fi
 
-$ELECTRON_PATH --executed-from="$(pwd)" --pid=$$ "$@" $N1_PATH
+$ELECTRON_PATH --executed-from="$(pwd)" --pid=$$ $N1_PATH "$@"
 exit $?

From 1f0ebfca787f6524f317db2c41d353c0f19e13bc Mon Sep 17 00:00:00 2001
From: Sean Collins <sean@cllns.com>
Date: Mon, 11 Jan 2016 17:23:04 -0700
Subject: [PATCH 2/3] Standardize message-list capitalization to AM/PM,

---
 internal_packages/message-list/lib/message-timestamp.cjsx | 4 ++--
 .../message-list/spec/message-timestamp-spec.cjsx         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal_packages/message-list/lib/message-timestamp.cjsx b/internal_packages/message-list/lib/message-timestamp.cjsx
index dac2b2ae8..def1ec1ff 100644
--- a/internal_packages/message-list/lib/message-timestamp.cjsx
+++ b/internal_packages/message-list/lib/message-timestamp.cjsx
@@ -28,10 +28,10 @@ class MessageTimestamp extends React.Component
       diff = now.diff(msgDate, 'days', true)
       isSameDay = now.isSame(msgDate, 'days')
       if diff < 1 and isSameDay
-        return msgDate.format "h:mm a"
+        return msgDate.format "h:mm A"
       if diff < 1.5 and not isSameDay
         timeAgo = msgDate.from now
-        monthAndDay = msgDate.format "h:mm a"
+        monthAndDay = msgDate.format "h:mm A"
         return monthAndDay + " (" + timeAgo + ")"
       if diff >= 1.5 and diff < 365
         return msgDate.format "MMM D"
diff --git a/internal_packages/message-list/spec/message-timestamp-spec.cjsx b/internal_packages/message-list/spec/message-timestamp-spec.cjsx
index e61f18fe9..272749eb5 100644
--- a/internal_packages/message-list/spec/message-timestamp-spec.cjsx
+++ b/internal_packages/message-list/spec/message-timestamp-spec.cjsx
@@ -4,7 +4,7 @@ TestUtils = React.addons.TestUtils
 MessageTimestamp = require '../lib/message-timestamp'
 
 msgTime = ->
-  moment([2010, 1, 14, 15, 25, 50, 125]) # Feb 14, 2010 at 3:25pm
+  moment([2010, 1, 14, 15, 25, 50, 125]) # Feb 14, 2010 at 3:25 PM
 
 describe "MessageTimestamp", ->
   beforeEach ->
@@ -23,14 +23,14 @@ describe "MessageTimestamp", ->
 
   it "displays the time from messages shown today", ->
     now = msgTime().add(2, 'hours')
-    expect(@item._formattedDate(msgTime(), now)).toBe "3:25 pm"
+    expect(@item._formattedDate(msgTime(), now)).toBe "3:25 PM"
 
   it "displays the time from messages yesterday with the relative time if it's less than 36 hours ago", ->
     now = msgTime().add(21, 'hours')
-    expect(@item._formattedDate(msgTime(), now)).toBe "3:25 pm (21 hours ago)"
+    expect(@item._formattedDate(msgTime(), now)).toBe "3:25 PM (21 hours ago)"
 
     now = msgTime().add(30, 'hours')
-    expect(@item._formattedDate(msgTime(), now)).toBe "3:25 pm (a day ago)"
+    expect(@item._formattedDate(msgTime(), now)).toBe "3:25 PM (a day ago)"
 
   it "displays month, day for messages less than a year ago, but more than 24 hours ago", ->
     now = msgTime().add(2, 'months')

From 1f0751c0262c08010df863d3add8af19eab11fd6 Mon Sep 17 00:00:00 2001
From: Jackie Luo <jackieluo@ip-192-168-128-23.us-west-2.compute.internal>
Date: Tue, 19 Jan 2016 16:30:09 -0800
Subject: [PATCH 3/3] fix(message): Message time no longer selectable

Summary: Closes #910.

Test Plan: Manual. Tested locally.

Reviewers: evan, bengotow

Reviewed By: bengotow

Differential Revision: https://phab.nylas.com/D2453
---
 internal_packages/message-list/lib/message-item.cjsx         | 2 +-
 internal_packages/message-list/stylesheets/message-list.less | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal_packages/message-list/lib/message-item.cjsx b/internal_packages/message-list/lib/message-item.cjsx
index aa4a7eb35..15753616b 100644
--- a/internal_packages/message-list/lib/message-item.cjsx
+++ b/internal_packages/message-list/lib/message-item.cjsx
@@ -95,7 +95,7 @@ class MessageItem extends React.Component
       {@_renderHeaderSideItems()}
 
       <div className="message-header-right">
-        <MessageTimestamp className="message-time selectable"
+        <MessageTimestamp className="message-time"
                           isDetailed={@state.detailedHeaders}
                           date={@props.message.date} />
 
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 5a6f0558e..0ca660ee0 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -403,6 +403,7 @@ body.platform-win32 {
       z-index: 2; position: relative;
       display: inline-block;
       min-width: 125px;
+      cursor: default;
     }
     .msg-actions-tooltip {
       display: inline-block;