Release of DSMR-reader version 1.1! \o/

dsmrreader · Apr 23, 2016 · 0be3c25 · 0be3c25
2 parents 3e6a1d1 + 69f5f23
commit 0be3c25
Show file tree

Hide file tree

Showing 58 changed files with 2,743 additions and 725 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,15 @@
 [![Documentation Status](http://readthedocs.org/projects/dsmr-reader/badge/?version=latest)](http://dsmr-reader.readthedocs.org/en/latest/?badge=latest)
 
 
+# Screenshots
+
+## English
+See [Read The Docs, in English](http://dsmr-reader.readthedocs.org/en/latest/screenshots.html). Screenshots also have a description regarding features displayed. 
+
+## Dutch (Nederlands)
+Zie [Read The Docs, in het Nederlands](http://dsmr-reader.readthedocs.org/nl/latest/screenshots.html). Bij elke screenshot staat een korte toelichting over de functionaliteiten.
+
+
 # Documentation
 
 ## English

diff --git a/deploy.sh b/deploy.sh
@@ -20,13 +20,18 @@ echo ""
 echo " --- Merging/updating checkout."
 git merge FETCH_HEAD
 
-
 echo ""
 echo ""
 echo " >>> Running post-deployment script. <<<"
 ./post-deploy.sh
 
 
+echo ""
+echo ""
+echo " --- Now at version: "
+python -c 'import dsmrreader ; print(dsmrreader.__version__)'
+
+
 echo ""
 echo ""
 echo " >>> Deployment complete. <<<"
diff --git a/docs/_static/screenshots/archive.png b/docs/_static/screenshots/archive.png
diff --git a/docs/_static/screenshots/backupsettings.png b/docs/_static/screenshots/backupsettings.png
diff --git a/docs/_static/screenshots/compare.png b/docs/_static/screenshots/compare.png
diff --git a/docs/_static/screenshots/configuration.png b/docs/_static/screenshots/configuration.png
diff --git a/docs/_static/screenshots/dashboard.png b/docs/_static/screenshots/dashboard.png
diff --git a/docs/_static/screenshots/energysupplierprice.png b/docs/_static/screenshots/energysupplierprice.png
diff --git a/docs/_static/screenshots/export.png b/docs/_static/screenshots/export.png
diff --git a/docs/_static/screenshots/statistics.png b/docs/_static/screenshots/statistics.png
diff --git a/docs/_static/screenshots/status.png b/docs/_static/screenshots/status.png
diff --git a/docs/_static/screenshots/trends.png b/docs/_static/screenshots/trends.png
diff --git a/docs/application.rst b/docs/application.rst
@@ -3,6 +3,13 @@
 Using the application
 =====================
 
+DSMR 2.x (legacy)
+-----------------
+Note: The application's default DSMR version used is 4.x. This version is also the default for any recent smart meters placed at your home. 
+
+Make sure to alter this setting in the backend's configuration page to DSMR 2.x when required!  
+
+
 Viewing the application
 -----------------------
 Now it's time to view the application in your browser to check whether the GUI works as well. Just enter the ip address or hostname of your RaspberryPi in your browser. 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,6 +1,17 @@
 Changelog
 =========
 
+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>`_).
+- Easily add notes (`#110 <https://github.com/dennissiemensma/dsmr-reader/issues/110>`_).
+- Export data points in CSV format (`#2 <https://github.com/dennissiemensma/dsmr-reader/issues/2>`_).
+- Allow day/month/year comparison (`#94 <https://github.com/dennissiemensma/dsmr-reader/issues/94>`_).
+- Docs: Add FAQ and generic application info (`#113 <https://github.com/dennissiemensma/dsmr-reader/issues/113>`_).
+- Support for Iskra meter (DSMR 2.x) (`#120 <https://github.com/dennissiemensma/dsmr-reader/issues/120>`_).
+
+
 v1.0.1 - 2016-04-07
 ^^^^^^^^^^^^^^^^^^^
 - Update licence to OSI compatible one (`#119 <https://github.com/dennissiemensma/dsmr-reader/issues/119>`_).

diff --git a/docs/credits.rst b/docs/credits.rst
@@ -42,6 +42,7 @@ Testers & contributors
 
 - `Jeroen Peters <https://www.linkedin.com/in/jeroenpeters1986>`_ (`Github profile <https://github.com/jeroenpeters1986>`_)
 - `Daniel ter Horst <https://www.linkedin.com/in/danielterhorst>`_ (`Github profile <https://github.com/danielterhorst>`_)
+- `Sander de Leeuw <https://www.linkedin.com/in/sander-de-leeuw-58313aa0>`_ (`Github profile <https://github.com/sdeleeuw>`_)
 - `Gert Schaafsma <https://www.linkedin.com/in/gertschaafsma>`_
 - `Bert-Jan Vos <https://www.linkedin.com/in/bert-jan-vos-82011712>`_
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -5,6 +5,7 @@ DSMR Reader's documentation
    :maxdepth: 2
 
    intro
+   screenshots
    installation
    application
    changelog

diff --git a/docs/intro.rst b/docs/intro.rst
@@ -16,4 +16,9 @@ I advise to only use this tool when you have basic Linux knowledge or have any i
 
 Github
 ------
-The project can be found here: https://github.com/dennissiemensma/dsmr-reader
+The project can be found here: https://github.com/dennissiemensma/dsmr-reader
+
+
+Languages
+---------
+The entire application and it's code is written in English. The entire interface however is also translated into Dutch and will be triggered depending on you browser's language preference.
diff --git a/docs/locale/nl/LC_MESSAGES/application.mo b/docs/locale/nl/LC_MESSAGES/application.mo