Released v1.26.0

dsmrreader · Oct 28, 2018 · fbf2ad2 · fbf2ad2
1 parent d848f26
commit fbf2ad2
Show file tree

Hide file tree

Showing 66 changed files with 352 additions and 2,921 deletions.
diff --git a/README.md b/README.md
@@ -21,14 +21,14 @@
 
 
 ## Features
-- Application languages supported: **Dutch (Nederlands)**  and **English**. The language used in your browser dynamicly decides the language applied in the application.
+- Application languages supported: **Dutch (Nederlands)**  and **English**. The language used in your browser dynamically decides the language used in the application.
 - Optional Support for **exporting data to third-parties**: MinderGas.nl, PVOutput.org.
 - Also supports local exports: CSV, SQL back-ups & optional daily upload to Dropbox.
 - Notifications on your devices, supporting **Pushover** and **Prowl** apps!
 - Optional data rotation/retention, keeping your dataset small and portable.
 - Compare two days, months or years with each other.
 - REST API to either insert or read data realtime.
-- Keep track of certain events by sticking your own notes to a day, reminding yourself what happened that day.
+- Keep track of certain events by adding your own notes to a day, reminding yourself what happened that day.
 - Support for MQTT export.
 - Extendable plug-in system.
 - Scrollable graphs.

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -17,6 +17,19 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 ----
 
 
+v1.26.0 - 2018-10-28
+^^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#541 <https://github.com/dennissiemensma/dsmr-reader/issues/541>`_] AmbiguousTimeError causes excessive notifications
+- [`#535 <https://github.com/dennissiemensma/dsmr-reader/issues/535>`_] "All time low" implementeren
+- [`#536 <https://github.com/dennissiemensma/dsmr-reader/issues/536>`_] Retentie-verbeteringen
+
+
+----
+
+
 v1.25.1 - 2018-10-22
 ^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/credits.rst b/docs/credits.rst
@@ -55,6 +55,7 @@ Listed in any order, sorted by name.
 - `Sander de Leeuw <https://www.linkedin.com/in/sander-de-leeuw-58313aa0>`_
 - `sanderdw <https://github.com/sanderdw>`_
 - `Sevickson <https://github.com/sevickson>`_
+- `swerveshot <https://github.com/swerveshot>`_
 - `TampertK <https://github.com/TampertK>`_
 - `ThinkPadNL <https://github.com/ThinkPadNL>`_
 - `thommy101 <https://github.com/thommy101>`_
@@ -63,6 +64,7 @@ Listed in any order, sorted by name.
 - `trbs <https://github.com/trbs>`_
 - `trizz <https://github.com/trizz>`_
 - `ualex73 <https://github.com/ualex73>`_
+- `vavdb <https://github.com/vavdb>`_
 - `voipmeister <https://github.com/voipmeister>`_
 - `WatskeBart <https://github.com/WatskeBart>`_
 - `xirixiz <https://github.com/xirixiz>`_

diff --git a/docs/locale/nl/LC_MESSAGES/admin/backup_dropbox.po b/docs/locale/nl/LC_MESSAGES/admin/backup_dropbox.po
@@ -79,15 +79,3 @@ msgstr ""
 "Kopieer de gegenereerde toegangstoken naar de DSMR-reader instellingen "
 "onder Dropbox-configuratie. DSMR-reader zou vrij vlot gemaakte backups "
 "moeten uploaden naar je Dropbox-account."
-
-#~ msgid "Integration: Dropbox"
-#~ msgstr "Integratie: Dropbox"
-
-#~ msgid "Contents"
-#~ msgstr "Inhoudsopgave"
-
-#~ msgid "Dropbox: Automated backup sync"
-#~ msgstr "Dropbox: Automatisch backups uploaden"
-
-#~ msgid "*How can I link my Dropbox account for backups?*"
-#~ msgstr "*Hoe kan ik mijn Dropbox-account koppelen voor de backups?*"
diff --git a/docs/locale/nl/LC_MESSAGES/admin/datalogger.po b/docs/locale/nl/LC_MESSAGES/admin/datalogger.po
@@ -106,103 +106,3 @@ msgstr ""
 " en zijn tevens de enige belangrijke data die er voor de lange termijn "
 "toe doen. Bijvoorbeeld wanneer je terug wilt kijken naar een specifieke "
 "dag, maand of jaar."
-
-#~ msgid "Notes"
-#~ msgstr "Opmerkingen"
-
-#~ msgid ""
-#~ "All source data read is stored "
-#~ "indefinitely, but you can apply "
-#~ "retention, keeping the source data only"
-#~ " for a certain amount of time. "
-#~ "**Please note that at least one "
-#~ "reading per hour is preserved for "
-#~ "your convenience.**"
-#~ msgstr ""
-#~ "Alle ingelezen brongegevens worden oneindig"
-#~ " bewaard, maar je kunt ervoor kiezen"
-#~ " om retentie toe te passen, zodat "
-#~ "de gegevens beperkt bewaard blijven. "
-#~ "**N.B.: Van elk uur wordt er "
-#~ "altijd tenminste één meting bewaard, "
-#~ "voor de zekerheid.**"
-
-#~ msgid ""
-#~ "This will save a huge amount of"
-#~ " disk space and decreases the size"
-#~ " of backups significantly as well. "
-#~ "Day statistics will never be deleted."
-#~ msgstr ""
-#~ "Dit bespaart aanzienlijk veel schijfruimte "
-#~ "én verkleint de grootte van back-"
-#~ "up's significant. Dagstatistieken worden nooit"
-#~ " verwijderd."
-
-#~ msgid "Retention"
-#~ msgstr "Retentie"
-
-#~ msgid "Contents"
-#~ msgstr "Inhoudsopgave"
-
-#~ msgid "How to enable"
-#~ msgstr "Hoe in te schakelen"
-
-#~ msgid ""
-#~ "The admin configuration has a section"
-#~ " called \"Retention configuration\". You "
-#~ "can specify whether you want retention"
-#~ " at all and set the lifetime of"
-#~ " the data being stored."
-#~ msgstr ""
-#~ "Het beheerder-paneel heeft een sectie"
-#~ " genaamd \"Retentieconfiguratie\". Daar kun "
-#~ "je aangeven of je überhaupt retentie "
-#~ "wilt inschakelen, en zo ja, hoelang "
-#~ "data bewaard blijft."
-
-#~ msgid "Data affected"
-#~ msgstr "Geraakte gegevens"
-
-#~ msgid "DSMR-readings"
-#~ msgstr "DSMR-metingen"
-
-#~ msgid ""
-#~ "The source of all data. It is, "
-#~ "however, only read and processed once,"
-#~ " so it can be discarded safely "
-#~ "after processing."
-#~ msgstr ""
-#~ "De bron van alle gegevens. Ze "
-#~ "worden echter slechts eenmaal ingelezen "
-#~ "en kunnen, na verwerking, veilig worden"
-#~ " verwijderd."
-
-#~ msgid "Electricity Consumption"
-#~ msgstr "Elektriciteitsconsumptie"
-
-#~ msgid ""
-#~ "This is aggregated data either created"
-#~ " from a single DSMR-reader or a"
-#~ " minute worth of DSMR-readings, "
-#~ "depending on whether you've enabled "
-#~ "grouping."
-#~ msgstr ""
-#~ "Geaggregeerde gegevens van ofwel een "
-#~ "enkele DSMR-meting of een groep "
-#~ "van DSMR-metingen, afhankelijk van je"
-#~ " groeperingsinstellingen."
-
-#~ msgid "Gas Consumption"
-#~ msgstr "Gasconsumptie"
-
-#~ msgid ""
-#~ "This data type is aggregated from "
-#~ "any differences in 'extra device "
-#~ "timestamp' occurrences in DSMR-readings."
-#~ msgstr ""
-#~ "Dit data type is afkomstig van de"
-#~ " gasmetergegevens uit de DSMR-metingen."
-
-#~ msgid "Data kept/unaffected"
-#~ msgstr "Buitengesloten gegevens"
-
diff --git a/docs/locale/nl/LC_MESSAGES/admin/mindergas.po b/docs/locale/nl/LC_MESSAGES/admin/mindergas.po
@@ -68,12 +68,3 @@ msgstr ""
 "terugwerkende kracht meterstanden door te geven via de API. De "
 "applicatie ondersteunt dat om die reden niet. Je kunt oude meterstanden "
 "echter wel via hun website handmatig invoeren, indien gewenst."
-
-#~ msgid "Contents"
-#~ msgstr "Inhoudsopgave"
-
-#~ msgid "Mindergas.nl: Automated gas meter position export"
-#~ msgstr "Mindergas.nl: Automatisch gasmeterstanden exporteren"
-
-#~ msgid "*How can I link my mindergas.nl account?*"
-#~ msgstr "*Hoe kan ik mijn mindergas.nl-account koppelen?*"
diff --git a/docs/locale/nl/LC_MESSAGES/admin/notifications.po b/docs/locale/nl/LC_MESSAGES/admin/notifications.po
@@ -146,85 +146,3 @@ msgid ""
 msgstr ""
 "Als er een nieuwe key is gegenereerd, zie je deze direct. De key is te vinden "
 "zoals in onderstaande screenshot (er staat een rood kader om de key)."
-
-#~ msgid ""
-#~ "Currently, two mobile platforms are supported: Android and iOS. The "
-#~ "supported app for Android is `NotifyMyAndroid <https://www.notifymyandroid."
-#~ "com>`_. The supported app for iOS is `Prowl <https://www.prowlapp.com>`_."
-#~ msgstr ""
-#~ "Op dit moment worden twee platforms ondersteund: Android en iOS. De "
-#~ "ondersteunde app voor Android is `NotifyMyAndroid <https://www."
-#~ "notifymyandroid.com>`_. De ondersteunde app voor iOS is `Prowl <https://"
-#~ "www.prowlapp.com>`_."
-
-#~ msgid ""
-#~ "In the DSMR-reader settings for the Usagenotifications, tick the Send "
-#~ "Notifications checkbox and select the notification service you want to "
-#~ "use. Then copy the API key from the notification service and paste in into "
-#~ "the the textbox for the API key. When you save these settings, your first "
-#~ "notification should be sent after midnight. Don't worry, the notification "
-#~ "will be sent with low priority and will not wake you up."
-#~ msgstr ""
-#~ "In de DSMR-reader instellingen voor de Verbruiksnotificaties zet je een "
-#~ "vinkje bij Stuur Notificaties en selecteer daaronder welke "
-#~ "notificatieservice je wilt gebruiken. Kopieeër daarna de API key van de "
-#~ "notificatieservice en plak deze in het tekstveld voor de API key. Als je "
-#~ "deze instellingen opslaat zul je na middernacht je eerste notificatie "
-#~ "ontvangen. Geen nood, de notificatie wordt altijd verstuurd met lage "
-#~ "prioriteit, deze maakt je dus niet wakker."
-
-#~ msgid "*How do I obtain my API key for NotifyMyAndroid?*"
-#~ msgstr "*Hoe haal ik de API key op voor NotifyMyAndroid?*"
-
-#~ msgid ""
-#~ "After you have downloaded NotifyMyAndroid and signed up for an account you "
-#~ "should be able to `login to your NotifyMyAndroid account <https://www."
-#~ "notifymyandroid.com/index.jsp>`_. Now go to \"`My Account <https://www."
-#~ "notifymyandroid.com/account.jsp>`_\", you should see an overview of your "
-#~ "current API keys if you have any. To create an API key for the DSMR-"
-#~ "reader, please click **\"Generate New Key\"**."
-#~ msgstr ""
-#~ "Nadat je NotifyMyAndroid hebt gedownload en een account hebt aangemaakt "
-#~ "zou je moeten kunnen `inloggen op je NotifyMyAndroid-account <https://www."
-#~ "notifymyandroid.com/index.jsp>`_. Ga nu naar \"`My Account <https://www."
-#~ "notifymyandroid.com/account.jsp>`_\" om een overzicht van je account de "
-#~ "API keys te krijgen als je deze al hebt. Om een API key voor de DSMR-"
-#~ "reader te genereren klik je op **\"Generate New Key\"**."
-
-#~ msgid ""
-#~ "Currently, two mobile platforms are supported: Android and iOS. The "
-#~ "supported app for Android is `Pushover <https://pushover.net>`_. The "
-#~ "supported apps for iOS are `Pushover <https://pushover.net>`_ and `Prowl "
-#~ "<https://www.prowlapp.com>`_."
-#~ msgstr ""
-#~ "Momenteel zijn twee platformen ondersteund: Android en iOS. De app voor "
-#~ "Android is `Pushover <https://pushover.net>`_. De apps voor iOS zijn "
-#~ "`Pushover <https://pushover.net>`_ en `Prowl <https://www.prowlapp.com>`_."
-
-#~ msgid ""
-#~ "After you have downloaded Prowl and signed up for an account you should be "
-#~ "able to `login to your Prowl account <https://www.prowlapp.com/login."
-#~ "php>`_. Now go to \"`API Keys <https://www.prowlapp.com/api_settings.php>`_"
-#~ "\", you should see an overview of your current API keys if you have any. "
-#~ "To create an API key for the DSMR-reader, input a name and click **"
-#~ "\"Generate Key\"**."
-#~ msgstr ""
-#~ "Nadat je Prowl hebt gedownload en een account hebt aangemaakt zou je "
-#~ "moeten kunnen `inloggen op je Prowl-account <https://www.prowlapp.com/"
-#~ "login.php>`_. Ga nu naar \"`API Keys <https://www.prowlapp.com/"
-#~ "api_settings.php>`_\" om een overzicht van je API keys te krijgen als je "
-#~ "deze al hebt. Om een API key voor de DSMR-reader te genereren geef je een "
-#~ "naam op en klik je op **\"Generate Key\"**."
-
-#~ msgid "Contents"
-#~ msgstr "Inhoudsopgave"
-
-#~ msgid "Usage notification: Daily usage statistics on your smartphone"
-#~ msgstr ""
-#~ "Verbruiksnotificaties: Dagelijkse verbruiksstatistieken op je smartphone"
-
-#~ msgid "Which services for sending notifications are supported?"
-#~ msgstr "Welke services voor het sturen van notificaties worden ondersteund?"
-
-#~ msgid "How do I setup usage notifications?"
-#~ msgstr "Hoe stel ik verbruiksnotificaties in?"
diff --git a/docs/locale/nl/LC_MESSAGES/admin/pvoutput.po b/docs/locale/nl/LC_MESSAGES/admin/pvoutput.po
@@ -112,15 +112,3 @@ msgid ""
 msgstr ""
 "Indien je alles correct hebt ingesteld, zul je op korte termijn extra "
 "gegevens moeten zien in PVOutput onder \"Your Outputs\"."
-
-#~ msgid "Integration: PVOutput"
-#~ msgstr "Integratie: PVOutput"
-
-#~ msgid "Contents"
-#~ msgstr "Inhoudsopgave"
-
-#~ msgid "PVOutput.org: Automated electricity consumption export"
-#~ msgstr "PVOutput.org: Automatisch exporteren van verbruik"
-
-#~ msgid "*How can I link my PVOutput.org account?*"
-#~ msgstr "*Hoe kan ik mijn PVOutput.org-account koppelen?*"
diff --git a/docs/locale/nl/LC_MESSAGES/api.mo b/docs/locale/nl/LC_MESSAGES/api.mo
diff --git a/docs/locale/nl/LC_MESSAGES/api.po b/docs/locale/nl/LC_MESSAGES/api.po
@@ -689,6 +689,3 @@ msgstr ""
 #: ../../api.rst:847
 msgid "Full path: ``/api/v2/application/status``"
 msgstr "Volledig pad: ``/api/v2/application/status``"
-
-#~ msgid "API"
-#~ msgstr "API"
diff --git a/docs/locale/nl/LC_MESSAGES/application.mo b/docs/locale/nl/LC_MESSAGES/application.mo
diff --git a/docs/locale/nl/LC_MESSAGES/application.po b/docs/locale/nl/LC_MESSAGES/application.po
@@ -332,6 +332,3 @@ msgstr ""
 "up te zien, waarin je gevraagd wordt om in te loggen. Voor meer informatie over "
 "dit onderwerp `zie de Nginx documentatie <https://www.nginx.com/resources/admin-"
 "guide/restricting-access/>`_."
-
-#~ msgid "Viewing the application"
-#~ msgstr "Bekijk applicatie"
diff --git a/docs/locale/nl/LC_MESSAGES/changelog.mo b/docs/locale/nl/LC_MESSAGES/changelog.mo
diff --git a/docs/locale/nl/LC_MESSAGES/changelog.po b/docs/locale/nl/LC_MESSAGES/changelog.po
@@ -8,8 +8,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DSMR Reader v1.x\n"
 "Report-Msgid-Bugs-To: Dennis Siemensma <github@dennissiemensma.nl>\n"
-"POT-Creation-Date: 2018-10-17 18:30+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Dennis Siemensma <github@dennissiemensma.nl>\n"
 "Language: nl\n"
 "Language-Team: Dennis Siemensma <github@dennissiemensma.nl>\n"
@@ -2037,32 +2035,3 @@ msgstr ""
 #: ../../changelog.rst:868
 msgid "Upgraded Django to 1.8.9."
 msgstr ""
-
-#~ msgid "Contents"
-#~ msgstr "Inhoudsopgave"
-
-#~ msgid "v2.0.0 - 2018-xx-xx"
-#~ msgstr ""
-
-#~ msgid "Support for Python ``3.4`` has been **dropped**!"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "[`#527 <https://github.com/dennissiemensma/dsmr-"
-#~ "reader/issues/527>`_] Docker DSMR Datalogger "
-#~ "(by trizz)"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "[`#xxxxxxxxxxxxx <https://github.com/dennissiemensma/dsmr-"
-#~ "reader/issues/xxxxxxxxxxxxxxxx>`_] yyyyyyyyyyyyyyyy"
-#~ msgstr ""
-
-#~ msgid "v1.25.0 - 2018-xx-xx"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "[`#532 <https://github.com/dennissiemensma/dsmr-"
-#~ "reader/issues/532>`_] Update documentation"
-#~ msgstr ""
-
diff --git a/docs/locale/nl/LC_MESSAGES/contributing.mo b/docs/locale/nl/LC_MESSAGES/contributing.mo
diff --git a/docs/locale/nl/LC_MESSAGES/credits.mo b/docs/locale/nl/LC_MESSAGES/credits.mo
diff --git a/docs/locale/nl/LC_MESSAGES/credits.po b/docs/locale/nl/LC_MESSAGES/credits.po
@@ -378,22 +378,3 @@ msgstr ""
 #: ../../credits.rst:109
 msgid "`Nico Di Rocco <http://nrocco.github.io/>`_"
 msgstr ""
-
-#~ msgid "`dbmnl  <https://github.com/dbmnl >`_"
-#~ msgstr ""
-
-#~ msgid "`raoulteeuwen  <https://github.com/raoulteeuwen >`_"
-#~ msgstr ""
-
-#~ msgid "`raoulteeuwen <https://github.com/raoulteeuwen >`_"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "`Director Responsive Admin <http://web-"
-#~ "apps.ninja/director-free-responsive-admin-"
-#~ "template/>`_"
-#~ msgstr ""
-
-#~ msgid "`Swagger UI Themes <http://meostrander.com/swagger-ui-themes/>`_"
-#~ msgstr ""
-
diff --git a/docs/locale/nl/LC_MESSAGES/donations.mo b/docs/locale/nl/LC_MESSAGES/donations.mo
diff --git a/docs/locale/nl/LC_MESSAGES/donations.po b/docs/locale/nl/LC_MESSAGES/donations.po
@@ -8,8 +8,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DSMR Reader 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-17 18:40+0200\n"
-"PO-Revision-Date: 2018-10-17 18:43+0200\n"
 "Last-Translator: \n"
 "Language: nl\n"
 "Language-Team: \n"
@@ -46,17 +44,3 @@ msgstr ""
 msgid "Link: `Donate using PayPal <https://www.paypal.me/DSiemensma>`_"
 msgstr "Link: `Doneer via PayPal <https://www.paypal.me/DSiemensma>`_"
 
-#~ msgid ""
-#~ "Know that this project **will always be free to use** and I already "
-#~ "do make a decent salary with my regular job. =)"
-#~ msgstr ""
-#~ "Weet dat dit project **altijd gratis te gebruiken zal zijn** en dat "
-#~ "ik momenteel al prima rondkom met mijn doordeweekse baan. Ik hoef er "
-#~ "niet van rond te komen. =)"
-
-#~ msgid ""
-#~ "Please do not pressure me by \"donating for new features\", but only "
-#~ "for liking what you are using so far... Thanks!"
-#~ msgstr ""
-#~ "Doneer alleen uit waardering voor wat je tot nu toe gebruikt en "
-#~ "alsjeblieft niet voor nieuwe features. Bedankt!"
diff --git a/docs/locale/nl/LC_MESSAGES/dropbox.mo b/docs/locale/nl/LC_MESSAGES/dropbox.mo