Isaac Connor 215660a817 Merge branch 'storageareas' into zma_to_thread ... Conflicts: src/zm_ffmpeg_camera.cpp src/zm_packetqueue.cpp src/zm_videostore.cpp src/zm_videostore.h web/includes/Event.php web/skins/classic/views/events.php		2018-01-24 11:06:19 -05:00
..
csrf	Fixes to montagereview and only load event data when in History mode	2017-11-28 14:50:21 -05:00
Event.php	Merge branch 'storageareas' into zma_to_thread	2018-01-24 11:06:19 -05:00
Filter.php	implement Storage Area move	2017-12-04 11:05:50 -05:00
Frame.php	add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE	2017-12-18 12:52:26 -05:00
Group.php	Change the Group dropdown to a single indented dropdown, and use chosen on it	2018-01-12 11:25:15 -08:00
Monitor.php	Merge branch 'storageareas' into zma_to_thread	2018-01-21 11:13:06 -05:00
MontageLayout.php	montage layout improvements	2017-11-22 12:33:34 -05:00
Server.php	Fix zmaudit.pl => zmaudit, etc.	2018-01-17 14:22:04 -05:00
Storage.php	Merge branch 'storageareas' into zma_to_thread	2018-01-21 11:13:06 -05:00
actions.php	Merge branch 'storageareas' into zma_to_thread	2018-01-24 11:06:19 -05:00
config.php.in	re-init logger after loading config to actually pick up the appropriate values. This stops the error logging of Info to weblog when weblog is actually set to None. Also update quotes	2017-12-20 10:19:24 -05:00
control_functions.php	Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.	2018-01-11 13:14:11 -05:00
database.php	whitespace	2018-01-22 11:42:19 -05:00
functions.php	Merge branch 'storageareas' into zma_to_thread	2018-01-24 11:06:19 -05:00
lang.php	Fix user language setting never being used	2017-09-29 11:20:20 +10:00
logger.php	Turn off debug	2018-01-19 08:17:33 -08:00