Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-21 15:50:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1187 commits 4 branches 17 tags 4 MiB
Commit graph

271 commits

Author SHA1 Message Date
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
f-kessler ea68fabc12
logging fixed 2019-03-14 11:41:38 +01:00
f-kessler 1eae3098e0
Add hue plugin 2019-03-03 16:13:06 +01:00
PeterLaemmle 53efd1467a
Update Telegram.py 
Pleasing the Codacy BOT ;-)
 2018-10-29 16:19:12 +01:00
PeterLaemmle 5681d33832
Update Telegram.py 
Allow definition of routing origin in configuration file
 2018-10-28 21:30:41 +01:00
PeterLaemmle 6fa93f2f99
Update Telegram.py 2018-10-28 21:03:57 +01:00
PeterLaemmle f35ca75688
Update Telegram.py 2018-10-28 20:48:52 +01:00
PeterLaemmle 97e00d239c
Update Telegram.py 
-Add routing per overlay in overview map
-Switch to SSL communication
 2018-10-28 17:51:13 +01:00
PeterLaemmle 203bbedaa9
Update Telegram.py 
- Remove redundant concatenation
- Ensure German descriptions in maps
 2018-10-19 17:45:03 +02:00
Bastian Schroll 9ad1ed74ef
Update Pushover.py 
remove trailing whitespaces [Codacy]
 2018-10-16 10:03:04 +02:00
Florian c00146ccd0
Update Pushover.py 
fixing line-indentations - 2nd trial
 2018-10-14 12:26:35 +02:00
Florian a4b19b66b9
fixing line indentations 2018-10-13 23:18:09 +02:00
Florian 4f8c15d7d0
Update Pushover.py 
Changing priority depending on ZVEI / RIC
 2018-10-13 23:10:31 +02:00
Bastian Schroll bf31a04e07 remove NMA 2018-09-05 07:18:06 +02:00
Bastian Schroll aa20cd0cfb
Merge pull request #354 from CJHarms/ffagent-plugin-fixes 
FF Agent Plugin Fixes
(Typo and Debugging)
 2018-02-22 08:36:55 +01:00
CJHarms 3ed90b4a97 Revert "Convert alarmHeaders to OrderedDict" 
This reverts commit 9257cb2cfe.
 2018-02-19 17:37:02 +01:00
CJHarms 9257cb2cfe Convert alarmHeaders to OrderedDict 
Used OrderedDict for the alarmHeaders to make sure the Dictionary Order is preserved to serve a correctly formated and ordered JSON when using Perl <3.6
 2018-02-16 22:07:45 +01:00
CJHarms 14df7d7fa4 Fixed small Typo 
Fixed a small Typo
 2018-02-13 18:31:40 +01:00
CJHarms fcae71a7d1 Added some more Logging 
Added more Debug Logging for the alarmHeaders
 2018-02-13 18:31:04 +01:00
Bastian Schroll cf1b5b3fc4 PEP8 changes to pushover 2018-01-15 06:56:12 +01:00
Florian 098fcc2c46
Increasing functions for FMS and ZVEI 
- reading new sections from config
- enabling wildcard-handling
- sending POCSAG, ZVEI and FMS
 2018-01-14 23:35:31 +01:00
Bastian Schroll 7c6611a072 fix mysql plugin 2018-01-03 12:10:20 +01:00
Jan-Hendrik Plogmann 46f7719c89 fixed syntax 2017-12-23 12:37:13 +01:00
Jan-Hendrik Plogmann b565a31637 added mysql Port to mysql connect and config 2017-12-23 12:35:02 +01:00
Bastian Schroll 02d7ba2055
Merge branch 'develop' into fix_http_req 2017-12-19 11:40:01 +01:00
Bastian Schroll 4646012723 comment for FE in source 2017-12-19 11:28:04 +01:00
Bastian Schroll 0539e33207 fix copy fail 
only made a ref not a real copy
 2017-12-19 09:05:27 +01:00
Bastian Schroll 84932346b5 fix http request plugin bug 
data field overwrite bug
 2017-12-19 08:35:10 +01:00
Bastian Schroll 5b9c8d75d9 fix indentation level 2017-10-03 19:20:38 +02:00
Bastian Schroll de6073e8f6 fix indentation level 2017-10-03 18:42:38 +02:00
Bastian Schroll cea266709c fix indentation level 2017-10-03 18:39:18 +02:00
Bastian Schroll a74ef0fe45 fix indentation level 2017-10-03 18:37:09 +02:00
Bastian Schroll cb0fd53713 insert history flag for netIdent 2017-10-03 18:26:16 +02:00
Bastian Schroll acbef6591c edits for codacy (#310) 2017-10-02 07:25:22 +02:00
PeterLaemmle d4946bf714 Update Telegram.py 
Import libraries urllib and googlemaps only if RICforLocationAPIKey is defined.
 2017-09-30 18:11:20 +02:00
Bastian Schroll 84d39d0686 revert last merge 
see #296
 2017-09-15 06:33:52 +02:00
Bastian Schroll 42e7de7d4c Merge pull request #286 from PeterLaemmle/develop 
Improve code style
 2017-08-06 15:18:44 +02:00
Jockel 311b183265 added support for custom texts with telegram 2017-07-31 07:34:14 +02:00
PeterLaemmle a4c9d8197f Update notifyMyAndroid.py 
Correcting the following issue (https://github.com/Schrolli91/BOSWatch/issues/217)
-Using global for 'fmsAPIKeyList' but no assignment is done
-Using global for 'zveiAPIKeyList' but no assignment is done
-Using global for 'pocAPIKeyList' but no assignment is done
 2017-05-24 19:30:41 +02:00
Bastian Schroll 3ce29711a1 Merge pull request #277 from PeterLaemmle/develop 
Update of Telegram plugin
 2017-05-24 06:14:37 +02:00
Florian f2e7c00fee Fix for leading zeros in RIC 
Prevent from cutting leading zeros in signal-RIC
 2017-05-14 22:53:42 +02:00
PeterLaemmle d7896459ca Update Telegram.py 2017-05-07 19:23:45 +02:00
PeterLaemmle 78092389e9 Update Telegram.py 
Removal of duplicate code.
 2017-05-07 13:38:30 +02:00
Jockel 80a9cdb6f4 removed lineBrakeAllowed 2017-04-25 10:52:03 +02:00
Jockel d3cbbb60d8 added missing lineBrakeAllowed=True 2017-04-25 06:53:15 +02:00
Jan-Hendrik Plogmann d99574239b fixed syntax issues 2017-04-24 20:17:07 +02:00
Jan-Hendrik Plogmann 4e1cf00cb3 read message-text from config 2017-04-24 20:08:37 +02:00
Florian 2e03519333 Fixing message 
Set default-message to alarm
Fixing ZVEI-message; it now contains zvei, and, if available, description
 2017-04-17 10:46:39 +02:00
Florian 142e2ba5b0 Fixing typo 
Removed double-c from conn-string
 2017-04-17 10:00:20 +02:00
Florian 08c671cd09 Update Sms77.py 
Adapting to new API
 2017-04-16 23:48:46 +02:00
Florian 642d95b11a Enabling typ-handling 
Enable FMS and ZVEI-handling for plugin; message is set depending on the available information and processed to the http-handling. If typ is invalid an empty message will be sent.
The text of the message can be adapted with regard to the information resulting from decoding
 2017-04-16 23:47:08 +02:00
Mikrocontroller c77f2a9fdd Encode data URL-safe, support of multiple URLs 2017-04-12 23:20:40 +02:00
Florian 7d7c33e208 Create boswatch_cleanup.sql 
Extracted routines to cleanup old database-entries.
 2017-04-04 22:17:54 +02:00
Florian 7abda0bc50 Delete events 
Delete events from default-installation and extract them to a separate file
 2017-04-04 22:16:28 +02:00
Jockel 07c3a98981 base build 2017-02-20 10:25:56 +01:00
Bastian Schroll 63e01a486d Merge pull request #208 from PeterLaemmle/master 
Update Telegram.py
 2017-02-14 20:57:23 +01:00
Bastian Schroll 3c00628b2d some edits for code quallity 2017-02-12 10:04:31 +01:00
PeterLaemmle df24ee4e9e Update Telegram.py 
Added FMS and ZVEI support
 2017-02-01 20:41:35 +01:00
Florian 8724cc64fe Update eMail.py 
Adapting to master-branch (#200)
 2017-01-25 22:03:04 +01:00
Florian 20e9f567a0 Update eMail.py 
Fixing if-condition for TLS
 2017-01-16 21:22:22 +01:00
Florian 8cdfef4bce Update eMail.py 
Using only SMTP via SSL can lead to errors depending on the configuration of the mail server
As there is no switch in the config file (which is good so) the approach is to use SSL first and, if this fails, switch to non-SSL connection.

Due to the importance of this plugin the pull request is affecting the master-branch.
 2017-01-16 21:20:14 +01:00
Florian 7ad21a7a6d Update eMail.py 
Fixing wrong variable - globals to globalVars
 2017-01-16 13:08:17 +01:00
Florian 7390a539d3 MySQL.py 
Adapting to global net-identifiers
 2016-12-22 22:37:06 +01:00
Bastian Schroll 14d1dedcec fix comment bug 2016-11-20 13:37:29 +01:00
Bastian Schroll edfc38bffb resolve ununsed code imports 2016-11-20 13:34:24 +01:00
Bastian Schroll e3b3377f9e resolve some Code Style Problems 2016-11-20 13:05:24 +01:00
Bastian Schroll 1877c7f367 Merged branch develop into develop 2016-11-20 12:51:50 +01:00
Bastian Schroll 95599577b0 Merge pull request #160 from thejockel/develop 
added var for static sub ric messages
 2016-11-19 17:47:24 +01:00
thejockel 60f7368c9d Update README.md 2016-11-06 09:17:53 +01:00
Bastian Schroll f7cb657d72 Merged branch develop into develop 2016-11-04 19:59:40 +01:00
Bastian Schroll b286606cef Merge pull request #159 from flothi/patch-1 
Update boswatch.sql
 2016-11-01 17:26:26 +01:00
flothi cf3ae2d6dc Update boswatch.sql 
Add error-handling: 
Rename existing columns from old versions to new (correct) spelling.
 2016-10-31 23:16:18 +01:00
flothi cd80d7760d Update boswatch.sql 
Adapting table 'poc' to script and changed the letter 'k' to 'c' in function.
 2016-10-31 21:30:04 +01:00
fwmarcel 5567ab3c06 FMS and ZVEI added 2016-10-29 15:47:35 +02:00
fwmarcel e6144a367f yowsup added 2016-10-29 15:46:36 +02:00
Bastian Schroll 78cecc7ef5 Merge remote-tracking branch 'refs/remotes/origin/master' 
Conflicts:
	plugins/eMail/eMail.py
 2016-10-27 22:11:19 +02:00
fwmarcel cf0ab3de28 Update eMail.py 2016-10-26 20:48:02 +02:00
PeterLaemmle 4f7976402a Update Telegram.py 
Import telegram errors
 2016-10-26 15:40:54 +02:00
PeterLaemmle d58e887092 Update Telegram.py 2016-10-16 16:07:47 +02:00
PeterLaemmle 6dba081961 Update Telegram.py 2016-10-14 16:36:00 +02:00
PeterLaemmle 3f7c2a4774 Update Telegram.py 2016-10-14 14:12:03 +02:00
PeterLaemmle 22aea69136 Update Telegram.py 
Added exception for Telegram errors
 2016-10-14 14:04:35 +02:00
Bastian Schroll 8438c1483a Merge pull request #139 from Cryjack/MySQL 
Tabelle für Webuser aus SQL entfernt
 2016-10-05 11:24:35 +02:00
Ricardo Krippner 9dbf748737 removed table for webuser 2016-10-05 09:57:13 +02:00
Bastian Schroll 0f64e6d8e6 Merge pull request #137 from PeterLaemmle/patch-2 
Update notifyMyAndroid.py
 2016-10-04 12:57:43 +02:00
PeterLaemmle 7eb5083553 Update notifyMyAndroid.py 
Remove needless global declaration in notifyMyAndroid.py main- on onLoad-function.
 2016-10-04 11:38:42 +02:00
Bastian Schroll 92ed27db03 Merge pull request #135 from PeterLaemmle/patch-2 
Update Telegram.py
 2016-10-04 09:37:12 +02:00
PeterLaemmle 22cb035f18 Update Telegram.py 
Remove needless global declaration in Telegram.py main function.
 2016-10-04 08:29:02 +02:00
Bastian Schroll 7bf7f3c47b remove some unnecessary pass statements 2016-10-03 16:45:12 +02:00
Bastian Schroll 6b520881b6 resolve some codacy problems 2016-10-03 16:32:54 +02:00
PeterLaemmle bae19499ad Update Telegram.py 2016-10-03 16:09:20 +02:00
Bastian Schroll 25752da5db little change on httpRequest 2016-10-03 13:38:30 +02:00
Bastian Schroll 651157c274 Merge remote-tracking branch 'refs/remotes/thejockel/develop' 
Conflicts:
	plugins/httpRequest/httpRequest.py
 2016-10-03 13:36:50 +02:00
Jan-Hendrik Plogmann 06c5846709 added error logging for http plugin 2016-10-03 12:50:20 +02:00
Bastian Schroll e938cdcd6d rename globals. call to globalVars. 2016-10-03 12:02:18 +02:00
Bastian Schroll f8fcda94b6 rename globals to globalVars 
to prevent to redifine an builtin function
 2016-10-03 11:56:27 +02:00
Bastian Schroll 76dbdc0692 bug in telegram plugin 2016-10-02 22:59:14 +02:00
Bastian Schroll b444f257ac change encoding tag to utf-8 2016-10-02 22:45:15 +02:00
Bastian Schroll 77fb7fb44f remove trailing whitespaces 
to improve codacy rating
 2016-10-02 21:28:04 +02:00