Isaac Connor 0a3ad719cd Merge branch 'master' into filter_pre_post

2020-08-17 18:30:44 -04:00

..

actions

Merge branch 'master' into filter_pre_post

2020-08-17 12:56:20 -04:00

csrf

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

2019-04-06 09:27:44 -04:00

auth.php

Merge pull request #2870 from pliablepixels/dev

2020-03-04 11:31:16 -05:00

config.php.in

Check for definition of ZM_TIMEZONE before using it. Fixes #2895

2020-04-02 14:00:36 -04:00

control_functions.php

Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code

2019-11-29 13:53:46 -05:00

Control.php

Add warnings when the type of movement is not selected

2020-01-02 17:03:52 -05:00

database.php

Merge branch 'release-1.34'

2020-06-05 19:02:43 -04:00

Event.php

Populate Scheme of default Storage Area when event Storage is not valid

2020-08-17 16:55:29 -04:00

Filter.php

move pre and post condition testing into the Filter class so we can use it everywhere

2020-08-17 17:40:58 -04:00

FilterTerm.php

add ->filter to FilterTerm so that we can access other terms in testing pre and post conditions. rename hidden_fields_string to hidden_fields. Add in DiskPercent DiskBlocks, SystemLoad Pre and Post conditions

2020-08-17 16:56:54 -04:00

Frame.php

Add defaults to Frame

2019-09-22 14:21:59 -04:00

functions.php

Merge branch 'master' into filter_pre_post

2020-08-17 18:30:44 -04:00

Group.php

Escape table names for mysql-8

2020-06-04 11:44:59 -04:00

lang.php

silence warning when no language is set

2020-04-23 17:38:15 -04:00

logger.php

Merge branch 'release-1.34'

2020-06-05 19:02:43 -04:00

Monitor.php

Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.

2020-08-10 14:02:25 -04:00

MontageLayout.php

Apply relevant changes to deal with php7,4 deprecations

2019-12-07 11:45:32 -05:00

Object.php

Fix use of is_callable

2020-08-04 16:36:04 -04:00

Server.php

Remove Debug

2020-08-15 17:49:26 -04:00

session.php

remove extra ,

2020-08-08 14:27:37 -04:00

Storage.php

implement disk_used_blocks in Storage. Also use Type() instead of ->{Type} to get default value.

2020-08-17 16:57:53 -04:00

User.php

add a User object

2020-06-17 12:50:22 -04:00

Zone.php

add Zone.php from master

2020-05-01 13:20:42 -04:00