SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h		2016-01-30 15:45:08 +11:00
..
Makefile.am	add Monitor class	2015-09-17 15:29:36 -04:00
Monitor.php	Slight update to allow the instantiation with no row or Id	2015-12-22 09:52:33 -05:00
Server.php	return empty for the non multi-server case	2016-01-04 13:46:05 -05:00
actions.php	Merge branch 'master' into multi-server	2015-12-09 10:43:38 -05:00
config.php.in	check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message	2015-09-16 11:12:04 -04:00
control_functions.php	convert monitor hash accesses to function calls	2015-12-01 15:16:43 -05:00
database.php	Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.	2015-11-11 16:56:28 -05:00
functions.php	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-01-30 15:45:08 +11: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