Isaac Connor 6bd04de5f6 Merge branch 'master' into multistream

2021-12-31 17:53:36 -05:00

..

actions

Report more saving errors to ui

2021-11-17 18:57:36 -05:00

csrf

…

auth.php

Merge pull request #3241 from connortechnology/fix_3239

2021-05-19 20:39:42 -04:00

config.php.in

Implement CMD_MAXFPS

2021-12-16 16:36:12 -05:00

control_functions.php

Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php.

2021-08-20 22:42:57 -04:00

Control.php

…

database.php

Whitespace

2021-11-12 15:11:48 -05:00

Event.php

implement Event::canEdit

2021-11-12 13:37:01 -05:00

Filter.php

Add skip_locked and ExecuteInterval

2021-12-13 15:01:17 -05:00

FilterTerm.php

Fix AlarmedZoneId filter term not working because I wrote AlarmZoneId instead

2021-05-02 13:38:06 -04:00

Frame.php

…

functions.php

use options[maxfps] instead of always specifying 30fps.

2021-12-16 16:36:38 -05:00

Group_Monitor.php

…

Group.php

Detect group hierarchy loops and break them.

2021-12-03 13:25:50 -05:00

lang.php

…

logger.php

…

Manufacturer.php

…

Model.php

Add ManufacturerId to Model

2021-07-07 09:46:12 -04:00

Monitor.php

Merge branch 'master' into multistream

2021-12-31 17:53:36 -05:00

MontageLayout.php

…

Object.php

spacing

2021-11-17 18:57:44 -05:00

Server.php

Handle when SERVER['HTTP_HOST'] is not set

2021-10-05 19:49:42 -04:00

session.php

…

Snapshot.php

Actually delete the snapshot record, not just the event connection

2021-08-06 13:17:02 -04:00

Storage.php

…

User.php

…

Zone.php

Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it.

2021-12-05 17:45:26 -05:00