Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2025-12-06 07:42:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
977 commits 4 branches 17 tags 4 MiB
Commit graph

977 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian c26deb995e
Update CHANGELOG.md 2018-10-15 20:53:16 +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 2761ace2b0
Update config.template.ini 
Adding config-parts for new functions
 2018-10-13 23:16:01 +02:00
Florian 4f8c15d7d0
Update Pushover.py 
Changing priority depending on ZVEI / RIC
 2018-10-13 23:10:31 +02:00
Bastian Schroll 942a738704
Merge pull request #374 from Schrolli91/remove_NMA 
Remove old NMA Files
 2018-09-08 17:32:57 +02:00
Bastian Schroll 01eb1b870a remove .idea files 2018-09-06 06:32:54 +02:00
Bastian Schroll 9b33f78087 Merge remote-tracking branch 'origin/remove_NMA' into remove_NMA 2018-09-06 06:32:09 +02:00
Bastian Schroll da4904e696 edit changelog 2018-09-06 06:32:00 +02:00
Bastian Schroll af9e01398c edit changelog 2018-09-05 07:21:50 +02:00
Bastian Schroll bf31a04e07 remove NMA 2018-09-05 07:18:06 +02:00
Bastian Schroll 04ef809e51 fix changelog 2018-08-16 20:39:37 +02:00
Bastian Schroll 110d3bf66f prepare after release changes 2018-08-16 20:19:47 +02:00
Bastian Schroll 9ad6da6af2
Merge pull request #370 from f-kessler/develop 
Clear buffer after multicastAlarm_ric received
 2018-08-16 20:11:01 +02:00
f-kessler cf7e8ead5a
Update CHANGELOG.md 2018-08-16 10:58:10 +02:00
Bastian Schroll 95262e0c7c edit dev version 2018-08-15 07:26:22 +02:00
f-kessler e5db9fed09
fixed indenting bug 2018-08-11 16:43:38 +02:00
f-kessler ce144c82e1
moved delete to the end of the function 2018-08-11 13:37:30 +02:00
f-kessler 8c1351ccbd
fixed the delete of all contents in multiList 2018-08-11 12:52:30 +02:00
f-kessler 86c0467ee2
Updated description for the multicastAlarm_delimiter_ric 2018-08-10 23:19:08 +02:00
f-kessler 58ad0e5308
Clear buffer after multicastAlarm_ric received 
Fix for networks that mix normal alarms with multicastAlarms (delimiter needs to be deactivated).
If the delimiter is deactivated, RICs in the buffer will be deleted only if they are older than multicastAlarm_ignore_time. This could cause a mixture of RICs of the current and the privious multicastAlarm. This problem can be fixed, by clearing the buffer after the multicastAlarm sequence has finished.
 2018-08-10 23:12:42 +02:00
f-kessler bbeda7f843
Merge pull request #1 from Schrolli91/develop 
Develop Update from original
 2018-08-10 22:29:49 +02:00
Bastian Schroll 5e267c8c13
Merge pull request #357 from f-kessler/dev-multicast-alarm-enhanced 
Enhancement for multicastAlarm. The RICs configured in multicastAlarm…
 2018-02-23 22:14:16 +01:00
f-kessler fadb1de813 347 und 357 hinzugefügt 2018-02-23 14:42:47 +01:00
f-kessler 6ce67f24dd Enhancement for multicastAlarm. The RICs configured in multicastAlarm_delimiter_ric and multicastAlarm_ric no longer need to be included in allow_ric or filter_range_start/filter_range_end. 2018-02-22 14:20:33 +01: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
Florian 0468db2647
Fixing deprecated functions 
Replacing old functions
 2018-02-15 12:20:39 +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 5209ac0804
edit comment in config (%FUNCTEXT%) 2018-01-18 08:00:30 +01:00
Bastian Schroll 7566ff014c
Merge pull request #352 from Schrolli91/ft-Pushover 
Pushover-fix
 2018-01-18 07:57:38 +01:00
Bastian Schroll cf1b5b3fc4 PEP8 changes to pushover 2018-01-15 06:56:12 +01:00
Bastian Schroll f92ce0d5f8 edit CL 2018-01-15 06:55:52 +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
Florian 173e552018
Enabling FMS and ZVEI for Pushover 
- enabling alarmtype-specific titles and messages (and prios)
 2018-01-14 23:33:39 +01:00
Bastian Schroll 7fe28aa765
Merge pull request #347 from Schrolli91/fix_mysql_plugin 
fix mysql plugin
 2018-01-03 13:48:26 +01:00
Bastian Schroll 64a5fe5868 edit CL 2018-01-03 12:13:43 +01:00
Bastian Schroll 7c6611a072 fix mysql plugin 2018-01-03 12:10:20 +01:00
Bastian Schroll 52e724be5d fix travis build 2017-12-23 18:24:05 +01:00
Bastian Schroll 16f576064e fix travis build 2017-12-23 14:54:07 +01:00
Bastian Schroll 20becf5337
Merge pull request #345 from Schrolli91/add_mysql_port 
Add mysql port
 2017-12-23 14:12:55 +01:00
Bastian Schroll c212eac45b edit CL 2017-12-23 13:24:02 +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 25365b0ba0
Merge pull request #341 from Schrolli91/new_version 
Prepare for new Version
 2017-12-22 13:16:43 +01:00
Bastian Schroll 5cabb9ab4d dev ready for next version 2017-12-21 09:31:06 +01:00
Bastian Schroll ba1c35b44d dev ready for next version 2017-12-21 09:27:00 +01:00
Bastian Schroll 48e518deac Merge branch 'new_version' into develop 2017-12-21 09:24:45 +01:00