ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
25,015 Commits
32 Branches
93 Tags
157 MiB
Commit Graph

25015 Commits (master)

Author SHA1 Message Date
IgorA100 701d485773
Removed the "delay" argument from the "start" function as it is no longer used (MonitorStream.js) 2024-10-02 19:33:37 +03:00
Isaac Connor a961471c70
Merge pull request #4165 from BHMSD-bdailey/ONVIFNotes 
Update the way that ONVIF Notes are returned so they are more accurate for events that rollover from section length.
 2024-10-02 10:37:21 -04:00
Ben Dailey 19014977e3 No functional change working as previoius via a function. 2024-10-02 10:30:23 -04:00
Isaac Connor f56d001839
Merge pull request #4164 from IgorA100/patch-732743 
Fix: Scaling of control buttons (Zoom, Edit, etc.) located on the Stream depending on the width of the Stream on Event page witch use video.js
 2024-10-02 09:30:58 -04:00
Isaac Connor bc1a7af1fc Add analysing to monitor status stream 2024-10-02 09:30:03 -04:00
IgorA100 95874af1a9
Fix: Scaling of control buttons (Zoom, Edit, etc.) located on the Stream depending on the width of the Stream on Event page witch use video.js (skin.js) 
Fix to https://github.com/ZoneMinder/zoneminder/pull/4121/files
 2024-10-02 15:16:18 +03:00
IgorA100 8843d8c18a
Fix: Restored monitors start with delay (MonitorStream.js) 
Probably it broke at some point. Or maybe it never worked, but in montage.js monitors start with a delay:
"monitor.start(delay);"
 2024-10-02 13:37:05 +03:00
Isaac Connor 19ea7339f4 set monitorStream gridstack 2024-10-01 17:23:03 -04:00
Isaac Connor 9555455c5d Add defines for ANALYSING_NONE and ANALYSING_ALWAYS 2024-10-01 17:14:01 -04:00
Isaac Connor 35f2dee620 add setGridStack. Rework logic on enable/disable motion anf force/cancel alarm to match when using rtsp2web. Add support for score and analysing in status response. 2024-10-01 17:13:30 -04:00
Isaac Connor 4f03ce362d Add analysing to stream data 2024-10-01 17:01:17 -04:00
Isaac Connor 045756c3fc Remove obsolete ZM_WEB_RESIZE_CONSOLE 2024-10-01 16:29:22 -04:00
Isaac Connor 0780032149 Add score to monitorstream status 2024-10-01 16:28:56 -04:00
IPC df5f76f43a Improve logging, include event_id in TriggerOff 2024-10-01 13:40:37 -05:00
Isaac Connor 8592187288 Rough in an ajax interface for triggering 2024-10-01 12:19:03 -04:00
Isaac Connor f0305072ef Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-01 12:18:27 -04:00
Isaac Connor 34e1512916 Add TRIGGER defines 2024-10-01 12:18:18 -04:00
Isaac Connor eb117732a8 Rough in shm info and functions for triggering 2024-10-01 12:18:05 -04:00
Isaac Connor aa2d1372d5 Update shm offsets in .h 2024-10-01 12:17:45 -04:00
Isaac Connor 83f8f24167 Close FDs before exec so that we don't share STDIN/OUT/ERR with sub process. 2024-10-01 12:17:24 -04:00
Isaac Connor 5baf482e8f
Merge pull request #4158 from BHMSD-bdailey/ONVIFTrackTopics 
Add unordered map to track ONVIF topic and state
 2024-10-01 10:26:59 -04:00
Isaac Connor 5529d71a75 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-01 10:14:58 -04:00
Isaac Connor 100a321cf9 Fix ISE when auth is turned off. 2024-10-01 10:13:38 -04:00
Ben Dailey 93f3a92996 Add alarms set cleanup and alarmed off when disconnected from ONVIF to prevent getting out of sync with camera. 2024-10-01 09:34:48 -04:00
Ben Dailey 5c31384063 Add Debug 2024-10-01 09:33:58 -04:00
Ben Dailey f43268b184 Only add to alarms map and set last active if not already in map. 2024-10-01 09:31:33 -04:00
Isaac Connor a2278d9ead
Merge pull request #4159 from IgorA100/patch-655035 
Fix: Always use only #wrapperEventVideo to enable fullscreen mode on Event page
 2024-10-01 08:55:58 -04:00
IgorA100 0d3205c9eb
Update event.js 2024-10-01 13:32:12 +03:00
IgorA100 f530d096a6
When using video.js, the document will have both #videoobj and #wrapperEventVideo, but we only need #videoobj (event.js) 
addEventListener should be used only for one block on the page, otherwise there will be problems.
Closed: https://forums.zoneminder.com/viewtopic.php?p=135677#p135677
 2024-10-01 12:56:39 +03:00
Isaac Connor 012b3a376c Put back reserved2 for better alignment 2024-09-30 13:48:44 -04:00
Isaac Connor 07100343d4 Fix Longitude=>longitude 2024-09-30 13:48:11 -04:00
Isaac Connor a57e5ecc24 Renumber the shm segments, put back reserved2 for better alignment 2024-09-30 13:47:48 -04:00
Isaac Connor 0d922b1ecc Create mmap files with 660 instead 666. 2024-09-30 12:55:42 -04:00
Ben Dailey 3915007af5 Return the last active topic and value 2024-09-30 12:41:34 -04:00
Ben Dailey b664d7b085 Move debug for alarms count 2024-09-30 11:45:40 -04:00
Isaac Connor 1f5ef16160 Move url declaration down to where it is used and remove old window.location code 2024-09-30 11:43:09 -04:00
Ben Dailey b701c7bb2e Add unordered map to track ONVIF topic and state 2024-09-30 11:40:01 -04:00
Isaac Connor c6ec234a78 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-30 09:55:25 -04:00
Isaac Connor d5266127d7 Add syslog priorities for remaining debug levels 2024-09-30 09:55:20 -04:00
Isaac Connor 506cdc5e66 Only show non-deleted monitors 2024-09-30 09:32:35 -04:00
Isaac Connor 3ed1eae9ce Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-30 09:08:56 -04:00
Isaac Connor d19d1e3ada Correct version, remove cambozola 2024-09-30 09:08:51 -04:00
Isaac Connor 4907937c4f Bump version for vulnerability visibility 2024-09-30 09:08:11 -04:00
Isaac Connor 3b379e99c0 Introduce detaintPathAllowAbsolute. Use it to protect against Path Traversal in files view. Fixes GHSA-8fw2-wh82-vv4h 2024-09-30 06:42:10 -04:00
Isaac Connor 7aabf146ba Try to do something useful with error messages from SQL, but since storage isn't a real view, it won't be shown. 2024-09-30 06:34:15 -04:00
Isaac Connor 07fcb72e3b Use the same filter on Storage Name as we use in Monitor Name. 2024-09-30 06:33:09 -04:00
Isaac Connor 97b7ae9c5f Use htmlspecialchars on Message to prevent Stored Cross-Site Scripting. Fixes GHSA-rqxv-447h-g7jx 2024-09-30 06:23:22 -04:00
Isaac Connor 00baa36446
Merge pull request #4157 from IgorA100/patch-480012 
Added missing function "thisClickOnTimeline" in skin.js
 2024-09-30 06:02:07 -04:00
IgorA100 64e1926e00
Added missing function "thisClickOnTimeline" in skin.js 
Closed https://forums.zoneminder.com/viewtopic.php?p=135662#p135662
 2024-09-29 11:34:52 +03:00
Isaac Connor 819812bbeb
Merge pull request #4156 from IgorA100/patch-455917 
Fix: Changed the declaration of the variable "pix" (event.js)
 2024-09-28 17:50:14 -04:00