Isaac Connor 73ae3f49ed Merge branch 'master' into storageareas

2019-03-05 11:35:55 -05:00

..

actions

Merge branch 'master' into storageareas

2019-03-05 11:35:55 -05:00

csrf

Fix typo in dbc1c7b72f comment

2019-02-09 22:40:39 -08:00

auth.php

Only populate session with user info on successful login. Use parameters in sql when loading users in getAuthUser. Fixes #2542

2019-02-27 09:57:50 -05:00

config.php.in

Php namespace (#2537)

2019-02-22 09:19:07 -05: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

Php namespace (#2537)

2019-02-22 09:19:07 -05:00

Event.php

Fix 2340 (#2368)

2019-02-26 11:28:56 -05:00

Filter.php

Php namespace (#2537)

2019-02-22 09:19:07 -05:00

Frame.php

Php namespace (#2537)

2019-02-22 09:19:07 -05:00

functions.php

Merge branch 'master' into storageareas

2019-03-04 14:33:28 -05:00

Group.php

Php namespace (#2537)

2019-02-22 09:19:07 -05:00

lang.php

whitespace

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

logger.php

Add ZM to ErrorHandler. Spacing and quotes

2019-02-27 12:02:40 -05:00

Monitor.php

Merge branch 'master' into storageareas

2019-03-05 11:35:55 -05:00

MontageLayout.php

Php namespace (#2537)

2019-02-22 09:19:07 -05:00

Server.php

add zmeventnotification to Server object

2019-02-27 09:28:36 -05:00

session.php

Merge branch 'master' into storageareas

2019-02-22 11:33:47 -05:00

Storage.php

Php namespace (#2537)

2019-02-22 09:19:07 -05:00