Commit graph

816 commits

Author SHA1 Message Date
f-kessler ae03473f94 Update config.template.ini
Hinweis zur delimiter RIC angepasst.
2017-09-21 12:09:17 +02:00
Bastian Schroll 0ed8df0202 add ExpressAlarm to logging 2017-09-20 06:31:47 +02:00
Bastian Schroll 6af6981b68 changes for codacy 2017-09-20 06:25:06 +02:00
Bastian Schroll f73e6f215b edit changelog 2017-09-19 22:04:41 +02:00
Bastian Schroll 4a89ed44db Merge branch 'develop' into dev-express-alarm 2017-09-19 22:03:43 +02:00
f-kessler 55f55295d0 Update README.md 2017-09-19 21:43:57 +02:00
f-kessler 7fd88a452b Update config.template.ini 2017-09-19 21:37:47 +02:00
f-kessler 70d769862c Update testdata.txt 2017-09-19 21:36:53 +02:00
f-kessler f171bda835 Add files via upload
added test data for Express-Alarm
2017-09-19 20:57:48 +02:00
f-kessler 46a53dd8dc Add files via upload
added processing of Express-Alarms
2017-09-19 20:56:59 +02:00
f-kessler 81a146b78f Add files via upload
new function to support Express-Alarm
2017-09-19 20:55:59 +02:00
f-kessler 9ffa872b74 Add files via upload
added options for Express-Alarm
2017-09-19 20:55:03 +02:00
f-kessler fbc3e53a1d Delete testdata.txt 2017-09-19 20:54:26 +02:00
f-kessler e770937c6d Add files via upload
added options for Express-Alarm
2017-09-19 20:54:01 +02:00
f-kessler 3532a64cf1 Delete testdata.txt 2017-09-19 20:53:12 +02:00
f-kessler 990ef0ff1c Delete poc.py 2017-09-19 20:53:02 +02:00
f-kessler 5503ac0be8 Delete config.template.ini 2017-09-19 20:52:39 +02:00
f-kessler c52c76aa50 Delete expressAlarm.py 2017-09-19 20:51:53 +02:00
f-kessler f31532d79a Add files via upload
Express-Alarm function added
2017-09-19 20:49:36 +02:00
Bastian Schroll c698a9eb15 edit CL 2017-09-19 18:16:41 +02:00
Bastian Schroll afa224a9aa edit changelog 2017-09-19 18:11:37 +02:00
Bastian Schroll e5391a2b75 edit vers nr 2017-09-19 18:05:26 +02:00
Bastian Schroll 4f29129007 Merge branch 'beta' into develop 2017-09-19 17:59:31 +02:00
Bastian Schroll 53aa810df8 new release 2.2.1 2017-09-19 17:56:44 +02:00
Bastian Schroll ac5db0dc98 prepare for changelog 2017-09-18 20:46:43 +02:00
Bastian Schroll 84d39d0686 revert last merge
see #296
2017-09-15 06:33:52 +02:00
Bastian Schroll dfad66783e Merge pull request #300 from Schrolli91/flothi-patch-1
Enabling basic functionality
2017-08-27 19:50:43 +02:00
Florian 35e3ba8069 remove file
moved and renamed
2017-08-23 23:38:51 +02:00
Florian 4c60d501b5 fixing deprecated stuff
removed deprecated functions
adpating to db-structure
2017-08-23 23:38:16 +02:00
Florian 61398d95cb Increase usability
make the login-data readable for users
2017-08-23 23:37:25 +02:00
Florian c02cd74586 Enabling basic functionality
- removed deprecated functions (mysql)
- adding function: select view at login
- adapting queries to database structure
- some minor stuff
2017-08-23 23:35:22 +02:00
Bastian Schroll 42e7de7d4c Merge pull request #286 from PeterLaemmle/develop
Improve code style
2017-08-06 15:18:44 +02:00
Bastian Schroll 256d726bc6 Merge pull request #296 from Schrolli91/Telegram_custom_text
added support for custom texts with telegram
2017-08-06 15:18:32 +02:00
Jockel 311b183265 added support for custom texts with telegram 2017-07-31 07:34:14 +02:00
Bastian Schroll 2ab78cd7b9 edit readme for new regex functionality 2017-05-28 10:39:58 +02:00
Bastian Schroll 98de4c077d Merge pull request #284 from Rumbel84/patch-1
Update regexFilter.py
2017-05-28 10:36:31 +02:00
PeterLaemmle c9ffd6ae0d Update regexFilter.py
Correcting the following issue (https://github.com/Schrolli91/BOSWatch/issues/217):
-Using global for 'filterList' but no assignment is done
2017-05-24 19:39:22 +02:00
PeterLaemmle c3398ccd3f Update descriptionList.py
Correcting the following issues (https://github.com/Schrolli91/BOSWatch/issues/217):
-Using global for 'fmsDescribtionList' but no assignment is done
-Using global for 'zveiDescribtionList' but no assignment is done
-Using global for 'ricDescribtionList' but no assignment is done
2017-05-24 19:35:02 +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
PeterLaemmle f6d62828b8 Update pynma.py
Correcting the following issue (https://github.com/Schrolli91/BOSWatch/issues/217)
-Using type() instead of isinstance() for a typecheck.
2017-05-24 19:25:27 +02:00
PeterLaemmle 67a1028081 Update doubleFilter.py
Correcting the following issues (https://github.com/Schrolli91/BOSWatch/issues/217)
-Consider using enumerate instead of iterating with range and len
2017-05-24 19:20:53 +02:00
Bastian Schroll 0ab896b17a Merge branch 'develop' into patch-1 2017-05-24 06:16:57 +02:00
Bastian Schroll 3ce29711a1 Merge pull request #277 from PeterLaemmle/develop
Update of Telegram plugin
2017-05-24 06:14:37 +02:00
Rumbel84 3b9da8eb0e Update regexFilter.py
Wenn ein Filter nicht Matched (Regex) kommt False
Wenn es gar keinen Filter gibt, kommt ein falsches True. Muss auch False sein.
2017-05-23 20:46:01 +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
PeterLaemmle 3e1db59d46 Update config.template.ini 2017-05-07 13:37:35 +02:00
Florian daddd02279 Merge pull request #271 from jbollacke/feature/subric_description
New feature: 
SubRIC is now used for a detailed description.
Remember that you have to have an entry of the main RIC - it is used as fallback.

The SubRICs are set as sufficix to the main description
2017-05-01 10:08:32 +02:00
Jan Bollacke aeedcd4c8c
DescriptionList: Simplify conversion of keys to lowercase
This reverts commit 418411e09c.
2017-05-01 09:24:06 +02:00