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	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
alarm.php	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
control.php	Use Monitor class instead of old sql	2015-12-09 09:23:42 -05:00
event.php	close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.	2015-04-20 13:06:34 -04:00
log.php	test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.	2016-01-02 14:36:37 -05:00
status.php	better way of detecting showing image or video in timeline and event view	2015-10-24 22:22:52 -07:00
stream.php	reduce the wait to 2/10ths instead of a whole second	2015-06-05 11:49:05 -04:00
zone.php	more updates	2013-12-17 11:07:19 -05:00