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
910 commits 4 branches 17 tags 4 MiB
Commit graph

910 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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 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 dbebc75d82
Merge pull request #317 from Schrolli91/dev_netHistory 
Net Ident History Flag in config
 2017-12-09 15:56:03 +01:00
f-kessler 59b78a4f64 multi delimiter and text RICs 
Changed to support multiple delimiters and text RICs
 2017-10-23 20:34:25 +02:00
Bastian Schroll 9c0c5e9358 Merge branch 'develop' into dev_netHistory 2017-10-21 23:08:54 +02:00
Bastian Schroll 3b2275094d Merge branch 'develop' into dev-express-alarm 2017-10-21 23:08:10 +02:00
Bastian Schroll 3265c51316 Merge pull request #324 from Schrolli91/remove_beta 
remove beta branch
 2017-10-21 23:06:16 +02:00
Bastian Schroll 9d06e38de9 edit CL 2017-10-21 22:57:52 +02:00
Bastian Schroll fb82b1868d edit CL 2017-10-21 22:57:10 +02:00
Bastian Schroll 50a2c70408 edit CL 2017-10-21 22:55:46 +02:00
Bastian Schroll c144205eb0 edit version 2017-10-21 22:50:55 +02:00
Bastian Schroll 44821bbfcd edit CL 2017-10-21 22:49:18 +02:00
Bastian Schroll 66d2b4a79a Merge branch 'develop' into remove_beta 2017-10-21 22:42:47 +02:00
Bastian Schroll c15de920ac edit CL 2017-10-21 22:34:37 +02:00
Bastian Schroll 5ec51d56cf edit CL for release 2017-10-21 22:33:08 +02:00
Bastian Schroll 9cad78f71c edit CL 2017-10-21 22:23:19 +02:00
Bastian Schroll 9e0e43ee13 edit travis config 2017-10-21 22:20:53 +02:00
Bastian Schroll c49c76dd6b edit installer 2017-10-21 22:20:46 +02:00
Bastian Schroll 2626a0418f edit CL 2017-10-21 22:20:34 +02:00
Bastian Schroll 7abc398a94 edit readme 2017-10-21 22:18:49 +02:00
Bastian Schroll ec96317226 Merge pull request #323 from philipgiuliani/patch-2 
Fix output paths of the install script
 2017-10-21 22:15:42 +02:00
Bastian Schroll 886dcf63d0 edit CL 2017-10-21 22:14:06 +02:00
Bastian Schroll 5f65e86922 Merge branch 'develop' into patch-2 2017-10-16 21:27:59 +02:00
f-kessler b7141d986b fixed remove of old RICs and replacement of data for calling alarmHandler 
Changed for loop to iterate over a copy of multiList
fixed replacement of data from xData
 2017-10-09 20:59:03 +02:00
Philip Giuliani b5d860f5cb Fix output paths of the install script 2017-10-09 14:11:26 +02:00
Bastian Schroll 8961148ecf Update Konzept.md 2017-10-08 10:21:02 +02:00
Bastian Schroll 307731dabe Update Konzept.md 2017-10-08 10:19:53 +02:00
f-kessler bcdac6e2e6 exclude netIdent_ric from multicastAlarm 
If not excluded it cannot be used anywhere
 2017-10-05 21:09:24 +02:00
Florian 18425e2be2 Update install.sh 
Clean up old statements
Fix a few typos
(#318)
 2017-10-04 08:54:23 +02:00
Bastian Schroll 3782974094 edit log output 2017-10-04 06:43:44 +02:00
Bastian Schroll 33706e5f2d little fix 2017-10-04 06:30:53 +02:00
Bastian Schroll cc66f4547a print python vers nr in log 2017-10-04 06:16:37 +02:00
Bastian Schroll 594ddb4452 add config debug prints 2017-10-03 22:26:05 +02:00
Bastian Schroll 578750a810 fix global definition issue 2017-10-03 22:08:38 +02:00
Bastian Schroll 7fa4a97ba4 edit CL 2017-10-03 20:23:48 +02:00
Bastian Schroll fca69b974e add placeholder (unused var) 2017-10-03 19:32:09 +02:00
Bastian Schroll 5b9c8d75d9 fix indentation level 2017-10-03 19:20:38 +02:00
Bastian Schroll 03cd002cfe Merge branch 'develop' into dev-express-alarm 2017-10-03 19:18:37 +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 0f13853cc8 edit CL 2017-10-03 18:28:27 +02:00
Bastian Schroll cb0fd53713 insert history flag for netIdent 2017-10-03 18:26:16 +02:00
Bastian Schroll cfcc12b445 Merge pull request #316 from Schrolli91/flothi-patch-1 
Adaptations for "new" service
 2017-10-03 18:10:09 +02:00
Florian e86059a2f3 Update install_service.sh 
Adding errorhandling due to wrong input characters
 2017-10-03 17:08:22 +02:00
Bastian Schroll e503130a03 edit CL 2017-10-03 16:03:27 +02:00