Commit graph

682 commits

Author SHA1 Message Date
Bastian Schroll 113034aab9 Merge pull request #227 from thejockel/update-install-scipt
update install script
2017-02-21 13:20:14 +01:00
Jockel e06e30050e removed n|no) reboot=false ;; 2017-02-21 13:18:23 +01:00
Jockel bb0871b9ad update install, -r is not required any more. Default is no. 2017-02-21 13:08:52 +01:00
Bastian Schroll bb680de539 move testdata.txt to citest folder 2017-02-21 09:00:12 +01:00
Bastian Schroll 114056995c include beta branch handling 2017-02-21 08:04:13 +01:00
Bastian Schroll 10fe777583 Merge pull request #226 from Schrolli91/flothi-patch-1
Update README.md
2017-02-21 07:53:58 +01:00
Bastian Schroll 17686e7b52 edit readme 2017-02-20 19:15:48 +01:00
Bastian Schroll c72680cb62 edit readme 2017-02-20 18:49:20 +01:00
Bastian Schroll 30c8ae40a9 Merge pull request #222 from thejockel/develop
Base commit for Travis-CI
2017-02-20 18:35:53 +01:00
Jockel 75f1c31ece fixed issues 2017-02-20 14:39:15 +01:00
Jockel 9876092d3d new tests 2017-02-20 14:33:19 +01:00
Jockel 1e88b52f44 fixed missing links 2017-02-20 11:47:44 +01:00
Jockel d89226c4ce update URLs for Schrolli91 Repo 2017-02-20 11:45:56 +01:00
Jockel 1b171b243b added full testdata again 2017-02-20 11:27:44 +01:00
Jockel 26ac670546 update boswatch path
added img on README
2017-02-20 11:18:08 +01:00
Jockel 07c3a98981 base build 2017-02-20 10:25:56 +01:00
Bastian Schroll d48cac5e6f edit Issue template 2017-02-20 09:59:30 +01:00
Bastian Schroll fa0cfb4d63 test issue template 2017-02-20 09:51:33 +01:00
Bastian Schroll b330002946 Merge pull request #218 from Schrolli91/flothi-patch-1
Update poc.py
2017-02-19 22:59:33 +01:00
Bastian Schroll f266eb26fa Merge pull request #219 from Schrolli91/flothi-patch-2
Update install.sh
2017-02-19 15:00:57 +01:00
Florian f13276c1bc Update install.sh
- empty install-folder after installing
- removing git-caused subfolder BOSWatch

Still remaining: suitable rights for this folder (instead of 777)
2017-02-19 14:41:03 +01:00
Florian 7eddc9ea8d Update poc.py
Trying to remove the `<nul>`-tags in some variations; needs to be verified!
2017-02-19 01:17:30 +01:00
Bastian Schroll 689b1bc8b1 Merge pull request #216 from Schrolli91/flothi-patch-1
Update boswatch.py
2017-02-18 10:51:43 +01:00
Bastian Schroll 135303b987 Merge pull request #215 from Smith-fms/patch-3
Update install.sh
2017-02-18 10:50:27 +01:00
Bastian Schroll 9397372545 rename sample to template 2017-02-18 10:49:41 +01:00
Florian 53d3432df1 Update boswatch.py
Check for existing config.ini
Without a config.ini there is no possibility to start BOSWatch; therefore it makes sense to put this check on the very beginning of the program.
2017-02-18 00:23:25 +01:00
Florian ca2d266088 Update install.sh
Some typo
2017-02-17 23:46:41 +01:00
Smith-fms 4c0120834b Update install.sh
Added config warning to install script
2017-02-17 16:41:58 +01:00
Bastian Schroll f75d91f59b Merge pull request #214 from thejockel/develop
added basic error funcion
2017-02-17 14:06:55 +01:00
Jockel 052459c3e6 added basic error funcion 2017-02-17 13:04:56 +01:00
Bastian Schroll 8e0dbd0a7d Merge pull request #213 from thejockel/develop
Update path for 3rd-parties to local forks
2017-02-17 09:56:22 +01:00
Jockel bf2a5574e9 fix git syntax 2017-02-17 09:21:17 +01:00
Jockel 8371c50d3d update path 2017-02-17 08:41:34 +01:00
Jockel 3fe75fb595 update 2017-02-17 08:35:53 +01:00
Florian 2ef5a49601 Update install.sh
Check for being root user
2017-02-16 13:02:29 +01:00
Bastian Schroll 63e01a486d Merge pull request #208 from PeterLaemmle/master
Update Telegram.py
2017-02-14 20:57:23 +01:00
Bastian Schroll d245ae8776 fix spell error in fms.py 2017-02-14 08:17:31 +01:00
Bastian Schroll 566585d6d0 do som other code quallity changes 2017-02-12 10:32:17 +01:00
Bastian Schroll 3c00628b2d some edits for code quallity 2017-02-12 10:04:31 +01:00
Bastian Schroll 1c56509e25 Merged master into develop 2017-02-12 09:57:33 +01:00
PeterLaemmle df24ee4e9e Update Telegram.py
Added FMS and ZVEI support
2017-02-01 20:41:35 +01:00
Florian 8724cc64fe Update eMail.py
Adapting to master-branch (#200)
2017-01-25 22:03:04 +01:00
Bastian Schroll 881d4d7eb0 Merge pull request #202 from stereu/patch-5
Fixed CRC-Check Option Placement
2017-01-21 11:12:27 +01:00
stereu 2449dbc0fd Fixed CRC-Check Option Placement
CRC-Check Option muss im [FMS]-Tag platziert sein.
2017-01-20 23:12:22 +01:00
Bastian Schroll 26d4daf3b5 Merge pull request #200 from flothi/patch-4
Update eMail.py
2017-01-16 21:23:04 +01:00
Florian 20e9f567a0 Update eMail.py
Fixing if-condition for TLS
2017-01-16 21:22:22 +01:00
Florian 8cdfef4bce Update eMail.py
Using only SMTP via SSL can lead to errors depending on the configuration of the mail server
As there is no switch in the config file (which is good so) the approach is to use SSL first and, if this fails, switch to non-SSL connection.

Due to the importance of this plugin the pull request is affecting the master-branch.
2017-01-16 21:20:14 +01:00
Bastian Schroll ec31cfdbc5 Merge pull request #198 from flothi/patch-3
Update eMail.py
2017-01-16 16:07:34 +01:00
Bastian Schroll b84f84a420 Merge pull request #199 from flothi/flothi-fms-patch
FMS patch
2017-01-16 16:06:46 +01:00
Florian f996b72263 Update fms.py
- enabling to (not) use the CRC-check from multimon-ng
- fixing location-information with regard to TR-BOS (hex value is read as decimal value)

ATTENTION:
For proper usage multimon-ng is to be updated - please take the latest version from repository!
2017-01-16 14:07:11 +01:00