SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h src/zm_remote_camera_rtsp.h web/skins/classic/views/monitor.php		2015-10-23 22:07:22 +11:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	recaptcha now displays translated message if secret is wrong	2015-09-25 11:11:15 -04:00
config.php.in	define Groups permission for the default user	2015-08-15 16:47:07 -05: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	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-10-23 22:07:22 +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