Merge for v1.2!

dsmrreader · May 18, 2016 · 137f3cc · 137f3cc
2 parents 2071571 + 654fa09
commit 137f3cc
Show file tree

Hide file tree

Showing 42 changed files with 1,091 additions and 298 deletions.
diff --git a/docs/_static/screenshots/statistics.png b/docs/_static/screenshots/statistics.png
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,20 @@ Changelog
 =========
 
 
+v1.2.0 - 2016-05-18
+^^^^^^^^^^^^^^^^^^^
+- Energy supplier prices does not indicate tariff type (Django admin) (`#126 <https://github.com/dennissiemensma/dsmr-reader/issues/126>`_).
+- Requirements update (`#128 <https://github.com/dennissiemensma/dsmr-reader/issues/128>`_).
+- Force backup (`#123 <https://github.com/dennissiemensma/dsmr-reader/issues/123>`_).
+- Update clean-install.md (`#131 <https://github.com/dennissiemensma/dsmr-reader/issues/131>`_).
+- Improve data export field names (`#132 <https://github.com/dennissiemensma/dsmr-reader/issues/132>`_).
+- Display average temperature in archive (`#122 <https://github.com/dennissiemensma/dsmr-reader/issues/122>`_).
+- Pie charts on trends page overlap their canvas (`#136 <https://github.com/dennissiemensma/dsmr-reader/issues/136>`_).
+- 'Slumber' consumption (`#115 <https://github.com/dennissiemensma/dsmr-reader/issues/115>`_).
+- Show lowest & highest Watt peaks (`#138 <https://github.com/dennissiemensma/dsmr-reader/issues/138>`_).
+- Allow day & hour statistics reset due to changing energy prices (`#95 <https://github.com/dennissiemensma/dsmr-reader/issues/95>`_).
+
+
 v1.1.2 - 2016-05-01
 ^^^^^^^^^^^^^^^^^^^
 - Trends page giving errors (when lacking data) (`#125 <https://github.com/dennissiemensma/dsmr-reader/issues/125>`_).

diff --git a/docs/faq.rst b/docs/faq.rst
@@ -0,0 +1,18 @@
+Frequently Asked Questions (FAQ)
+================================
+
+Feature/bug report
+------------------
+**How can I propose a feature or report a bug I've found?**
+
+`Just create a ticket at Github <https://github.com/dennissiemensma/dsmr-reader/issues/new>`_
+
+Recalculate prices
+------------------
+**I've adjusted my energy prices but there are no changes! How can I regenerate them with my new prices?**
+
+*You can flush your statistics by executing:*
+
+``./manage.py dsmr_stats_clear_statistics --ack-to-delete-my-data``
+
+*The application will delete all statistics and (slowly) regenerate them in the background. Just make sure the source data is still there.*
diff --git a/docs/index.rst b/docs/index.rst
@@ -8,6 +8,7 @@ DSMR Reader's documentation
    screenshots
    installation
    application
+   faq
    changelog
    contributing
    credits