Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2025-12-06 07:42:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
586 commits 4 branches 17 tags 4 MiB
Commit graph

586 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jan-Hendrik Plogmann 06c5846709 added error logging for http plugin 2016-10-03 12:50:20 +02:00
Bastian Schroll fe86ae2a06 edit in regexFilter.py 
redefine builtin
 2016-10-03 12:36:15 +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 e8e870849d rename filter to regexFilter 
to prevent to redifine an builtin function
 2016-10-03 11:50:18 +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 458c01676b edit readme to show codacy badges 2016-10-02 21:52:05 +02:00
Bastian Schroll 77fb7fb44f remove trailing whitespaces 
to improve codacy rating
 2016-10-02 21:28:04 +02:00
Bastian Schroll bf27623839 add a codacy badge 2016-10-02 21:20:35 +02:00
Bastian Schroll a7f27f0ccb Merged branch patch-3 into develop 2016-10-02 14:22:44 +02:00
Bastian Schroll 1da94df0de Merge pull request #128 from dabenzel/patch-2 
Update install.sh
 2016-10-02 14:20:51 +02:00
dabenzel 682147eb11 Update install.sh 
Noch zwei kleine Änderungen / Fehlerbehebungen
 2016-10-02 13:57:40 +02:00
dabenzel 46b13d6e81 Update install.sh 
Kleinen Fehler behoben (übersehen beim Korrigieren)
 2016-10-02 13:30:46 +02:00
Bastian Schroll 6e6a0a4a45 edit interface.txt info 
information now in plugins/readme.md
 2016-10-02 12:38:47 +02:00
Bastian Schroll ff91d4b086 prepare for RC 
edit date and version number for RC
 2016-10-02 12:03:11 +02:00