mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-04 14:04:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
24,837 Commits 80 Branches 104 Tags
e4fa3e9e12d2bfb242a8d9d97bb0c5115bbff03c
Commit Graph

24837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IgorA100
e4fa3e9e12 Increase z-index to 20 for buttons ".btn-zoom-in & .btn-zoom-out" (skin.css) 
Otherwise, the ".block-button-center" block partially overlaps with other buttons.
 2024-10-10 16:24:14 +03:00
Isaac Connor
a0398dd2d7 Merge pull request #4170 from 0xB0D/master+alarms-fix 
Fix alarms() out of scope
 2024-10-08 15:33:28 -04:00
Bryan O'Donoghue
1136ef9ebe Fix alarms() out of scope 
The string alarms() is only valid when the define WITH_GSOAP is present.

Fixes: a0a95d887c ("Don't crash when alarms is empty")
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@nexus-software.ie>
 2024-10-08 11:51:29 +01:00
Isaac Connor
a0a95d887c Don't crash when alarms is empty 2024-10-06 11:07:10 -04:00
Isaac Connor
6e1e077a90 If shm size is 0 don't log an error 2024-10-04 14:35:06 -04:00
Isaac Connor
3d3ece315b Code style and spacing 2024-10-04 14:34:42 -04:00
Isaac Connor
f9f2d0cdd1 Fix some spaces 2024-10-04 12:22:24 -04:00
Isaac Connor
be946e959b Merge pull request #4167 from BHMSD-bdailey/ONVIFNotes 
Onvif notes from Alarms map
 2024-10-03 14:54:33 -04:00
Isaac Connor
abd3097af3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-03 14:42:57 -04:00
Isaac Connor
d2514b5e83 a while is better than a for 2024-10-03 14:42:51 -04:00
Ben Dailey
6159a74d41 Clean up unneeded code 2024-10-03 11:59:08 -04:00
Ben Dailey
326995d810 Working implementation from Alarms map so that rollover events contain the currently still enabled topics not just the last topic. 2024-10-03 10:33:55 -04:00
Isaac Connor
e306dcf972 Merge pull request #4163 from IgorA100/patch-180200 
Chore: Removed the use of the "delay" constant as it is no longer used when starting monitors on the Montage page
 2024-10-03 06:51:14 -04:00
Isaac Connor
02dc5ccbb4 Merge pull request #4166 from IgorA100/patch-335384 
Fix: Declared variable "h" on Event page
 2024-10-03 06:50:41 -04:00
IgorA100
5ae6e0e846 Declared variable "h" (event.js) 
Closed: https://forums.zoneminder.com/viewtopic.php?p=135715&sid=593ae02225002db4f98a48b0ae3e8e18#p135715
 2024-10-03 11:56:53 +03:00
Isaac Connor
daffe0294b Add ONVIF as a Notes filter 2024-10-02 16:16:53 -04:00
Isaac Connor
87e0a092b7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-02 14:23:10 -04:00
Isaac Connor
b89d404181 Update bootstrap-table to 1.23.5 2024-10-02 14:23:03 -04:00
Isaac Connor
8cd7e872f3 Set option help color to be the same as buttons 2024-10-02 14:22:14 -04:00
IgorA100
18d5c88c64 Update montage.js 2024-10-02 19:41:07 +03:00
IgorA100
5b02594928 Removed usage of "delay" constant as it is no longer used (montage.js) 2024-10-02 19:39:49 +03:00
IgorA100
5790a0d03b Recovered spaces that I accidentally deleted (MonitorStream.js) 2024-10-02 19:35:54 +03:00
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