Merge branch 'master' into development

dsmrreader · Apr 28, 2016 · c1c57c2 · c1c57c2
2 parents 2f3a3db + 8e1c02c
commit c1c57c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,7 +1,13 @@
 Changelog
 =========
 
-v1.1.0 - 2016-xx-xx
+
+v1.1.1 - 2016-04-27
+^^^^^^^^^^^^^^^^^^^
+- Improve readme (`#124 <https://github.com/dennissiemensma/dsmr-reader/issues/124>`_).
+
+
+v1.1.0 - 2016-04-23
 ^^^^^^^^^^^^^^^^^^^
 - Autorefresh dashboard (`#117 <https://github.com/dennissiemensma/dsmr-reader/issues/117>`_).
 - Improve line graphs' visibility (`#111 <https://github.com/dennissiemensma/dsmr-reader/issues/111>`_).

diff --git a/dsmr_frontend/templates/dsmr_frontend/compare.html b/dsmr_frontend/templates/dsmr_frontend/compare.html
@@ -235,7 +235,7 @@
                     }
                     update_view(e.date, id_postfix);
 
-                }).datepicker('update', '{{ end_date|date:datepicker_date_format }}');
+                });
             }
 
             /**

diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py
@@ -17,6 +17,6 @@
 from django.utils.version import get_version
 
 
-VERSION = (1, 1, 1, 'beta', 1)
+VERSION = (1, 1, 1, 'final', 0)
 
 __version__ = get_version(VERSION)
-Original file line number
+Diff line change
@@ Expand Up / @@ -235,7 +235,7 @@ @@
                         }
                         update_view(e.date, id_postfix);
-                    }).datepicker('update', '{{ end_date|date:datepicker_date_format }}');
+                    });
                 }
                 /**
@@ Expand Down @@