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

956 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bastian Schroll 95262e0c7c edit dev version 2018-08-15 07:26:22 +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
Bastian Schroll cc81c30848
Merge branch 'master' into new_version 2017-12-21 09:22:28 +01:00
Bastian Schroll decd4461d7 prepare new Version 2.3 2017-12-21 09:20:31 +01:00
Bastian Schroll a9ac73a634 del submodules 2017-12-21 09:17:59 +01:00
Bastian Schroll 9a63c25640 del submodules 2017-12-21 09:17:37 +01:00
Bastian Schroll b96e099cea rev sub's to last release version 2017-12-21 09:11:37 +01:00
Bastian Schroll 9fd07658f6 multimon and sdr-rtl as submodule 
added the used tools as a git submodule to have better control over versions
 2017-12-20 11:23:29 +01:00
Bastian Schroll 4f0caae300
Merge pull request #337 from Schrolli91/fix_http_req 
fix http request plugin bug
 2017-12-20 06:59:57 +01:00
Bastian Schroll fe96367769
Merge pull request #339 from Schrolli91/fix_travis_fail 
fix travis build fail
 2017-12-19 14:10:43 +01:00
Bastian Schroll 76253ac900 fix travis build fail 2017-12-19 13:45:12 +01:00
Bastian Schroll 4811477656
Merge pull request #307 from f-kessler/dev-express-alarm 
multicastAlarm added as function
 2017-12-19 11:50:11 +01:00
Bastian Schroll 02d7ba2055
Merge branch 'develop' into fix_http_req 2017-12-19 11:40:01 +01:00
Bastian Schroll 2b90ebef8a edit CL 2017-12-19 11:38:47 +01:00
Bastian Schroll 335a051cb0
Merge pull request #338 from Schrolli91/fix_fm2_desc 
comment for FE in source
 2017-12-19 11:34:43 +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 1771c2ec6f edit CL 2017-12-19 08:36:58 +01:00
Bastian Schroll 84932346b5 fix http request plugin bug 
data field overwrite bug
 2017-12-19 08:35:10 +01:00
Bastian Schroll 568ead750e
Merge branch 'develop' into dev-express-alarm 2017-12-18 13:25:02 +01:00
Bastian Schroll e9b7cf17ba
Merge branch 'develop' into dev-express-alarm 2017-12-18 13:22:08 +01:00
Bastian Schroll 493624ea22
Merge pull request #335 from Schrolli91/Schrolli91-patch-1 
insert BW3 forum info
 2017-12-15 23:27:23 +01:00
Bastian Schroll eb10fdce43
insert BW3 forum info 2017-12-15 23:23:54 +01:00