From dd5b61dcea6d5506365f675270768e49daf408ff Mon Sep 17 00:00:00 2001
From: Lauren Chambers <lchambers@stsci.edu>
Date: Tue, 4 Jun 2019 14:52:04 -0400
Subject: [PATCH 1/2] Update changelog and version number for 0.20.0

---
 CHANGES.rst | 40 +++++++++++++++++++++++++++++++++++++++-
 setup.py    |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 9806973ba..7600f9136 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,41 @@
+0.20.0 (2019-06-05)
+===================
+
+New Features
+------------
+
+Project & API Documentation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Updated the notebook exemplifying how to perform an engineering database (EDB) telemetry query.
+- Updated the README for the ``style_guide`` directory.
+
+Web Application
+~~~~~~~~~~~~~~~
+
+- Added buttons for users to download the results of EDB telemetry queries as CSV files.
+- Enabled users to search for or navigate to program numbers without requiring leading zeros (i.e. "756" is now treated equivalently to "00756").
+- Enabled authentication for EDB queries via the web login (rather than requiring authentication information to be present in the configuration file).
+- Added custom 404 pages.
+- Added adaptive redirect feature so that users are not sent back to the homepage after login.
+- Added more descriptive errors if a user tries to run the web application without filling out the proper fields in the configuration file.
+
+``jwql`` Repository
+~~~~~~~~~~~~~~~~~~~
+
+- Replaced all EDB interface code within ``jwql`` with the new ``jwedb`` `package<https://github.com/spacetelescope/jwst-dms-edb>`_.
+- Fully incorporated Python 3.5 testing into the Jenkins test suite.
+
+Bug Fixes
+---------
+
+Web Application
+~~~~~~~~~~~~~~~
+
+- Fixed bug in which dashboard page would throw an error.
+- Fixed incorrect dashboard axis labels.
+
+
 0.19.0 (2019-04-19)
 ===================
 
@@ -8,7 +46,7 @@ Project & API Documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 - Added guidelines to the style guide for logging the execution of instrument monitors
-- Added example useage of logging in the ``example.py`` module
+- Added example usage of logging in the ``example.py`` module
 
 Web Application
 ~~~~~~~~~~~~~~~
diff --git a/setup.py b/setup.py
index 867bbf23d..3807b417e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 from setuptools import find_packages
 
-VERSION = '0.19.0'
+VERSION = '0.20.0'
 
 AUTHORS = 'Matthew Bourque, Sara Ogaz, Joe Filippazzo, Bryan Hilbert, Misty Cracraft, '
 AUTHORS += 'Graham Kanarek, Johannes Sahlmann, Lauren Chambers, Catherine Martlin'

From 275f3026f847f33b4af87376677d9649c1ae786b Mon Sep 17 00:00:00 2001
From: Matthew Bourque <bourque@stsci.edu>
Date: Tue, 4 Jun 2019 17:17:18 -0400
Subject: [PATCH 2/2] Updated changelog to include not about anomaly submission
 form

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7600f9136..6996c881f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,6 +13,7 @@ Project & API Documentation
 Web Application
 ~~~~~~~~~~~~~~~
 
+- Added form on preview image pages to allow users to submit image anomalies.
 - Added buttons for users to download the results of EDB telemetry queries as CSV files.
 - Enabled users to search for or navigate to program numbers without requiring leading zeros (i.e. "756" is now treated equivalently to "00756").
 - Enabled authentication for EDB queries via the web login (rather than requiring authentication information to be present in the configuration file).