From 2a0a84b2293717a7677f3b7550d4890cb2c81bcc Mon Sep 17 00:00:00 2001
From: hackerkid <hackerkid@vishnuks.com>
Date: Sun, 2 Apr 2017 03:37:03 +0530
Subject: [PATCH] Add moment.js third-party module via npm.

This is needed for timezone manipulations.  We may be able to replace
XDate with it in the future as well.
---
 .eslintrc.json       | 1 +
 package.json         | 2 ++
 version.py           | 2 +-
 zproject/settings.py | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 1eaae76175..fd7e78ec48 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -14,6 +14,7 @@
         "Dropbox": false,
         "SockJS": false,
         "marked": false,
+        "moment": false,
         "i18n": false,
         "bridge": false,
         "page_params": false,
diff --git a/package.json b/package.json
index 7b82bd04b2..dd814278b8 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,8 @@
     "jquery": "2.2.3",
     "jquery-validation": "1.16.0",
     "katex": "0.7.1",
+    "moment": "2.18.1",
+    "moment-timezone": "0.5.12",
     "plotly.js": "1.19.2",
     "string.prototype.codepointat": "0.2.0",
     "underscore": "1.8.3",
diff --git a/version.py b/version.py
index a485a0527a..c3be57b3a0 100644
--- a/version.py
+++ b/version.py
@@ -1,2 +1,2 @@
 ZULIP_VERSION = "1.5.1+git"
-PROVISION_VERSION = '4.14'
+PROVISION_VERSION = '4.15'
diff --git a/zproject/settings.py b/zproject/settings.py
index c2dd65d267..dde42ec69b 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -765,6 +765,8 @@ JS_SPECS = {
             'js/blueslip.js',
             'third/bootstrap/js/bootstrap.js',
             'js/common.js',
+            'node_modules/moment/moment.js',
+            'node_modules/moment-timezone/builds/moment-timezone-with-data.js',
         ],
         'output_filename': 'min/common.js'
     },