SteveGilvarry 20c295ad0c Merge remote-tracking branch 'upstream/master' into feature-plugins ... Conflicts: .travis.yml CMakeLists.txt Makefile.am bootstrap.sh configure.ac distros/debian8/control distros/debian_cmake/control misc/Makefile.am scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in src/CMakeLists.txt src/Makefile.am src/zm_monitor.cpp src/zm_monitor.h src/zmstreamer.cpp web/lang/ru_ru.php web/skins/classic/css/classic/views/Makefile.am web/skins/classic/css/flat/views/Makefile.am web/skins/classic/views/Makefile.am web/skins/classic/views/js/Makefile.am		2016-04-07 00:00:38 +10:00
..
Monitor.php	implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220	2016-01-04 13:15:50 -05:00
Server.php	return empty for the non multi-server case	2016-01-04 13:46:05 -05:00
actions.php	Merge remote-tracking branch 'upstream/master' into feature-plugins	2016-04-07 00:00:38 +10:00
config.php.in	change multi-server error message text	2016-03-01 11:12:54 -06: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	fix ZM_SERVER_ID instead of ZM_SERVER	2016-04-04 16:34:21 -04: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