APHW2 MFGENG 4e080b8a36 Merge branch 'storageareas' into ffmpeg_output ...

Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
	scripts/ZoneMinder/lib/ZoneMinder/Object.pm

2017-11-07 18:25:33 -08:00

..

csrf

Fix Debug to Logger::Debug

2017-05-18 12:49:59 -04:00

actions.php

clear the cookie for zmMontageLayout

2017-11-01 13:07:35 -04:00

config.php.in

turn off debug

2017-10-07 11:31:48 -04:00

control_functions.php

fix regexp for direction in control command. Also log if the regexp doesn't match

2017-01-10 12:35:38 -05:00

database.php

handle when sql error occurs and no params given

2017-11-03 15:45:11 -04:00

Event.php

fix seg fault, fix pkt pts dts/duration. Stil wrong framerate

2017-10-26 10:12:56 -07:00

Filter.php

Add EndTime and DiskSpace to Filters

2017-10-25 11:11:19 -07:00

Frame.php

add setting of values to anonymouse member function

2017-10-17 10:09:14 -07:00

functions.php

add missing breaks

2017-11-03 15:44:53 -04:00

Group.php

add Type to Storage

2017-10-12 07:32:48 -07:00

lang.php

update gpl 2 mailing address in source files

2016-12-26 09:23:16 -06:00

logger.php

google code style and quotes

2017-10-20 14:54:28 -04:00

Monitor.php

Only start a monitor if it has a Function

2017-11-05 11:54:00 -05:00

MontageLayout.php

populate the Id of the layout when inserting it

2017-11-01 13:07:24 -04:00

Server.php

trivial updates (#1887)

2017-05-16 14:16:32 -04:00

Storage.php

Fixes

2017-10-23 11:50:45 -07:00