Isaac Connor 7575afc8d5 Merge branch 'master' into zma_to_thread

2020-07-21 17:38:32 -04:00

..

actions

Update group save action, using Group object methods. Fixes errors on new MariaDB

2020-04-23 15:16:22 -04:00

csrf

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

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

actions.php

remove master version of actions.php

2019-01-04 15:29:21 -05: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 'master' of github.com:zoneminder/ZoneMinder

2019-12-13 17:49:00 -05:00

Event.php

remove debug and spacing

2020-04-23 15:40:35 -04:00

Filter.php

Add EmailTo,EmailSubjecet,EmailBody fields to Filter object

2020-01-22 14:04:42 -05:00

Frame.php

Add defaults to Frame

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

functions.php

handle sort_asc not being set. Handle term['val'] not being set.

2020-04-23 15:18:05 -04:00

Group.php

Apply relevant changes to deal with php7,4 deprecations

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

lang.php

silence warning when no language is set

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

logger.php

break up a long line, add some parenthesis to clarify logic

2020-01-17 12:30:26 -05:00

Monitor.php

Merge branch 'master' into zma_to_thread

2020-07-21 17:38:32 -04:00

MontageLayout.php

Apply relevant changes to deal with php7,4 deprecations

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

Object.php

Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors

2020-05-01 15:32:54 -04:00

Server.php

Missing ->

2019-12-07 10:38:51 -05:00

session.php

Remove debug

2019-09-17 12:07:30 -04:00

Storage.php

Add Enabled to Storage

2020-03-04 10:46:16 -05:00

Zone.php

add Zone.php from master

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