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

617 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Florian 7ad21a7a6d Update eMail.py 
Fixing wrong variable - globals to globalVars
 2017-01-16 13:08:17 +01:00
Bastian Schroll 9811f0b074 Merge pull request #178 from flothi/patch-7 
Update wildcardHandler.py
 2016-11-26 08:14:58 +01:00
Florian c96109899d Update wildcardHandler.py 
Fixing problem that replacement has been tried whether POC was alarmed or ZVEI; works fine for both POC and ZVEI.

Original author might verify, works fine for me
 2016-11-25 22:48:47 +01:00
Bastian Schroll 1535920fc9 Merge pull request #174 from flothi/patch-6 
Update install.sh
 2016-11-22 16:45:57 +01:00
flothi 42a09f2685 Update install.sh 
Main function: Reconfigure the cursor to "normal" mode (l. 135) as it was invisible during installation
Additionally fixed some spelling
 2016-11-22 12:54:53 +01:00
Bastian Schroll 7eb1067f8f Merge pull request #172 from flothi/patch-4 
Update install.sh
 2016-11-22 07:56:39 +01:00
flothi 5ed0d20348 Update install.sh 
Adding 1 LOC: preset of var reboot as false to prevent errors caused by checking in l. 135 - variable is set only if arg is given which is the reason for the error
 2016-11-22 00:28:58 +01:00
Bastian Schroll 20b45bf036 Merge pull request #170 from flothi/patch-3 
HOTFIX - config
 2016-11-21 15:32:39 +01:00
Bastian Schroll 462cce8976 Merge pull request #169 from flothi/patch-2 
HOTFIX - installer
 2016-11-21 15:32:18 +01:00
flothi 8a82d049d4 Update config.template.ini 
Added forgotten plugin switch for yowsup due to errors while BOSWatch misses it during startup
 2016-11-21 14:31:21 +01:00
flothi df569b00f0 Update install.sh 
Fixing errors found through testing version 2.1:
- conflict between qt4- and qt5-default resolved - deleted qt5-default as it seems there is no need for it (l. 57)
- fixing output-format for modprobe.d-file as no newline was created (l. 128)
- fixed comparison to reboot (l. 134)

Remember to call this file with "bash" instead of "sh"
 2016-11-21 14:26:55 +01:00
Bastian Schroll 3fedf7466b Merge pull request #167 from Schrolli91/develop 
merge for version 2.1
 2016-11-20 15:09:36 +01:00
Bastian Schroll 6ed77c9945 set new install file as standard 2016-11-20 13:44:53 +01:00
Bastian Schroll 14d1dedcec fix comment bug 2016-11-20 13:37:29 +01:00
Bastian Schroll d0c5bed6eb set new version number and date for version 2.1 2016-11-20 13:36:09 +01:00
Bastian Schroll edfc38bffb resolve ununsed code imports 2016-11-20 13:34:24 +01:00
Bastian Schroll e3b3377f9e resolve some Code Style Problems 2016-11-20 13:05:24 +01:00
Bastian Schroll 1877c7f367 Merged branch develop into develop 2016-11-20 12:51:50 +01:00
Bastian Schroll 95599577b0 Merge pull request #160 from thejockel/develop 
added var for static sub ric messages
 2016-11-19 17:47:24 +01:00
thejockel 60f7368c9d Update README.md 2016-11-06 09:17:53 +01:00
Bastian Schroll f7cb657d72 Merged branch develop into develop 2016-11-04 19:59:40 +01:00
Bastian Schroll b286606cef Merge pull request #159 from flothi/patch-1 
Update boswatch.sql
 2016-11-01 17:26:26 +01:00
Bastian Schroll cbce582379 Merge pull request #157 from fwmarcel/develop 
yowsup Plugin
 2016-11-01 17:24:10 +01:00
Jockel 5e516c65a6 added var for static sub ric messages 2016-11-01 10:18:47 +01:00
flothi cf3ae2d6dc Update boswatch.sql 
Add error-handling: 
Rename existing columns from old versions to new (correct) spelling.
 2016-10-31 23:16:18 +01:00
flothi cd80d7760d Update boswatch.sql 
Adapting table 'poc' to script and changed the letter 'k' to 'c' in function.
 2016-10-31 21:30:04 +01:00
fwmarcel 5567ab3c06 FMS and ZVEI added 2016-10-29 15:47:35 +02:00
fwmarcel e6144a367f yowsup added 2016-10-29 15:46:36 +02:00
fwmarcel f7905f6759 yowsup added 2016-10-29 15:36:19 +02:00
Bastian Schroll 78cecc7ef5 Merge remote-tracking branch 'refs/remotes/origin/master' 
Conflicts:
	plugins/eMail/eMail.py
 2016-10-27 22:11:19 +02:00
Bastian Schroll 78a211b407 Merge pull request #155 from fwmarcel/patch-1 
Update eMail.py
 2016-10-27 22:08:59 +02:00
fwmarcel cf0ab3de28 Update eMail.py 2016-10-26 20:48:02 +02:00
Bastian Schroll 00730de405 Merge pull request #154 from PeterLaemmle/patch-1 
Update Telegram.py
 2016-10-26 15:57:47 +02:00
PeterLaemmle 4f7976402a Update Telegram.py 
Import telegram errors
 2016-10-26 15:40:54 +02:00
Bastian Schroll 4ec0b07237 Merge pull request #153 from PeterLaemmle/develop 
Update boswatch.py
 2016-10-25 19:04:14 +02:00
PeterLaemmle 6554c02ff3 Update boswatch.py 
Make --device a required argument.
 2016-10-25 18:59:56 +02:00
Bastian Schroll ea883f787c Merge pull request #145 from PeterLaemmle/develop 
Update Telegram.py
 2016-10-16 16:30:51 +02:00
PeterLaemmle d58e887092 Update Telegram.py 2016-10-16 16:07:47 +02:00
PeterLaemmle 6dba081961 Update Telegram.py 2016-10-14 16:36:00 +02:00
Bastian Schroll 62a694ace5 Merge pull request #144 from PeterLaemmle/develop 
Update Telegram.py
 2016-10-14 16:02:24 +02:00
PeterLaemmle 3f7c2a4774 Update Telegram.py 2016-10-14 14:12:03 +02:00
PeterLaemmle 22aea69136 Update Telegram.py 
Added exception for Telegram errors
 2016-10-14 14:04:35 +02:00
Bastian Schroll 0ac5451a5b Merge pull request #141 from PeterLaemmle/patch-2 
Update config.template.ini
 2016-10-06 10:34:01 +02:00
PeterLaemmle c03f6ab2d2 Update config.template.ini 2016-10-06 10:12:49 +02:00
Bastian Schroll 8438c1483a Merge pull request #139 from Cryjack/MySQL 
Tabelle für Webuser aus SQL entfernt
 2016-10-05 11:24:35 +02:00
Ricardo Krippner 9dbf748737 removed table for webuser 2016-10-05 09:57:13 +02:00
Bastian Schroll 0f64e6d8e6 Merge pull request #137 from PeterLaemmle/patch-2 
Update notifyMyAndroid.py
 2016-10-04 12:57:43 +02:00
Bastian Schroll 00e4e08b92 Merge pull request #136 from thejockel/develop 
fixed mutiple issues from last commit
 2016-10-04 12:57:14 +02:00