Isaac Connor f3a807f1f8 Merge branch 'master' into storageareas

2019-01-07 09:21:25 -05:00

..

actions

Merge branch 'master' into storageareas

2019-01-07 09:21:25 -05:00

csrf

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

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

auth.php

Merge branch 'master' into cleanup_auth

2018-12-11 16:04:42 -05:00

config.php.in

Don't load & process categories in initial config loading

2018-10-19 15:00:30 -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

Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209

2018-09-15 09:42:59 -04:00

database.php

fix dbError and cause it to return the error string instead of just logging it. Add error logging of db errors that don't throw exceptions.

2018-11-07 12:33:18 -05:00

Event.php

fix path to thumb and anal images (#2367)

2018-12-28 10:46:13 -05:00

Filter.php

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

2018-09-20 13:37:46 -04:00

Frame.php

Update Frame::find_one so that we can specify an ordering for find_one and so that semantics match other objects find methods

2018-10-11 09:14:40 -04:00

functions.php

Merge branch 'split_actions' into storageareas

2019-01-04 15:28:55 -05:00

Group.php

Change depth function to be 0-based.

2018-12-24 09:38:55 -05:00

lang.php

whitespace

2018-12-20 14:58:38 -05:00

logger.php

Log errors shouldn't be fatal

2018-08-22 17:22:40 -04:00

Monitor.php

Merge branch 'master' into storageareas

2018-12-11 10:21:22 -05:00

MontageLayout.php

Fix no quotes around Id

2019-01-04 09:34:42 -05:00

Server.php

support for forwarded proto/port in Server.php (#2343)

2018-12-13 10:24:32 -05:00

Storage.php

fix disk_event_space to event_disk_space

2018-10-31 11:56:08 -04:00