Commit graph

602 commits

Author SHA1 Message Date
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
PeterLaemmle 7eb5083553 Update notifyMyAndroid.py
Remove needless global declaration in notifyMyAndroid.py main- on onLoad-function.
2016-10-04 11:38:42 +02:00
JockelJ 294fc7ae7d fixed mutiple issues from last commit 2016-10-04 10:44:23 +02:00
Bastian Schroll bc6f1d4c86 Merge pull request #134 from thejockel/develop
update insatll script
2016-10-04 09:37:27 +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
Jan-Hendrik Plogmann 708c6f96b1 update install script - create dir 2016-10-04 01:25:30 +02:00
Jan-Hendrik Plogmann dd9f2e8072 update insatll script 2016-10-04 01:19:40 +02:00
Bastian Schroll 7b3a3bd867 edit readme 2016-10-03 23:30:50 +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
Bastian Schroll d16b28ce4f buf in regexFilter.py 2016-10-03 16:27:34 +02:00
Bastian Schroll a59863b14a Merge pull request #132 from PeterLaemmle/patch-2
Update Telegram.py
2016-10-03 16:24:04 +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