SteveGilvarry b79c2c1604 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch ...

Conflicts:
	web/skins/classic/views/event.php
	web/skins/classic/views/timeline.php

Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.

2014-12-25 08:24:48 +10:00

..

ZoneMinder

Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch

2014-12-25 08:24:48 +10:00

CMakeLists.txt

rename and process zmsystemctl.pl.in

2014-08-19 17:19:44 -05:00

Makefile.am

rename and process zmsystemctl.pl.in

2014-08-19 17:19:44 -05:00

zm.in

Update zm.in

2014-11-23 11:09:52 -06:00

zmaudit.pl.in

add a check for db connection to handle the db going away and coming back

2014-10-15 09:43:00 -04:00

zmcamtool.pl.in

Imported missing files from master to feature-h264-videostorage

2014-05-30 01:47:52 +10:00

zmcontrol.pl.in

This replaces Module::Load with Module::Load::Conditional which can actually handle errors.

2014-12-12 16:33:18 -05:00

zmdbbackup.in

remake this branch off master instead of off mysql2PDO.

2013-11-01 09:47:28 -04:00

zmdbrestore.in

Migrate svn to git

2013-03-17 00:45:21 +01:00

zmdc.pl.in

Don't use Data::Dumper unless you are actually using it for debugging. No need to use ram. It is probably being included by one of the libraries anyways, but let's at least try to keep things as light as possible.

2014-11-25 14:44:08 -05:00

zmeventdump.in

remake this branch off master instead of off mysql2PDO.

2013-11-01 09:47:28 -04:00

zmfilter.pl.in

Revert "Broke zmfilter.pl.in in order to test travis"

2014-01-04 15:10:15 -05:00

zmlogrotate.conf.in

Migrate svn to git

2013-03-17 00:45:21 +01:00

zmpkg.pl.in

auto-recreate missing folders during startup

2014-10-05 11:25:41 -05:00

zmsystemctl.pl.in

rename and process zmsystemctl.pl.in

2014-08-19 17:19:44 -05:00

zmtrack.pl.in

fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN}

2014-12-17 16:35:30 -05:00

zmtrigger.pl.in

Update zmtrigger.pl.in

2014-04-30 15:07:29 +02:00

zmupdate.pl.in

fix putting the mode back. I merged it to the wrong place

2014-11-19 13:54:10 -05:00

zmvideo.pl.in

Merge branch 'master' into feature-h264-videostorage

2014-05-30 01:55:24 +10:00

zmwatch.pl.in

Change COnfig from using the subroutine symbol table to just using a global hash

2013-12-16 16:32:02 -05:00

zmx10.pl.in

COnfig fixes

2014-01-03 09:33:49 -05:00