Isaac Connor a1392bf613 Merge branch 'storageareas' into zma_to_thread ... Conflicts: src/zm_ffmpeg_camera.cpp src/zm_mpeg.cpp src/zmc.cpp		2018-02-02 14:23:26 -05:00
..
add_monitors.php	Merge branch 'storageareas' into zma_to_thread	2018-01-29 15:53:26 -05:00
alarm.php	improve error message. The unrecognized action error happens above, so this error should just mention permissions	2016-05-16 14:38:40 -04:00
console.php	merge from sa the ajax file to apply the sorting.	2017-05-25 14:08:04 -04:00
control.php	Use Monitor class instead of old sql	2015-12-09 09:23:42 -05:00
event.php	Add download video option to events view	2017-12-03 14:42:07 -05:00
log.php	Merge branch 'master' into storageareas	2017-07-11 16:15:02 -04:00
status.php	Merge branch 'storageareas' into zma_to_thread	2018-01-29 15:53:26 -05:00
stream.php	tweak timeouts	2018-01-31 15:51:12 -05:00
zone.php	change quotes to prevent php7 complaint	2016-04-09 11:25:56 -04:00