Isaac Connor d33e094526 Merge branch 'master' into storageareas

2019-02-06 17:03:41 -05:00

..

actions

Merge branch 'master' into storageareas

2019-02-05 15:46:58 -05:00

csrf

add CSP nonce to CSRF rewriting

2019-01-16 14:04:07 -05:00

auth.php

If there is a username in the session, then we are logged in, but we need to load the user object from the db. We can't just trust it from the session. The user may have been deleted and having that data in the session can be a security risk. So load the user object on every request.

2019-02-05 11:44:45 -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 'master' into storageareas

2019-01-30 15:17:27 -05:00

Group.php

Add a CSP script-src policy with nonce-source and convert more inline event handlers (#2413)

2019-01-16 09:59:58 -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

get rid of default value for PathToIndex so that it will use PHP_SELF instead

2019-01-16 12:09:26 -05:00

session.php

Merge branch 'improve_session' into storageareas

2019-02-05 15:48:42 -05:00

Storage.php

add to_json function to Storage.

2019-02-06 11:44:36 -05:00