41dc7c8f4e
Fixes to not log errors when there are no monitors to display in watch.
2023-09-13 11:19:16 -07:00
e11b700fbd
Add Id as a protected member, only lookup monitor status if Id has a value
2023-09-13 11:18:50 -07:00
6754fcb208
Make Filter properties protected
2023-09-13 11:18:28 -07:00
1c3206b781
Merge branch 'master' into openbsd
2023-09-13 10:15:06 -07:00
fccebee056
Add -a to arp, add ZM_PATH_OUI for path to ieee-oui.txt
2023-09-13 10:14:49 -07:00
c4302c27ac
Add code to test for existence of ip and support ifconfig
2023-09-13 10:14:21 -07:00
a58949ab32
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-13 13:10:37 -04:00
d9bf168066
Merge ../ZoneMinder.connortechnology
2023-09-13 13:10:14 -04:00
c6a7fe949a
Use different syntax for property access
2023-09-13 13:10:01 -04:00
d7090ce84a
Define properties
2023-09-13 13:08:12 -04:00
3767d815a5
Use different syntax for assigning object properties
2023-09-13 13:05:57 -04:00
ef402e7b99
Define tablename member
2023-09-13 13:05:39 -04:00
46ac2dba2f
Define tablename member
2023-09-13 13:05:25 -04:00
6a87f56ac2
Never display errors
2023-09-13 13:04:16 -04:00
de8f387207
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-13 10:12:04 -04:00
e353523073
Fix int()=>(int) causing events to not load
2023-09-12 09:07:46 -04:00
da213d8532
Merge branch 'master' into openbsd
2023-09-11 13:42:43 -07:00
50059e5842
Only show ram info if proc exists.
2023-09-11 13:42:22 -07:00
b7ed7a4bd8
in detaintPath also strip :// because php:// is a way to inject code
2023-09-11 12:34:31 -04:00
a194fe81d3
Only allow Events Columns for sort. Fixes GHSA-2qp3-fwpv-mc96. Fixes GHSA-9cmr-7437-v9fj
2023-09-11 11:29:54 -04:00
a13c9c06f2
Handle when filter limit is '0'
2023-09-09 12:38:47 -04:00
b1cdf9905c
Make notes clickable to bring up objdetect image like in events list
2023-09-09 12:37:27 -04:00
e53974119b
Ensure that group_id is defined
2023-09-09 12:08:44 -04:00
b44216d3da
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2023-09-08 14:19:09 -04:00
a9997b943a
Use new event::find_virtual_frame when loading frames
2023-09-08 14:19:01 -04:00
cb5442d5b8
Add 704x576 aspect ratio to timeline css
2023-09-08 14:18:34 -04:00
82e972943e
Add frame loading including virtual frames
2023-09-08 14:18:11 -04:00
473d34e220
Update events frameimage status code to use Event object. Make not finding the frame a debug because of bulk frames.
2023-09-08 14:17:36 -04:00
2b2c43e630
Merge pull request #3748 from Simpler1/patch-6
...
Refresh table on show
2023-09-05 13:05:36 -04:00
e5d125c4ef
Handle when no linefeed found
2023-08-31 12:46:12 -04:00
56999da3eb
Check for existence of path before scanning it generating a lot of erros
2023-08-30 14:38:43 -04:00
6331d79a73
Add visibility toggle for password inputs on user edit
2023-08-28 16:39:23 -04:00
6fd119157a
Text corrections
2023-08-27 02:00:59 +02:00
cf713b59d7
Add 500 and 1000 as pagination options
2023-08-25 19:02:17 -04:00
9132f8947d
If scale is 0 or negative, then start with scale=100
2023-08-23 16:32:39 -04:00
76d5646cbf
Fix scaling being constantly set to 0 and hence logging a bogus value for scale
2023-08-23 16:32:13 -04:00
1dba6115b1
Fix eslint
2023-08-23 11:44:16 -04:00
1e423c151d
Stop infinite recursion when fail to load logout modal.
2023-08-22 12:20:11 -04:00
67e2c80851
Check for existence of modal before including it.
2023-08-22 12:19:48 -04:00
491b48f9f9
Only allow execute if you have EditEvents permission
2023-08-18 16:58:29 -04:00
9371c2775d
Use canEdit and canDelete to allow users without canEditEvents to create filters that don't act on events, only list them.
2023-08-18 16:57:51 -04:00
94ea51489b
Add canDelete and canEdit functions to Filter
2023-08-18 16:57:08 -04:00
ea581e521f
Add default value for order
2023-08-18 16:56:50 -04:00
084fc8b651
Put users table in an options div, which has overflow-y: auto applied to it. Move buttons to top so they don't scroll
2023-08-18 12:12:30 -04:00
8748d6a1cc
Handle unset _SESSION['remoteAddr']
2023-08-16 15:23:34 -04:00
91b4e299b9
Demote failed login to Warn instead of Error
2023-08-16 10:37:06 -04:00
bdc8452891
Add a button to toggle ptz controls. Put ptz controls into a right hand sidebar.
2023-08-15 17:58:55 -04:00
d31f918abc
Change the api for frameimage status request to split id into eid and fid instead of having id as an array.
2023-08-15 09:15:24 -04:00
9a229a78a5
Fix missing mac key on cameras array
2023-08-14 13:30:24 -04:00
87f09d3b7e
Fix usage of unset variable
...
If daemon or args are unset the preg_replace is never called which can
result in count not having a value when referenced in the if statement.
This generates a warning in error.log.
2023-08-13 17:56:55 -07:00
Charlie Root
Isaac Connor
Isaac Connor
Alejandro Criado-Pérez
Joe