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
561 commits 4 branches 17 tags 4 MiB
Commit graph

561 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bastian Schroll 50303b79fc Merge branch 'master' 
Conflicts:
	config/config.template.ini
	install.sh
 2016-10-02 11:48:28 +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 7f7df93c3f Merge pull request #121 from dabenzel/patch-1 
Update install.sh
 2016-10-01 18:08:13 +02:00
Bastian Schroll 33f67c8149 Merge pull request #119 from dabenzel/patch-1 
Changed config.template.ini
 2016-10-01 18:05:51 +02:00
dabenzel 40a12fab4e Update install.sh 
Changed language and expressions
 2016-10-01 17:52:06 +02:00
dabenzel 2e3281d8b1 Changed config.template.ini 
Changed a few translations
 2016-10-01 17:03:53 +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
PeterLaemmle d1c5708d89 Create Telegram.py 2016-09-30 20:58:35 +02:00
PeterLaemmle 4dabea7baf Update config.template.ini 2016-09-30 20:55:27 +02:00
PeterLaemmle 91fd449bee Update sendTelegram.py 2016-09-30 20:54:35 +02:00
Bastian Schroll 3c63740265 Merge branch 'refs/heads/pr/112' into develop 
# Conflicts:
#	config/config.template.ini
 2016-09-30 17:58:20 +02:00
Bastian Schroll 0542e45ef9 Merge branch 'refs/heads/Cryjack-FFAgent' into develop 2016-09-30 17:54:07 +02:00
Bastian Schroll fae72759f2 resolve conflict 2016-09-30 17:46:27 +02:00
Bastian Schroll 564c66e1cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2016-09-30 17:12:45 +02:00
Bastian Schroll cb8008e873 Merge pull request #116 from Cryjack/MySQL 
Plugin Update MySQL
 2016-09-30 17:06:44 +02:00
Bastian Schroll 93f0db258b Merge pull request #114 from Cryjack/SMS77 
Plugin Sms77
 2016-09-30 17:01:18 +02:00
Bastian Schroll f8d73388c7 Merge pull request #117 from Cryjack/RTL-Device 
RTL-Stick per Seriennummer auswählen
 2016-09-30 17:00:34 +02:00
Ricardo Krippner 83eebea87f no message 2016-09-29 14:48:50 +02:00
Ricardo Krippner 1f41b0a8ca update Timestamp-Data 2016-09-29 14:32:43 +02:00
Ricardo Krippner 8d21a5b9e0 updated MySQL config 2016-09-29 14:28:55 +02:00
Ricardo Krippner 58cdbf8984 added FFAgent config 2016-09-29 14:27:52 +02:00
Ricardo Krippner 9e457114e2 added SMS77 config 2016-09-29 14:26:48 +02:00