From 0c4dbe155f2facb6c2fa2fb69902904f6d9e7610 Mon Sep 17 00:00:00 2001
From: Andrew Schonfeld <andrew.schonfeld@numeric.com>
Date: Thu, 24 Oct 2019 13:00:09 -0400
Subject: [PATCH] bumped version numbers to 1.2.0

---
 CHANGES.md          | 8 ++++++++
 docs/source/conf.py | 4 ++--
 package.json        | 2 +-
 setup.py            | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ff1ab8bc..d81075c4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,3 +13,11 @@ Changelog
 ### 1.1.1 (2019-10-23)
 
   * [#13](https://github.com/manahl/dtale/issues/13): fix for auto-detection of column widths for strings and floats
+
+### 1.2.0 (2019-10-24)
+
+  * [#20](https://github.com/manahl/dtale/issues/13): fix for data being overriden with each new instance
+  * [#21](https://github.com/manahl/dtale/issues/13): fix for displaying timestamps if they exist
+  * calling `show()` now returns an object which can alter the state of a process
+    * accessing/altering state through the `data` property 
+    * shutting down a process using the `kill()` function
diff --git a/docs/source/conf.py b/docs/source/conf.py
index cae5bf45..cfa12a1d 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.1.1'
+version = u'1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.1.1'
+release = u'1.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/package.json b/package.json
index 3771203d..cb4e0d97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dtale",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Numeric Data Viewer",
   "main": "main.js",
   "directories": {
diff --git a/setup.py b/setup.py
index a8f019ef..4c385ab1 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ def run_tests(self):
 
 setup(
     name="dtale",
-    version="1.1.1",
+    version="1.2.0",
     author="MAN Alpha Technology",
     author_email="ManAlphaTech@man.com",
     description="Web Client for Visualizing Pandas Objects",