From 017d1416fa9148f84596aa109826cacb13c1c774 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 22 Oct 2016 13:07:39 -0400
Subject: #353 - more timezone tweaks, especially making sure humanizeTime is
 ALWAYS using local time irrespective of setting

Former-commit-id: d28f076eb0a780a83466f259d17563b8d2d34a0d
---
 www/js/TimelineModalCtrl.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'www/js/TimelineModalCtrl.js')

diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js
index 96f5c465..6531117e 100644
--- a/www/js/TimelineModalCtrl.js
+++ b/www/js/TimelineModalCtrl.js
@@ -446,7 +446,8 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
 
     function humanizeTime(str)
     {
-       return moment(str).fromNow();
+        return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow();
+     
         
     }
 
-- 
cgit v1.2.3