Release of v.1.12

.travis.yml

@@ -41,6 +41,7 @@ install:
 before_script:
   - sh -c "if [ '$DB' = 'postgresql' ]; then dropdb -U postgres --if-exists dsmrreader; fi"
   - sh -c "if [ '$DB' = 'postgresql' ]; then createdb -U postgres dsmrreader; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql mysql; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'drop database IF EXISTS dsmrreader;' -u root; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysqladmin create dsmrreader; fi"
 

docs/changelog.rst

@@ -18,6 +18,23 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 
 
 
+v1.12.0 - 2018-01-14
+^^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#72 <https://github.com/dennissiemensma/dsmr-reader/issues/72>`_] Source data retention
+- [`#414 <https://github.com/dennissiemensma/dsmr-reader/issues/414>`_] add systemd service files - by meijjaa
+- [`#405 <https://github.com/dennissiemensma/dsmr-reader/issues/405>`_] More updates to the Dutch translation of the documentation - by lckarssen
+- [`#404 <https://github.com/dennissiemensma/dsmr-reader/issues/404>`_] Fix minor typo in Dutch translation - by lckarssen
+- [`#398 <https://github.com/dennissiemensma/dsmr-reader/issues/398>`_] iOS Web App: prevent same-window links from being opened externally - by Joris Vervuurt
+- [`#399 <https://github.com/dennissiemensma/dsmr-reader/issues/399>`_] Veel calls naar api.buienradar
+- [`#406 <https://github.com/dennissiemensma/dsmr-reader/issues/406>`_] Spelling correction trends page
+- [`#413 <https://github.com/dennissiemensma/dsmr-reader/issues/413>`_] Hoge CPU belasting op rpi 2 icm DSMR 5.0 meter
+- [`#419 <https://github.com/dennissiemensma/dsmr-reader/issues/419>`_] Requirements update (January 2018)
+
+
+
 v1.11.0 - 2017-11-24
 ^^^^^^^^^^^^^^^^^^^^
 

docs/credits.rst

@@ -11,12 +11,8 @@ Special thanks for supplying code contributions
 Also many thanks to the contributions (reporting) of
 ----------------------------------------------------
 Listed in any order, sorted by name.
-<<<<<<< HEAD
-
-=======
-
+
 - `allureGOT <https://github.com/allureGOT>`_
->>>>>>> refs/heads/378-duplicate-timestamp-handling
 - `balk77 <https://github.com/balk77>`_
 - `Bert-Jan Vos <https://www.linkedin.com/in/bert-jan-vos-82011712>`_
 - `dajappie <https://github.com/dajappie>`_
@@ -32,10 +28,13 @@ Listed in any order, sorted by name.
 - `HugoDaBosss <https://github.com/HugoDaBosss>`_
 - `Jelte Leijenaar <https://www.linkedin.com/in/jelteleijenaar>`_ 
 - `Jeroen Tielen <https://nl.linkedin.com/in/jeroentielen>`_
+- `Joris Vervuurt <https://github.com/jorisvervuurt>`_
 - `ju5t <https://github.com/ju5t>`_
 - Koen Volleberg
+- `lckarssen <https://github.com/lckarssen>`_
 - `MarsWarrior <https://github.com/MarsWarrior>`_
 - `mbnn <https://github.com/mbnn>`_
+- `meijjaa <https://github.com/meijjaa>`_
 - `michielvisser <https://github.com/michielvisser>`_
 - `mkruiver <https://github.com/mkruiver>`_
 - `Paul Vinken <https://nl.linkedin.com/in/paul-vinken-934a7a44>`_
@@ -51,7 +50,7 @@ Listed in any order, sorted by name.
 - `WatskeBart <https://github.com/WatskeBart>`_
 - `xirixiz <https://github.com/xirixiz>`_
 
-
+ 
 Software used
 -------------
 Please note and respect their licences as well, if any. Credits to the following software and projects:

docs/faq.rst

@@ -156,6 +156,15 @@ For **MySQL** restores::
     In case the version differs, you can try forcing a deployment reload by: ``sudo su - dsmr`` and then executing ``./post-deploy.sh``.
 
 
+How do I enable timezone support for MySQL?
+-------------------------------------------
+
+`Check these docs <https://dev.mysql.com/doc/refman/5.7/en/mysql-tzinfo-to-sql.html>`_ for more information about how to enable timezone support on MySQL.
+On recent versions it should be as simple as executing the following command as root/sudo user::
+
+    mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
+
+
 Feature/bug report
 ------------------
 *How can I propose a feature or report a bug I've found?*

docs/index.rst

@@ -10,6 +10,7 @@ DSMR Reader's documentation
    installation
    application
    settings
+   retention
    api
    mqtt
    mindergas