Commit graph

1057 commits

Author SHA1 Message Date
Bastian Schroll 9a8a00ef83
Update CHANGELOG.md 2019-10-04 21:59:47 +02:00
Bastian Schroll 58c3a9134b
Update CHANGELOG.md 2019-10-04 21:59:25 +02:00
Bastian Schroll edb2329ab7
Update CHANGELOG.md 2019-10-04 21:58:47 +02:00
Bastian Schroll 1a75c1befb
Merge pull request #412 from kruegerj/patch-3
Update CHANGELOG.md
2019-10-04 21:56:28 +02:00
Bastian Schroll 5120bd5751
Merge pull request #411 from kruegerj/patch-2
Update boswatch.sql
2019-10-04 21:56:09 +02:00
Bastian Schroll 116a06eb20
Merge pull request #410 from kruegerj/patch-1
Update MySQL.py
2019-10-04 21:55:38 +02:00
kruegerj fa5acd4d79
Update CHANGELOG.md 2019-10-04 20:39:39 +02:00
kruegerj 2da87a46dd
Update boswatch.sql
Key auf die RIC Spalte hinzugefügt
2019-10-04 14:09:05 +02:00
kruegerj 9e0e448520
Update MySQL.py
INSERT in die Pocsag Tabelle schlägt fehl, da function bei MySQL 8.0 als reserviertes Wort nicht einfach als Spaltenname genutzt werden kann. 
Siehe auch https://dev.mysql.com/doc/refman/8.0/en/keywords.html 
Daher habe ich nun die Spaltennamen escaped, damit funktioniert wieder ein INSERT in MySQL 8.0 Datenbanken
2019-10-04 14:05:48 +02:00
Bastian Schroll 9d708a0fcc
Merge pull request #408 from Schrolli91/Geo_decode-patch
Update poc.py
2019-09-27 11:13:54 +02:00
Florian 82448a737a
Update poc.py 2019-09-26 21:25:11 +02:00
Bastian Schroll 51709d0a61
Update CHANGELOG.md 2019-09-24 10:08:40 +02:00
Bastian Schroll 016bd906c3
Update CHANGELOG.md 2019-09-24 10:07:24 +02:00
Bastian Schroll 860f3d5e7d prepare dev for next release 2019-09-22 09:43:37 +02:00
Bastian Schroll 7a8afb1c51 Merge branch 'develop' 2019-09-22 09:42:31 +02:00
Bastian Schroll dd82fe80ab prepare for release 2019-09-22 09:42:15 +02:00
Bastian Schroll c60c51e565
Merge pull request #405 from Schrolli91/geodecode_poc
Extracting geo-data from poc-message
2019-09-22 00:16:33 +02:00
Florian d45214627a
Update poc.py
Fixing brokes line-ends
2019-09-21 23:50:46 +02:00
Florian 0c19b5ece5
Update poc.py
Switch to enable decoding
2019-09-21 00:35:28 +02:00
Florian 216ee05f18
Update config.template.ini
Implementing global switch to enable geo-decoding
2019-09-21 00:32:52 +02:00
Bastian Schroll 9d8c9c986c
edit changelog 2019-09-08 18:14:24 +02:00
Florian 6130efa762
Update poc.py
Exceptionhandling in case no regex is specified
2019-09-07 22:57:04 +02:00
Florian dab072d03c
Update CHANGELOG.md 2019-09-07 22:12:58 +02:00
Florian 7decb88d8b
Update CHANGELOG.md 2019-09-07 13:41:19 +02:00
Florian ad0673b357
Update CHANGELOG.md 2019-09-05 08:29:57 +02:00
Florian 33b633c475
Update config.template.ini
Performing changes to provide regex for searching coordinates in poc-text
2019-09-05 08:27:44 +02:00
Florian 52fe249ab6
Filtering for geo-data
instead of checking for locations in a specific plugin, a central approach is done here; at the moment, a regex containing coordinates is to be found in the poc-text. The coordinates are parsed and afterwards stored into data as lon/lat.
2019-09-05 08:26:24 +02:00
Bastian Schroll 5663bea32f
Merge pull request #404 from CJHarms/ff-agent-fixes
FF Agent Fixes - Header Ordering
2019-08-30 16:50:12 +02:00
CJHarms 22e13d76bf Merge branch 'ff-agent-fixes' of https://github.com/CJHarms/BOSWatch into ff-agent-fixes 2019-08-28 11:16:40 +02:00
CJHarms ae11c53fe6 Update CHANGELOG.md
FF Agent Fixes dokumentiert und dem Changelog hinzugefügt.
2019-08-28 11:16:17 +02:00
Bastian Schroll 483c4f167e
Update globalVars.py 2019-08-28 11:09:01 +02:00
Bastian Schroll fb188bc5ee
Merge branch 'develop' into ff-agent-fixes 2019-08-28 09:54:19 +02:00
CJHarms 42f841ba15 Update FFAgent.py
Fixed Header Ordering by using Requests Session. Additionally added some Debug Logging.
2019-08-28 09:06:44 +02:00
CJHarms 8599093a6c Update FFAgent.py
Replaced Double Quotes with Single Quotes in the HTTP Request
2019-08-20 10:27:46 +02:00
CJHarms e2ed799b87 Update FFAgent.py
Added some additional Debug Logging
2019-08-19 11:10:56 +02:00
CJHarms bd5f7f4707 Update FFAgent.py
Passing the Headers directly instead of a Dict to prevent "reordering" with Python <3.7.
2019-08-19 10:12:25 +02:00
CJHarms 190e7f36fe Update FFAgent.py
Used json.dumps for the alarmHeaders instead of a OrderedDict to preserve Insertion Order
2019-08-03 10:27:45 +02:00
CJHarms f4c35391b4 Update FFAgent.py
Added a OrderedDict to keep the Content-Type first in a URL Request to prevent HTTP 500 Errors from the FF-Agent API.
2019-08-01 22:20:35 +02:00
Bastian Schroll 861253375f
Merge pull request #394 from f-kessler/hue-plugin
Hue plugin - Async fix
2019-05-03 11:37:32 +02:00
f-kessler af887c2b23
enhancement for deepcopy 2019-04-25 21:35:21 +02:00
Bastian Schroll 9c0ed135bb
Merge branch 'develop' into hue-plugin 2019-03-15 07:30:36 +01:00
f-kessler b1170668b2
moved copy into for loop 2019-03-14 12:07:32 +01:00
f-kessler 07a69d5e26
comment updated 2019-03-14 12:04:35 +01:00
f-kessler b3e63afc9c
deepcopy of alarm data moved to processAlarm 2019-03-14 12:02:00 +01:00
f-kessler ea68fabc12
logging fixed 2019-03-14 11:41:38 +01:00
Bastian Schroll 65dd9b495d Merge branch 'develop' 2019-03-11 12:43:46 +01:00
Bastian Schroll d47635f6ea Merge branch 'fix_readme' into develop 2019-03-11 12:41:02 +01:00
Bastian Schroll 9a3d4ec12b prepare release 2019-03-11 12:40:39 +01:00
Bastian Schroll d7b43ca808 edit readme 2019-03-11 12:38:43 +01:00
f-kessler f86aeb914b
Update alarmHandler.py 2019-03-03 20:38:43 +01:00