Merge remote-tracking branch 'refs/remotes/thejockel/develop'

Conflicts:
	plugins/httpRequest/httpRequest.py
This commit is contained in:
Bastian Schroll 2016-10-03 13:36:50 +02:00
commit 651157c274
2 changed files with 27 additions and 35 deletions

View file

@ -154,7 +154,7 @@ signal_ric = ## SIGNAL-RICS ##
[httpRequest]
# URL without http://
# example URL http://example.com/remote.php?DESCR=%DESCR%
# you can use the following wildcards in your URL as GET params:
# http://en.wikipedia.org/wiki/Query_string
@ -167,14 +167,14 @@ signal_ric = ## SIGNAL-RICS ##
# %DESCR% = Description from csv-file
# %TIME% = Time (by script)
# %DATE% = Date (by script)
#fms_url = www.google.de?code=%FMS%&stat=%STATUS%
#fms_url = http://www.google.de?code=%FMS%&stat=%STATUS%
fms_url =
# %ZVEI% = ZVEI 5-tone Code
# %DESCR% = Description from csv-file
# %TIME% = Time (by script)
# %DATE% = Date (by script)
#zvei_url = www.google.de?zvei=%ZVEI%
#zvei_url = http://www.google.de?zvei=%ZVEI%
zvei_url =
# %RIC% = Pocsag RIC
@ -185,7 +185,7 @@ zvei_url =
# %DESCR% = Description from csv-file
# %TIME% = Time (by script)
# %DATE% = Date (by script)
#poc_url = www.google.de?ric=%RIC%&subric=%FUNC%&msg=%MSG%
#poc_url = http://www.google.de?ric=%RIC%&subric=%FUNC%&msg=%MSG%
poc_url =