Commit graph

797 commits

Author SHA1 Message Date
Bastian Schroll 8a0c05f626 edit vers nr 2017-09-19 18:04:33 +02:00
Bastian Schroll 731d2c2d13 Merge pull request #305 from Schrolli91/beta
new release
2017-09-19 18:03:59 +02:00
Bastian Schroll 84b944348e Merge pull request #304 from Schrolli91/develop
new release
2017-09-19 17:59:55 +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
Florian 4202061bb7 Merge pull request #270 from Schrolli91/lineBrakeAllowed-remove
removed lineBrakeAllowed-flag so it can be used by default from any plugin
2017-04-28 23:51:29 +02:00
Florian 418411e09c Converting everything to lowercase
Ignore upper- or lowercase from csv-file - as the code translates to lowercase in poc.csv all entries will be switched to lowercase.
2017-04-28 23:49:44 +02:00
Florian 4e23d9856e Fixing regex
Searching in wrong field leads to error - fixing it
2017-04-28 23:02:50 +02:00
Jan Bollacke bf9a604931
PocDecoder: use functionchar instead of subric in description lookup 2017-04-28 07:46:28 +02:00
Jan Bollacke a4c218887b
DescriptionList: fix lookup for ric and subric 2017-04-28 07:45:23 +02:00
Jan Bollacke 5ccd6d8cc0
DescriptionList: support functionchar while loading ids/rics 2017-04-28 07:44:12 +02:00
Jan Bollacke 58b3158e9a
PocDecoder: use subric in description lookup 2017-04-27 14:40:42 +02:00
Jan Bollacke de451ffc6f
DescriptionList: check if a description exists for ric w/o the subric 2017-04-27 14:39:28 +02:00
Jockel 80a9cdb6f4 removed lineBrakeAllowed 2017-04-25 10:52:03 +02:00
Bastian Schroll 4b296f1a39 Merge pull request #268 from Schrolli91/telegramfix
added missing lineBrakeAllowed=True in Telegram.py
2017-04-25 07:44:28 +02:00
Jockel d3cbbb60d8 added missing lineBrakeAllowed=True 2017-04-25 06:53:15 +02:00
Bastian Schroll fdd05c8643 Merge pull request #267 from Schrolli91/telegram-jockel1
Read message-text from config
2017-04-24 21:18:50 +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 0694154d04 Merge pull request #263 from Schrolli91/flothi-p-service
Create a new service
2017-04-19 23:23:47 +02:00
Florian a2b7cb3b56 Update README.md
Adapt it to the new service
2017-04-19 23:22:22 +02:00
Florian 77f51e3509 New service
Implement BOSWatch as systemctl-service
2017-04-19 23:17:09 +02:00
Florian 5d98112480 Merge pull request #262 from Schrolli91/flothi-patch-2
Renaming csv-files to prevent overwriting
2017-04-19 22:57:15 +02:00
Florian 5f4f6caa10 Rename zvei.csv to zvei.template.csv
To prevent overwritten files after an update the csv-file is renamed to .template.csv
2017-04-19 22:56:09 +02:00