aboutsummaryrefslogtreecommitdiffstats
path: root/www/domoticz
diff options
context:
space:
mode:
Diffstat (limited to 'www/domoticz')
-rw-r--r--www/domoticz/Makefile80
-rw-r--r--www/domoticz/distinfo5
-rw-r--r--www/domoticz/files/domoticz.in2
-rw-r--r--www/domoticz/files/patch-CMakeLists.txt74
-rw-r--r--www/domoticz/files/patch-appversion.default9
-rw-r--r--www/domoticz/files/patch-getgit.cmake96
-rw-r--r--www/domoticz/pkg-descr2
-rw-r--r--www/domoticz/pkg-message14
-rw-r--r--www/domoticz/pkg-plist221
9 files changed, 352 insertions, 151 deletions
diff --git a/www/domoticz/Makefile b/www/domoticz/Makefile
index 3796cb452d9e..5c7d30fc3666 100644
--- a/www/domoticz/Makefile
+++ b/www/domoticz/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= domoticz
-PORTVERSION= 2.${DOMOTICZ_REL}
-PORTREVISION= 1
+PORTVERSION= 3.${DOMOTICZ_REL}
CATEGORIES= www
MAINTAINER= kiwi@oav.net
@@ -13,37 +12,84 @@ LICENSE_FILE= ${WRKSRC}/License.txt
LIB_DEPENDS= libcurl.so:ftp/curl \
libexpat.so:textproc/expat2 \
- libboost_system.so:devel/boost-libs \
- libboost_python.so:devel/boost-python-libs \
libtelldus-core.so:comms/telldus-core
+CONFLICTS_INSTALL?= domoticz-[23]*
+
+OPTIONS_SUB= YES
+OPTIONS_DEFINE= SBOOST SLUA SMQTT SSQLITE PYTHON
+SBOOST_DESC= Use static Boost instead of dynamic linking
+SLUA_DESC= Use domoticz provided LUA instead of ports one
+SMQTT_DESC= Use domoticz mosquitto instead of ports one
+SSQLITE_DESC= Use domoticz SQLLite instead of ports one
+PYTHON_DESC= Enable support for Python in EventSystem
+
+.include <bsd.port.options.mk>
+
# This hack is to get rid of dependency of git while building
# the package.
-DOMOTICZ_REL= 4268
-DOMOTICZ_TS= 1453185544
+DOMOTICZ_REL= 5877
+DOMOTICZ_TS= 1478792673
USE_GITHUB= yes
-GH_TAGNAME= 12f5a19
+GH_ACCOUNT= domoticz
+GH_PROJECT= domoticz
-USES= cmake execinfo iconv lua:52 pkgconfig sqlite
+USES= cmake iconv pkgconfig execinfo ssl
USE_RC_SUBR= domoticz
USERS= domoticz
GROUPS= domoticz
-CMAKE_ARGS= -DUSE_BUILTIN_SQLITE="NO" \
- -DUSE_BUILTIN_LUA="NO" \
- -DUSE_STATIC_BOOST="NO" \
+CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}/domoticz \
-DUSE_BUILTIN_ZLIB="NO" \
- -DCMAKE_INSTALL_PREFIX=${PREFIX}/domoticz
+ -DUSE_PYTHON="YES" \
+ -DUSE_STATIC_OPENZWAVE="NO"
+
+.if ${PORT_OPTIONS:MSBOOST}
+CMAKE_ARGS+= -DUSE_STATIC_BOOST="YES"
+BUILD_DEPENDS+= boost-libs>=0:devel/boost-libs \
+ boost-python-libs>=0:devel/boost-python-libs
+.else
+CMAKE_ARGS+= -DUSE_STATIC_BOOST="NO"
+LIB_DEPENDS+= libboost_system.so:devel/boost-libs \
+ libboost_python.so:devel/boost-python-libs
+.endif
+
+.if ${PORT_OPTIONS:MSLUA}
+CMAKE_ARGS+= -DUSE_BUILTIN_LUA="YES"
+.else
+CMAKE_ARGS+= -DUSE_BUILTIN_LUA="NO"
+USES+= lua:52
+.endif
+
+.if ${PORT_OPTIONS:MSMQTT}
+CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="YES"
+.else
+CMAKE_ARGS+= -DUSE_BUILTIN_MQTT="NO"
+LIB_DEPENDS+= libmosquitto.so:net/mosquitto
+.endif
+
+.if ${PORT_OPTIONS:MSSQLITE}
+CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="YES"
+.else
+CMAKE_ARGS+= -DUSE_BUILTIN_SQLITE="NO"
+USES+= sqlite
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
+CMAKE_ARGS+= -DUSE_PYTHON="NO"
+.else
+CMAKE_ARGS+= -DUSE_PYTHON="YES"
+USES+= python
+.endif
post-patch:
- @${REINPLACE_CMD} -e "s,XXXDOMOTICZXXX,${DOMOTICZ_REL},g" ${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} -e "s,\/opt,${PREFIX},g" ${WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} -e "s,XXXPREFIXXX,${PREFIX},g" ${WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} -e "s,XXXDOMOTICZXXX,${DOMOTICZ_REL},g" ${WRKSRC}/getgit.cmake
- @${REINPLACE_CMD} -e "s,XXXHASHXXX,${GH_TAGNAME},g" ${WRKSRC}/getgit.cmake
- @${REINPLACE_CMD} -e "s,XXXTIMEXXX,${DOMOTICZ_TS},g" ${WRKSRC}/getgit.cmake
+ @${REINPLACE_CMD} -e "s,XXXPREFIXXXX,${PREFIX}/domoticz,g" ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} -e "s,XXXDOMOTICZXXX,${DOMOTICZ_REL},g" ${WRKSRC}/appversion.default
+ @${REINPLACE_CMD} -e "s,XXXHASHXXX,${GH_TAGNAME},g" ${WRKSRC}/appversion.default
+ @${REINPLACE_CMD} -e "s,XXXTIMEXXX,${DOMOTICZ_TS},g" ${WRKSRC}/appversion.default
@${REINPLACE_CMD} -e "/^ADD_PRECOMPILED_HEADER/ d" ${WRKSRC}/CMakeLists.txt
post-install:
diff --git a/www/domoticz/distinfo b/www/domoticz/distinfo
index 9936db5f7f5b..ce425ec74784 100644
--- a/www/domoticz/distinfo
+++ b/www/domoticz/distinfo
@@ -1,2 +1,3 @@
-SHA256 (domoticz-domoticz-2.4268-12f5a19_GH0.tar.gz) = 0fe901763c78312f191f62584532486638f22030a13dee98b617fea12c453901
-SIZE (domoticz-domoticz-2.4268-12f5a19_GH0.tar.gz) = 38121426
+TIMESTAMP = 1482855396
+SHA256 (domoticz-domoticz-3.5877_GH0.tar.gz) = fb88edbe428851a7a337a85faa93f6da00713b3ad086ff6957031dc9b3b58bba
+SIZE (domoticz-domoticz-3.5877_GH0.tar.gz) = 38524442
diff --git a/www/domoticz/files/domoticz.in b/www/domoticz/files/domoticz.in
index b6956f645cae..c4d14bdb0e83 100644
--- a/www/domoticz/files/domoticz.in
+++ b/www/domoticz/files/domoticz.in
@@ -31,7 +31,7 @@ load_rc_config $name
: ${domoticz_group:=domoticz}
: ${domoticz_enable:=NO}
: ${domoticz_directory:=%%PREFIX%%/domoticz/domoticz}
-: ${domoticz_args:="-syslog -daemon -wwwbind 0.0.0.0"}
+: ${domoticz_args:="-syslog -daemon"}
#: ${domoticz_args:="-syslog -dbase %%PREFIX%%/domoticz/db/domoticz.db -daemon -wwwbind 0.0.0.0 -p /var/run/domoticz.pid"}
diff --git a/www/domoticz/files/patch-CMakeLists.txt b/www/domoticz/files/patch-CMakeLists.txt
index 38f80e889086..499e6a789fe4 100644
--- a/www/domoticz/files/patch-CMakeLists.txt
+++ b/www/domoticz/files/patch-CMakeLists.txt
@@ -1,57 +1,33 @@
---- CMakeLists.txt.orig 2015-12-17 18:30:44.000000000 +0100
-+++ CMakeLists.txt 2015-12-22 17:37:43.246216000 +0100
-@@ -10,7 +10,7 @@
- DEFINITION LUA_LIBRARIES)
- ELSE(USE_BUILTIN_LUA)
- find_package(PkgConfig)
-- pkg_check_modules(LUA lua>=5.2)
-+ pkg_check_modules(LUA lua-5.2)
- IF(LUA_FOUND)
- INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIRS})
- add_definitions(-DWITH_EXTERNAL_LUA)
-@@ -132,23 +132,24 @@
+--- CMakeLists.txt.orig 2016-11-10 15:44:33 UTC
++++ CMakeLists.txt
+@@ -163,7 +163,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ENDMACRO()
-FIND_PROGRAM(GIT_EXECUTABLE git
-- DOC "git command line client")
-+#FIND_PROGRAM(GIT_EXECUTABLE git
-+# DOC "git command line client")
++FIND_PROGRAM(GIT_EXECUTABLE NOgitNO
+ DOC "git command line client")
--MACRO(Gitversion_GET_REVISION dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
-- OUTPUT_VARIABLE ${variable}
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
--ENDMACRO(Gitversion_GET_REVISION)
--
--Gitversion_GET_REVISION(. ProjectRevision)
--MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
--MESSAGE(STATUS "Compiling Revision #${ProjectRevision}")
-+#MACRO(Gitversion_GET_REVISION dir variable)
-+# EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
-+# OUTPUT_VARIABLE ${variable}
-+# OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_REVISION)
-+
-+#Gitversion_GET_REVISION(. ProjectRevision)
-+#MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
-+#MESSAGE(STATUS "Compiling Revision #${ProjectRevision}")
-+MESSAGE(STATUS "Compiling Revision #XXXDOMOTICZXXX")
+ MACRO(Gitversion_GET_REVISION dir variable)
+@@ -653,14 +653,13 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_D
+ set(CMAKE_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
+ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- # The version number.
- set (domoticz_VERSION_MAJOR 3)
- set (domoticz_VERSION_MINOR 0)
--set (domoticz_VERSION_PATCH ${ProjectRevision})
-+set (domoticz_VERSION_PATCH XXXDOMOTICZXXX)
+-install(TARGETS domoticz DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS)
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION ${CMAKE_INSTALL_PREFIX})
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
++install(TARGETS domoticz DESTINATION "XXXPREFIXXXX")
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION "XXXPREFIXXXX")
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION "XXXPREFIXXXX")
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION "XXXPREFIXXXX")
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/server_cert.pem DESTINATION "XXXPREFIXXXX")
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION "XXXPREFIXXXX" USE_SOURCE_PERMISSIONS)
++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION "XXXPREFIXXXX")
- include_directories(${CMAKE_SOURCE_DIR}/main)
+ INCLUDE(TestBigEndian)
-@@ -482,7 +483,7 @@
- IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} mqtt ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS})
- else()
-- target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread ${LUA_LIBRARIES} mqtt ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS})
-+ target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} -LXXXPREFIXXX/lib pthread ${LUA_LIBRARIES} mqtt ${SQLite_LIBRARIES} ${CMAKE_DL_LIBS})
- ENDIF()
-
- ADD_PRECOMPILED_HEADER(domoticz "main/stdafx.h")
diff --git a/www/domoticz/files/patch-appversion.default b/www/domoticz/files/patch-appversion.default
new file mode 100644
index 000000000000..6ffbe742c2ca
--- /dev/null
+++ b/www/domoticz/files/patch-appversion.default
@@ -0,0 +1,9 @@
+--- appversion.default.orig 2016-11-10 15:44:33 UTC
++++ appversion.default
+@@ -1,3 +1,3 @@
+-#define APPVERSION 5876
+-#define APPHASH "b97777b"
+-#define APPDATE 1478691222
++#define APPVERSION XXXDOMOTICZXXX
++#define APPHASH "XXXHASHXXX"
++#define APPDATE XXXTIMEXXX
diff --git a/www/domoticz/files/patch-getgit.cmake b/www/domoticz/files/patch-getgit.cmake
index 1918b85c1811..f1a73fee9147 100644
--- a/www/domoticz/files/patch-getgit.cmake
+++ b/www/domoticz/files/patch-getgit.cmake
@@ -1,66 +1,70 @@
---- getgit.cmake.old 2015-12-15 12:12:10.000000000 +0100
-+++ getgit.cmake 2015-12-16 13:04:15.081839000 +0100
-@@ -1,34 +1,35 @@
- # the git.cmake module is part of the standard distribution
+--- getgit.cmake.orig 2016-11-10 15:44:33 UTC
++++ getgit.cmake
+@@ -1,66 +1,7 @@
+ # this macro gets called as a custom build step by running make
+ # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller
+
+-# the git.cmake module is part of the standard distribution
-find_package(Git)
-if(NOT GIT_FOUND)
- MESSAGE(FATAL_ERROR "Git not found!.")
-endif()
-
-MACRO(Gitversion_GET_REVISION dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
+- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
+- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-ENDMACRO(Gitversion_GET_REVISION)
-
-MACRO(Gitversion_GET_HASH dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD
+- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-ENDMACRO(Gitversion_GET_HASH)
-
-MACRO(Gitversion_GET_DATE dir variable)
-- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct
+- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct
+- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${variable}
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-ENDMACRO(Gitversion_GET_DATE)
-
--Gitversion_GET_REVISION(. ProjectRevision)
--Gitversion_GET_HASH(. ProjectHash)
--Gitversion_GET_DATE(. ProjectDate)
-+#find_package(Git)
-+#if(NOT GIT_FOUND)
-+# MESSAGE(FATAL_ERROR "Git not found!.")
-+#endif()
-+#
-+#MACRO(Gitversion_GET_REVISION dir variable)
-+# EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
-+# OUTPUT_VARIABLE ${variable}
-+# OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_REVISION)
-+#
-+#MACRO(Gitversion_GET_HASH dir variable)
-+# EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-+# OUTPUT_VARIABLE ${variable}
-+# OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_HASH)
-+#
-+#MACRO(Gitversion_GET_DATE dir variable)
-+# EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} show -s --format=%ct
-+# OUTPUT_VARIABLE ${variable}
-+# OUTPUT_STRIP_TRAILING_WHITESPACE)
-+#ENDMACRO(Gitversion_GET_DATE)
-+#
-+#Gitversion_GET_REVISION(. ProjectRevision)
-+#Gitversion_GET_HASH(. ProjectHash)
-+#Gitversion_GET_DATE(. ProjectDate)
-
- # write a file with the APPVERSION define
--MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
--file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
-+#MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
-+#file(WRITE appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
-+file(WRITE appversion.h.txt "#define APPVERSION XXXDOMOTICZXXX\n#define APPHASH \"XXXHASHXXX\"\n#define APPDATE XXXTIMEXXX\n")
- # copy the file to the final header only if the version changes
- # reduces needless rebuilds
-
+-MACRO(Gitversion_CHECK_DIRTY dir variable)
+- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD
+- WORKING_DIRECTORY ${dir}
+- OUTPUT_VARIABLE ${variable}
+- OUTPUT_STRIP_TRAILING_WHITESPACE)
+-ENDMACRO(Gitversion_CHECK_DIRTY)
+-
+-Gitversion_GET_REVISION("${SOURCE_DIR}" ProjectRevision)
+-IF(NOT ProjectRevision)
+- MESSAGE(STATUS "Failed to get ProjectRevision from git, set it to 0")
+- set (ProjectRevision 0)
+-ELSE(NOT ProjectRevision)
+- MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
+-ENDIF(NOT ProjectRevision)
+-Gitversion_GET_HASH("${SOURCE_DIR}" ProjectHash)
+-IF(NOT ProjectHash)
+- MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0")
+- set (ProjectHash 0)
+-ENDIF(NOT ProjectHash)
+-Gitversion_GET_DATE("${SOURCE_DIR}" ProjectDate)
+-IF(NOT ProjectDate)
+- MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0")
+- set (ProjectDate 0)
+-ENDIF(NOT ProjectDate)
+-Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty)
+-IF(ProjectDirty)
+- MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash")
+- set (ProjectHash "${ProjectHash}-modified")
+-ENDIF(ProjectDirty)
+-
+-# write a file with the APPVERSION define
+-file(WRITE ${SOURCE_DIR}/appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
+-
++set (ProjectDate 0)
+ # if ProjectDate is 0, create appversion.h.txt from a copy of appversion.default
+ IF(NOT ProjectDate AND EXISTS ${SOURCE_DIR}/appversion.default)
+ MESSAGE(STATUS "ProjectDate is 0 and appversion.default exists, copy it")
diff --git a/www/domoticz/pkg-descr b/www/domoticz/pkg-descr
index d48971e9fe9a..fc530247c992 100644
--- a/www/domoticz/pkg-descr
+++ b/www/domoticz/pkg-descr
@@ -3,4 +3,4 @@ various devices like: Lights, Switches, various sensors/meters like
Temperature, Rain, Wind, UV, Electra, Gas, Water and much more.
Notifications/Alerts can be sent to any mobile device
-WWW: http://www.domoticz.com/
+WWW: http://www.domoticz.com
diff --git a/www/domoticz/pkg-message b/www/domoticz/pkg-message
new file mode 100644
index 000000000000..b586a784fdfc
--- /dev/null
+++ b/www/domoticz/pkg-message
@@ -0,0 +1,14 @@
+Notice:
+ This port runs per default using uid:gid domoticz:domoticz to
+ avoid security problems.
+
+ Some code of Domoticz may needs root access. If you are ok with
+ that change the following rc.conf to:
+
+domoticz_user="root"
+domoticz_group="wheel"
+
+ And restart domoticz.
+
+If you have issues with domoticz listen option, you can add
+ net.inet6.ip6.v6only=0 to /etc/sysctl.conf
diff --git a/www/domoticz/pkg-plist b/www/domoticz/pkg-plist
index 473ef1bd028e..0cbfbd8c8f60 100644
--- a/www/domoticz/pkg-plist
+++ b/www/domoticz/pkg-plist
@@ -1,6 +1,7 @@
domoticz/Config/2gig/ct100.xml
domoticz/Config/2gig/ct101.xml
domoticz/Config/2gig/ct30.xml
+domoticz/Config/2gig/ct50e.xml
domoticz/Config/BeNext/1poleswitch.xml
domoticz/Config/BeNext/2poleswitch.xml
domoticz/Config/BeNext/AlarmSound.xml
@@ -9,6 +10,8 @@ domoticz/Config/BeNext/DoorSensor.xml
domoticz/Config/BeNext/EnergySwitch.xml
domoticz/Config/BeNext/HeatingControl.xml
domoticz/Config/BeNext/Molite.xml
+domoticz/Config/BeNext/PanicButton.xml
+domoticz/Config/BeNext/PanicWatch.xml
domoticz/Config/BeNext/PluginDimmer.xml
domoticz/Config/BeNext/SceneController.xml
domoticz/Config/BeNext/TagReader.xml
@@ -19,43 +22,79 @@ domoticz/Config/act/zdw232.xml
domoticz/Config/act/zir010.xml
domoticz/Config/act/zrp110.xml
domoticz/Config/act/zrw103.xml
-domoticz/Config/aeotec/alms.xml
-domoticz/Config/aeotec/doorbell_gen5.xml
-domoticz/Config/aeotec/doorwindow.xml
-domoticz/Config/aeotec/drycontactsensor.xml
-domoticz/Config/aeotec/dsd31.xml
-domoticz/Config/aeotec/hdss_gen5.xml
-domoticz/Config/aeotec/hem.xml
-domoticz/Config/aeotec/hemg2.xml
-domoticz/Config/aeotec/keyfob.xml
-domoticz/Config/aeotec/keyfob2.xml
-domoticz/Config/aeotec/ledbulb.xml
-domoticz/Config/aeotec/minimote.xml
-domoticz/Config/aeotec/msesv2.xml
-domoticz/Config/aeotec/multisensor6.xml
-domoticz/Config/aeotec/multisensor_gen5.xml
-domoticz/Config/aeotec/panicbtn.xml
-domoticz/Config/aeotec/recessed_doorsensor.xml
-domoticz/Config/aeotec/recessed_doorsensor_gen5.xml
-domoticz/Config/aeotec/sd6.xml
-domoticz/Config/aeotec/ses.xml
-domoticz/Config/aeotec/ses2.xml
-domoticz/Config/aeotec/ss6.xml
-domoticz/Config/aeotec/watersensor.xml
-domoticz/Config/aeotec/zstickgen5.xml
+domoticz/Config/aeotec/dsa03202.xml
+domoticz/Config/aeotec/dsa22.xml
+domoticz/Config/aeotec/dsa38.xml
+domoticz/Config/aeotec/dsb04100.xml
+domoticz/Config/aeotec/dsb05.xml
+domoticz/Config/aeotec/dsb09104.xml
+domoticz/Config/aeotec/dsb28.xml
+domoticz/Config/aeotec/dsb29.xml
+domoticz/Config/aeotec/dsb45.xml
+domoticz/Config/aeotec/dsb54.xml
+domoticz/Config/aeotec/dsc06106.xml
+domoticz/Config/aeotec/dsc08101.xml
+domoticz/Config/aeotec/dsc10.xml
+domoticz/Config/aeotec/dsc11.xml
+domoticz/Config/aeotec/dsc12104.xml
+domoticz/Config/aeotec/dsc13104.xml
+domoticz/Config/aeotec/dsc14104.xml
+domoticz/Config/aeotec/dsc18103.xml
+domoticz/Config/aeotec/dsc19103.xml
+domoticz/Config/aeotec/dsc24.xml
+domoticz/Config/aeotec/dsc26103.xml
+domoticz/Config/aeotec/dsc27103.xml
+domoticz/Config/aeotec/dsc35103.xml
+domoticz/Config/aeotec/dsd37.xml
+domoticz/Config/aeotec/zw056.xml
+domoticz/Config/aeotec/zw062.xml
+domoticz/Config/aeotec/zw074.xml
+domoticz/Config/aeotec/zw075.xml
+domoticz/Config/aeotec/zw078.xml
+domoticz/Config/aeotec/zw080.xml
+domoticz/Config/aeotec/zw088.xml
+domoticz/Config/aeotec/zw089.xml
+domoticz/Config/aeotec/zw090.xml
+domoticz/Config/aeotec/zw095.xml
+domoticz/Config/aeotec/zw096.xml
+domoticz/Config/aeotec/zw097.xml
+domoticz/Config/aeotec/zw098.xml
+domoticz/Config/aeotec/zw099.xml
+domoticz/Config/aeotec/zw100.xml
+domoticz/Config/aeotec/zw112.xml
+domoticz/Config/aeotec/zw117.xml
+domoticz/Config/aeotec/zw120.xml
+domoticz/Config/aeotec/zw121.xml
+domoticz/Config/aeotec/zw130.xml
+domoticz/Config/assa_abloy/KeyfreeConnected.xml
domoticz/Config/assa_abloy/RealLivingCapTouch.xml
domoticz/Config/cooper/RF9505-T.xml
domoticz/Config/cooper/RF9540-N.xml
domoticz/Config/danfoss/living.xml
+domoticz/Config/danfoss/rsroom.xml
domoticz/Config/danfoss/z.xml
domoticz/Config/device_classes.xml
domoticz/Config/device_classes.xsd
domoticz/Config/device_configuration.xsd
+domoticz/Config/devolo/mt02648.xml
+domoticz/Config/devolo/mt2646.xml
+domoticz/Config/devolo/mt2647.xml
domoticz/Config/dlink/dch-z110.xml
+domoticz/Config/dlink/dch-z120.xml
+domoticz/Config/dlink/dch-z510.xml
+domoticz/Config/domitech/zb22uk.xml
+domoticz/Config/domitech/ze27eu.xml
domoticz/Config/dragontech/wd-100.xml
+domoticz/Config/duwi/05458.xml
domoticz/Config/duwi/ZWES1000.xml
domoticz/Config/duwi/ZWESJ300.xml
-domoticz/Config/eneco/ed20.xml
+domoticz/Config/duwi/zwfb.xml
+domoticz/Config/electronicsolutions/dbmz.xml
+domoticz/Config/enerwave/zw15s.xml
+domoticz/Config/enerwave/zw20r.xml
+domoticz/Config/enerwave/zw20rm.xml
+domoticz/Config/enerwave/zw500d.xml
+domoticz/Config/enerwave/zwn-bpc.xml
domoticz/Config/enerwave/zwn-sc7.xml
domoticz/Config/eurotronic/eur_cometz.xml
domoticz/Config/eurotronic/eur_stellaz.xml
@@ -65,6 +104,8 @@ domoticz/Config/everspring/an145.xml
domoticz/Config/everspring/an158.xml
domoticz/Config/everspring/an179.xml
domoticz/Config/everspring/an180.xml
+domoticz/Config/everspring/an181.xml
+domoticz/Config/everspring/hac01.xml
domoticz/Config/everspring/hsp02.xml
domoticz/Config/everspring/se812.xml
domoticz/Config/everspring/sf812.xml
@@ -79,27 +120,46 @@ domoticz/Config/everspringct/hsm02.xml
domoticz/Config/evolve/lrm-as.xml
domoticz/Config/evolve/lsm-15.xml
domoticz/Config/evolve/ltm-5.xml
+domoticz/Config/fakro/zws12.xml
+domoticz/Config/fakro/zws230.xml
domoticz/Config/fibaro/fgbs001.xml
domoticz/Config/fibaro/fgd211.xml
domoticz/Config/fibaro/fgd212.xml
domoticz/Config/fibaro/fgfs101.xml
+domoticz/Config/fibaro/fgfs101zw5.xml
+domoticz/Config/fibaro/fggc001.xml
domoticz/Config/fibaro/fgk001.xml
+domoticz/Config/fibaro/fgk10x.xml
domoticz/Config/fibaro/fgms.xml
+domoticz/Config/fibaro/fgpb101.xml
domoticz/Config/fibaro/fgr221.xml
+domoticz/Config/fibaro/fgr222.xml
domoticz/Config/fibaro/fgrgbwm441.xml
domoticz/Config/fibaro/fgrm222.xml
domoticz/Config/fibaro/fgs211.xml
domoticz/Config/fibaro/fgs212.xml
+domoticz/Config/fibaro/fgs213.xml
domoticz/Config/fibaro/fgs221.xml
domoticz/Config/fibaro/fgs222.xml
+domoticz/Config/fibaro/fgs223.xml
domoticz/Config/fibaro/fgsd002.xml
domoticz/Config/fibaro/fgss101.xml
domoticz/Config/fibaro/fgwpe.xml
+domoticz/Config/firstalert/zcombo.xml
domoticz/Config/fortrezz/mimolite.xml
+domoticz/Config/fortrezz/ssa2.xml
+domoticz/Config/fortrezz/ssa3.xml
+domoticz/Config/fortrezz/wv01.xml
+domoticz/Config/fortrezz/wwa02.xml
domoticz/Config/frostdale/fdn2nxx.xml
+domoticz/Config/ge/12724-dimmer.xml
domoticz/Config/ge/dimmer.xml
domoticz/Config/ge/dimmer_module.xml
+domoticz/Config/ge/hinge-pin.xml
+domoticz/Config/ge/receptacle.xml
domoticz/Config/ge/relay.xml
+domoticz/Config/gr/gr105.xml
+domoticz/Config/gr/gr105n.xml
domoticz/Config/greenwave/powernode1.xml
domoticz/Config/greenwave/powernode6.xml
domoticz/Config/homeseer/ezmotionplus.xml
@@ -107,18 +167,29 @@ domoticz/Config/homeseer/hsm100.xml
domoticz/Config/homeseer/hsm200.xml
domoticz/Config/homeseer/ztroller.xml
domoticz/Config/honeywell/th8320zw1000.xml
+domoticz/Config/horstmann/asrzw.xml
domoticz/Config/horstmann/hrt4zw.xml
+domoticz/Config/horstmann/scsc17.xml
+domoticz/Config/horstmann/ses302.xml
+domoticz/Config/horstmann/ses303.xml
+domoticz/Config/horstmann/sir321.xml
+domoticz/Config/horstmann/srt323.xml
+domoticz/Config/idlock/idlock101.xml
domoticz/Config/intermatic/ca8900.xml
domoticz/Config/iris/rangeextender.xml
+domoticz/Config/kwikset/smartcode.xml
domoticz/Config/leviton/rzi10.xml
domoticz/Config/leviton/vrcpg.xml
domoticz/Config/leviton/vrf01.xml
domoticz/Config/leviton/vri06.xml
domoticz/Config/leviton/vri10.xml
+domoticz/Config/linear/LB60Z-1.xml
domoticz/Config/linear/PD300Z-2.xml
+domoticz/Config/linear/WA00Z-1.xml
domoticz/Config/linear/WD500Z-1.xml
domoticz/Config/manufacturer_specific.xml
domoticz/Config/manufacturer_specific.xsd
+domoticz/Config/mcohome/mhp210.xml
domoticz/Config/mcohome/mhs311.xml
domoticz/Config/mcohome/mhs312.xml
domoticz/Config/mcohome/mhs314.xml
@@ -127,66 +198,107 @@ domoticz/Config/mcohome/mhs412.xml
domoticz/Config/mcohome/mhs513.xml
domoticz/Config/merten/507801.xml
domoticz/Config/merten/50x5xx.xml
+domoticz/Config/nexia/db100z.xml
domoticz/Config/nodon/asp3100SmartPlug.xml
domoticz/Config/nodon/crc3100OctanRemote.xml
+domoticz/Config/nodon/crc360xSofremote.xml
domoticz/Config/nodon/cws3101wallswitch.xml
+domoticz/Config/nodon/msp31xxMicroSmartPlug.xml
+domoticz/Config/northq/nq9021.xml
domoticz/Config/northq/nq9121.xml
domoticz/Config/northq/nq92021.xml
domoticz/Config/options.xml
domoticz/Config/options.xsd
+domoticz/Config/philio/pan03.xml
domoticz/Config/philio/pan04.xml
+domoticz/Config/philio/pan08.xml
+domoticz/Config/philio/phpab01.xml
+domoticz/Config/philio/phpat02.xml
+domoticz/Config/philio/phpsg01.xml
+domoticz/Config/philio/pse02.xml
domoticz/Config/philio/psm02.xml
+domoticz/Config/philio/psr04.xml
domoticz/Config/philio/pst02-1c.xml
domoticz/Config/philio/pst02-b.xml
domoticz/Config/philio/pst02.xml
domoticz/Config/polycontrol/doorlock.xml
domoticz/Config/polycontrol/keypad.xml
domoticz/Config/polycontrol/polylock.xml
+domoticz/Config/popp/009105.xml
+domoticz/Config/popp/009303.xml
domoticz/Config/popp/123580.xml
domoticz/Config/popp/123601.xml
domoticz/Config/popp/123658.xml
-domoticz/Config/popp/POP009303.xml
-domoticz/Config/popp/POPE009105.xml
+domoticz/Config/popp/smoke-detector.xml
+domoticz/Config/popp/solar-siren.xml
domoticz/Config/popp/zweather.xml
+domoticz/Config/qees/reto-dimmer-plus.xml
domoticz/Config/qees/reto-plugin-switch.xml
domoticz/Config/qubino/ZMNHAA2.xml
-domoticz/Config/qubino/ZMNHAD1.xml
+domoticz/Config/qubino/ZMNHADx.xml
domoticz/Config/qubino/ZMNHBA2.xml
-domoticz/Config/qubino/ZMNHBD2.xml
+domoticz/Config/qubino/ZMNHBDx.xml
domoticz/Config/qubino/ZMNHCA2.xml
-domoticz/Config/qubino/ZMNHCD.xml
+domoticz/Config/qubino/ZMNHCDx.xml
domoticz/Config/qubino/ZMNHDA2.xml
-domoticz/Config/qubino/ZMNHDD1.xml
+domoticz/Config/qubino/ZMNHDDx.xml
domoticz/Config/qubino/ZMNHIA2.xml
+domoticz/Config/qubino/ZMNHIDxS1.xml
+domoticz/Config/qubino/ZMNHIDxS2.xml
domoticz/Config/qubino/ZMNHJA2.xml
domoticz/Config/qubino/ZMNHJD1.xml
-domoticz/Config/qubino/ZMNHND1.xml
+domoticz/Config/qubino/ZMNHKDx.xml
+domoticz/Config/qubino/ZMNHLAx.xml
+domoticz/Config/qubino/ZMNHLDx.xml
+domoticz/Config/qubino/ZMNHNDx.xml
+domoticz/Config/qubino/ZMNHODx.xml
+domoticz/Config/qubino/ZMNHSDx.xml
+domoticz/Config/qubino/ZMNHTDx.xml
+domoticz/Config/qubino/ZMNHUD1.xml
+domoticz/Config/qubino/ZMNHVDx.xml
+domoticz/Config/qubino/ZMNHZDx.xml
domoticz/Config/rcs/em52-zw.xml
domoticz/Config/rcs/pm12-zw.xml
domoticz/Config/rcs/therm0005.xml
domoticz/Config/rcs/therm0007.xml
domoticz/Config/rcs/therm0009.xml
domoticz/Config/remotec/zfm-80.xml
+domoticz/Config/remotec/zrc-90.xml
+domoticz/Config/remotec/zts-110.xml
domoticz/Config/remotec/zurc.xml
domoticz/Config/remotec/zxt-120.xml
domoticz/Config/schlage/BE469NXCEN.xml
domoticz/Config/schlagelink/itemp.xml
domoticz/Config/schlagelink/minikeypad.xml
-domoticz/Config/sensative/strips-mazw.xml
+domoticz/Config/sensative/strips.xml
+domoticz/Config/shenzen_neo/nas-ds01z.xml
+domoticz/Config/shenzen_neo/nas-pd01z.xml
+domoticz/Config/shenzen_neo/nas-wr01z.xml
+domoticz/Config/shenzen_neo/nas-ws02z.xml
+domoticz/Config/stelpro/stzw402.xml
domoticz/Config/swiid/swiidinter.xml
domoticz/Config/swiid/swiidplug.xml
-domoticz/Config/thermofloor/multireg.xml
+domoticz/Config/telldus/tzdw100.xml
+domoticz/Config/thermofloor/heatit021.xml
domoticz/Config/trane/TZEMT400AB32MAA.xml
domoticz/Config/trane/TZEMT400BB32MAA.xml
domoticz/Config/vision/zd2102.xml
+domoticz/Config/vision/zd2201.xml
+domoticz/Config/vision/zd2301.xml
+domoticz/Config/vision/zg8101.xml
domoticz/Config/vision/zm1601eu.xml
+domoticz/Config/vision/zm1601eu5.xml
domoticz/Config/vision/zm1602eu.xml
+domoticz/Config/vision/zm1602eu5.xml
domoticz/Config/vision/zp3102.xml
+domoticz/Config/vision/zp3111.xml
domoticz/Config/vision/zs5101eu.xml
domoticz/Config/vitrum/vitrumBS.xml
domoticz/Config/waynedalton/WDTC-20.xml
domoticz/Config/wenzhou/sm103.xml
domoticz/Config/wenzhou/tsp01.xml
+domoticz/Config/wenzhou/tz55.xml
+domoticz/Config/wenzhou/tz56.xml
domoticz/Config/wenzhou/tz65d.xml
domoticz/Config/wenzhou/tz66d.xml
domoticz/Config/wenzhou/tz67.xml
@@ -194,18 +306,26 @@ domoticz/Config/wenzhou/tz68.xml
domoticz/Config/wenzhou/tz88.xml
domoticz/Config/widom/UBS104.xml
domoticz/Config/widom/UME304C_S.xml
+domoticz/Config/widom/WDS.xml
domoticz/Config/zipato/MiniKeypad.xml
domoticz/Config/zipato/RGBBulb.xml
+domoticz/Config/zooz/zen07.xml
+domoticz/Config/zooz/zse08.xml
+domoticz/Config/zooz/zse09.xml
domoticz/Config/zwave.me/ZME_05431.xml
domoticz/Config/zwave.me/ZME_06433.xml
domoticz/Config/zwave.me/ZME_06436.xml
domoticz/Config/zwave.me/ZME_064381.xml
domoticz/Config/zwave.me/ZME_064435.xml
domoticz/Config/zwave.me/ZME_KFOB-S.xml
+domoticz/Config/zwave.me/ZME_RC2.xml
domoticz/Config/zwave.me/ZME_WALLC-S.xml
domoticz/Config/zwave.me/ZME_WCD2.xml
+domoticz/Config/zwave.me/ZUno.xml
domoticz/Config/zwave.me/iTemp.xml
domoticz/Config/zwave.me/kfob.xml
+domoticz/Config/zwave.me/popp_kfob-c.xml
+domoticz/Config/zwave.me/zweather.xml
domoticz/Config/zwcfg.xsd
domoticz/Config/zwscene.xsd
domoticz/History.txt
@@ -215,30 +335,37 @@ domoticz/scripts/_domoticz_main
domoticz/scripts/_domoticz_main.bat
domoticz/scripts/buienradar_rain_example.pl
domoticz/scripts/download_update.sh
+domoticz/scripts/logrotate/domoticz
+domoticz/scripts/lua/JSON.lua
domoticz/scripts/lua/script_device_demo.lua
domoticz/scripts/lua/script_time_demo.lua
domoticz/scripts/lua_parsers/example.lua
domoticz/scripts/lua_parsers/example_json.lua
+domoticz/scripts/lua_parsers/example_owm.lua
domoticz/scripts/lua_parsers/example_xml.lua
domoticz/scripts/python/domoticz.py
+domoticz/scripts/python/googlepubsub.py
domoticz/scripts/python/reloader.py
domoticz/scripts/python/script_device_PIRsmarter.py
domoticz/scripts/readme.txt
domoticz/scripts/restart_domoticz
domoticz/scripts/templates/All.Lua
+domoticz/scripts/templates/All.Python
domoticz/scripts/templates/Device.Lua
domoticz/scripts/templates/Security.Lua
domoticz/scripts/templates/Time.Lua
domoticz/scripts/templates/UserVariable.Lua
domoticz/scripts/update_domoticz
-domoticz/updatedomo
+domoticz/server_cert.pem
domoticz/www/app/AboutController.js
domoticz/www/app/CamController.js
domoticz/www/app/CustomIconsController.js
domoticz/www/app/DPFibaroController.js
+domoticz/www/app/DPGooglePubSubController.js
domoticz/www/app/DPHttpController.js
domoticz/www/app/DashboardController.js
domoticz/www/app/DevicesController.js
+domoticz/www/app/DummyController.js
domoticz/www/app/EventsController.js
domoticz/www/app/FloorplanController.js
domoticz/www/app/FloorplanEditController.js
@@ -258,6 +385,9 @@ domoticz/www/app/RoomplanController.js
domoticz/www/app/ScenesController.js
domoticz/www/app/SetupController.js
domoticz/www/app/TemperatureController.js
+domoticz/www/app/TemperatureCustomLogController.js
+domoticz/www/app/TemperatureLogController.js
+domoticz/www/app/TemperatureNotificationsController.js
domoticz/www/app/UpdateController.js
domoticz/www/app/UserVariablesController.js
domoticz/www/app/UsersController.js
@@ -345,6 +475,7 @@ domoticz/www/i18n/domoticz-nl.json.gz
domoticz/www/i18n/domoticz-no.json.gz
domoticz/www/i18n/domoticz-pl.json.gz
domoticz/www/i18n/domoticz-pt.json.gz
+domoticz/www/i18n/domoticz-ro.json.gz
domoticz/www/i18n/domoticz-ru.json.gz
domoticz/www/i18n/domoticz-sk.json.gz
domoticz/www/i18n/domoticz-sl.json.gz
@@ -353,6 +484,7 @@ domoticz/www/i18n/domoticz-sv.json.gz
domoticz/www/i18n/domoticz-th.json.gz
domoticz/www/i18n/domoticz-tr.json.gz
domoticz/www/i18n/domoticz-uk.json.gz
+domoticz/www/i18n/domoticz-zh.json.gz
domoticz/www/images/Alarm.png
domoticz/www/images/Alarm48_Off.png
domoticz/www/images/Alarm48_On.png
@@ -378,6 +510,9 @@ domoticz/www/images/Cooling.png
domoticz/www/images/Cooling48_Off.png
domoticz/www/images/Cooling48_On.png
domoticz/www/images/Counter48.png
+domoticz/www/images/Custom.png
+domoticz/www/images/Custom48_Off.png
+domoticz/www/images/Custom48_On.png
domoticz/www/images/Dimmer48_Off.png
domoticz/www/images/Dimmer48_On.png
domoticz/www/images/Down48.png
@@ -476,6 +611,7 @@ domoticz/www/images/camera_default.png
domoticz/www/images/capture.png
domoticz/www/images/clock.png
domoticz/www/images/clock48.png
+domoticz/www/images/clock48_On.png
domoticz/www/images/collection.png
domoticz/www/images/collection_hover.png
domoticz/www/images/contact.png
@@ -746,6 +882,7 @@ domoticz/www/js/angular-tree-control.js.gz
domoticz/www/js/angular.min.js.gz
domoticz/www/js/angularAMD.min.js.gz
domoticz/www/js/blockly_compressed.js.gz
+domoticz/www/js/blocks_compressed.js.gz
domoticz/www/js/bootbox.min.js.gz
domoticz/www/js/bootstrap.min.js.gz
domoticz/www/js/colpick.js.gz
@@ -798,18 +935,25 @@ domoticz/www/js/require.js.gz
domoticz/www/js/respond.min.js.gz
domoticz/www/js/themes/dark-blue.js.gz
domoticz/www/js/themes/dark-green.js.gz
+domoticz/www/js/themes/dark-ucust.js.gz
domoticz/www/js/themes/gray.js.gz
domoticz/www/js/themes/grid.js.gz
domoticz/www/js/themes/skies.js.gz
domoticz/www/js/ui-bootstrap.min.js.gz
domoticz/www/js/wow.min.js.gz
domoticz/www/media/1x1.gif
+domoticz/www/media/click.mp3
domoticz/www/media/click.wav
+domoticz/www/media/delete.mp3
domoticz/www/media/delete.wav
+domoticz/www/media/disconnect.wav
domoticz/www/media/handclosed.cur
+domoticz/www/media/handdelete.cur
domoticz/www/media/handopen.cur
domoticz/www/media/quote0.png
domoticz/www/media/quote1.png
+domoticz/www/media/sprites.png
+domoticz/www/media/sprites.svg
domoticz/www/media/swf/copy_csv_xls.swf
domoticz/www/media/swf/copy_csv_xls_pdf.swf
domoticz/www/media/trashbody.png
@@ -857,6 +1001,7 @@ domoticz/www/styles/element-light/images/imgbg.jpg
domoticz/www/styles/elemental/custom.css
domoticz/www/styles/elemental/fonts/DroidSans.ttf
domoticz/www/styles/elemental/fonts/OpenSans.ttf
+domoticz/www/styles/elemental/images/bg-track.png
domoticz/www/styles/elemental/images/imgbg.jpg
domoticz/www/styles/simple-blue/custom.css
domoticz/www/styles/simple-gray/custom.css
@@ -869,6 +1014,7 @@ domoticz/www/views/customicons.html
domoticz/www/views/dashboard.html
domoticz/www/views/devices.html
domoticz/www/views/dpfibaro.html
+domoticz/www/views/dpgooglepubsub.html
domoticz/www/views/dphttp.html
domoticz/www/views/events.html
domoticz/www/views/floorplanedit.html
@@ -890,11 +1036,16 @@ domoticz/www/views/roomplan.html
domoticz/www/views/scenes.html
domoticz/www/views/setup.html
domoticz/www/views/temperature.html
+domoticz/www/views/temperature_custom_temp_log.html
+domoticz/www/views/temperature_log.html
+domoticz/www/views/temperature_notifications.html
+domoticz/www/views/temperatures/temperatureWidget.html
domoticz/www/views/update.html
domoticz/www/views/users.html
domoticz/www/views/uservariables.html
domoticz/www/views/utility.html
domoticz/www/views/weather.html
+domoticz/www/views/weather_widget.html
domoticz/www/zwavetopology.html
@dir(domoticz,domoticz) /var/db/domoticz
@dir(domoticz,domoticz) /var/run/domoticz