Commit graph

165 commits

Author SHA1 Message Date
Bastian Schroll 63e01a486d Merge pull request #208 from PeterLaemmle/master
Update Telegram.py
2017-02-14 20:57:23 +01:00
Bastian Schroll 3c00628b2d some edits for code quallity 2017-02-12 10:04:31 +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
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
Florian 7ad21a7a6d Update eMail.py
Fixing wrong variable - globals to globalVars
2017-01-16 13:08:17 +01:00
Florian 7390a539d3 MySQL.py
Adapting to global net-identifiers
2016-12-22 22:37:06 +01:00
Bastian Schroll 14d1dedcec fix comment bug 2016-11-20 13:37:29 +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
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
Bastian Schroll 78cecc7ef5 Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
	plugins/eMail/eMail.py
2016-10-27 22:11:19 +02:00
fwmarcel cf0ab3de28 Update eMail.py 2016-10-26 20:48:02 +02:00
PeterLaemmle 4f7976402a Update Telegram.py
Import telegram errors
2016-10-26 15:40:54 +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
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 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
PeterLaemmle 7eb5083553 Update notifyMyAndroid.py
Remove needless global declaration in notifyMyAndroid.py main- on onLoad-function.
2016-10-04 11:38:42 +02:00
Bastian Schroll 92ed27db03 Merge pull request #135 from PeterLaemmle/patch-2
Update Telegram.py
2016-10-04 09:37:12 +02:00
PeterLaemmle 22cb035f18 Update Telegram.py
Remove needless global declaration in Telegram.py main function.
2016-10-04 08:29:02 +02:00
Bastian Schroll 7bf7f3c47b remove some unnecessary pass statements 2016-10-03 16:45:12 +02:00
Bastian Schroll 6b520881b6 resolve some codacy problems 2016-10-03 16:32:54 +02:00
PeterLaemmle bae19499ad Update Telegram.py 2016-10-03 16:09:20 +02:00
Bastian Schroll 25752da5db little change on httpRequest 2016-10-03 13:38:30 +02:00
Bastian Schroll 651157c274 Merge remote-tracking branch 'refs/remotes/thejockel/develop'
Conflicts:
	plugins/httpRequest/httpRequest.py
2016-10-03 13:36:50 +02:00
Jan-Hendrik Plogmann 06c5846709 added error logging for http plugin 2016-10-03 12:50:20 +02:00
Bastian Schroll e938cdcd6d rename globals. call to globalVars. 2016-10-03 12:02:18 +02:00
Bastian Schroll f8fcda94b6 rename globals to globalVars
to prevent to redifine an builtin function
2016-10-03 11:56:27 +02:00
Bastian Schroll 76dbdc0692 bug in telegram plugin 2016-10-02 22:59:14 +02:00
Bastian Schroll b444f257ac change encoding tag to utf-8 2016-10-02 22:45:15 +02:00
Bastian Schroll 77fb7fb44f remove trailing whitespaces
to improve codacy rating
2016-10-02 21:28:04 +02:00
Bastian Schroll 6e6a0a4a45 edit interface.txt info
information now in plugins/readme.md
2016-10-02 12:38:47 +02:00
Jan-Hendrik Plogmann 6da22e331a added missing except for httpRequest 2016-10-01 20:37:38 +02:00
Jan-Hendrik Plogmann 87238e60cc added missing except for httpRequest 2016-10-01 20:35:44 +02:00
Jan-Hendrik Plogmann 0df55885d9 changed httprequest plugin 2016-10-01 19:51:20 +02:00
Bastian Schroll 6c2ec0c4df Merge branch 'refs/heads/pr/106' into develop
# Conflicts:
#	config/config.template.ini
2016-10-01 11:22:17 +02:00
PeterLaemmle 6b315e2a5c Delete sendTelegram.py 2016-09-30 20:59:02 +02:00