zoneminder/web/includes
Emmanuel Papin b294569147 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
Merging conflicts fixed in files:
	CMakeLists.txt
	configure.ac
	distros/debian_cmake/control
	src/zm_monitor.h
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
2015-07-20 16:49:04 +02:00
..
Makefile.am Migrate svn to git 2013-03-17 00:45:21 +01:00
actions.php Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-07-20 16:49:04 +02:00
config.php.in Don't show ONVIf probe link when ONVIF support is not enabled 2015-02-21 11:12:07 -06:00
control_functions.php add sendControlCommand function to do the heavy work of sending zmcontrol a command 2015-01-07 16:24:07 -05:00
database.php fixes WRT to db logging. I believe fixes issue #504 2014-09-26 14:43:58 -04:00
functions.php fixes to format date into zero padding and year as 2 digit 2015-02-06 13:00:55 -05:00
lang.php add translate function 2015-05-10 08:10:30 -05:00
logger.php remove unneccessary quoting and escaping 2013-12-06 15:51:36 -05:00