Isaac Connor 8a80cf686b Merge branch 'master' into storageareas

2018-04-26 21:58:34 -04:00

..

csrf

Fixes to montagereview and only load event data when in History mode

2017-11-28 14:50:21 -05:00

actions.php

Merge branch 'master' into storageareas

2018-04-26 21:58:34 -04:00

auth.php

Add output of paused image when paused

2018-04-12 18:43:57 -04:00

config.php.in

Migrate Webcache out of webroot (#2083)

2018-04-19 15:01:46 -04: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

Control.php

fix spacing, add code comment

2018-03-03 09:25:04 -08:00

database.php

Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas

2018-04-25 09:39:10 -04:00

Event.php

Add find_one and caching

2018-04-20 14:23:04 -04:00

Filter.php

implement Storage Area move

2017-12-04 11:05:50 -05:00

Frame.php

always return an array from find_all

2018-04-20 14:23:27 -04:00

functions.php

New Monitor Type - Website (#2065)

2018-04-26 17:18:36 -04:00

Group.php

spacing

2018-04-18 12:30:32 -04: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

Monitor.php

spacing

2018-04-25 09:31:40 -04:00

MontageLayout.php

montage layout improvements

2017-11-22 12:33:34 -05:00

Server.php

return proper hostname when not using multiple servers

2018-02-12 14:44:58 -05:00

Storage.php

Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas

2018-04-17 14:18:01 -07:00