Isaac Connor ae5b73bf90 Resolve conflicts

2024-05-23 14:30:44 -04:00

..

actions

Santisize zmMontageLayout when passing to constructor

2024-05-21 09:22:55 -04:00

csrf

Preface Debug with ZM

2022-01-13 22:15:02 -05:00

auth.php

Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions

2024-03-05 14:02:01 -05:00

config.php.in

Default thisServer to a default server object.

2024-02-22 12:52:39 -05:00

control_functions.php

Remove extra { breaking ptz

2022-04-23 19:29:04 -04:00

Control.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

database.php

(feat): Tags

2023-08-31 15:50:08 -04:00

download_functions.php

Code optimization

2024-02-09 18:09:51 +03:00

Event_Data.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Event_Tag.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Event.php

Chore: Adjust spaces, tabs, newlines

2024-04-03 22:58:21 +03:00

Filter.php

Fix(filter): Set tags operator to = instead of LIKE

2024-04-10 15:14:36 -04:00

FilterTerm.php

Remove debug

2024-05-21 09:39:53 -04:00

Frame.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

functions.php

Merge branch 'master' into only_stream_visible

2024-05-23 14:18:47 -04:00

Group_Monitor.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Group_Permission.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Group.php

Use array_values to discard the keys in the array of monitorIds

2024-03-01 16:13:52 -05:00

lang.php

Convert user from an array to a User object

2023-04-23 12:57:29 -04:00

logger.php

Enforce max length of 64k for log entries. Use HTTP_X_FORWARDED_FOR in logging so we log actual remote addr

2023-11-16 10:34:44 -05:00

Manufacturer.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Model.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Monitor_Permission.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

monitor_probe.php

Remove extra / and urlencode password for Amcrest

2024-02-02 11:49:44 -05:00

Monitor.php

Resolve conflicts

2024-05-23 14:30:44 -04:00

MontageLayout.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Object.php

Chore: Replace Tabs to Space

2024-04-08 19:21:30 +03:00

Report.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Server.php

Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6

2024-05-15 11:45:49 -04:00

session.php

When setting cookies via PHP, add handling of the "path" value in the options (session.php)

2024-05-22 10:32:10 +03:00

Snapshot.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Storage.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

Tag.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

User_Preference.php

fix: php 8.3 deprecated get_class method call without argument

2023-11-22 10:48:04 +03:30

User.php

set defaults on properties of user object to fix neew user creation.

2023-12-09 18:01:04 -05:00

Zone.php

Include Monitor.php

2024-01-28 16:52:16 -05:00