Isaac Connor 75919c9cd5 Merge branch 'master' into multi-server ... Conflicts: docs/installationguide/ubuntu.rst misc/apache.conf.in src/zm_monitor.cpp		2015-08-27 10:34:47 -04:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	Restart capture process after deleting a Privacy zone	2015-08-27 10:12:54 +02:00
config.php.in	Merge branch 'master' into multi-server	2015-08-19 13:30:48 -04: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	Send login activity to the zoneminder event log	2015-08-17 17:54:17 -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