mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-31 12:13:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
24,708 Commits 80 Branches 104 Tags
5163807bbdcc00a0ffd6ec5d2f23d0d34d5aa51b
Commit Graph

24708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Connor
5163807bbd Merge pull request #4144 from Simpler1/patch-1 
Fix(events): Remember column visibility changes
 2024-09-20 15:50:29 -04:00
Simpler1
b5cec40955 Fix(events): Remember column visibility changes 2024-09-20 15:43:27 -04:00
Isaac Connor
ff4256b3f1 Merge pull request #4142 from IgorA100/patch-442721 
Fix: The double click to go fullscreen should only happen if not shift/ctl modifiers are active
 2024-09-20 10:23:29 -04:00
IgorA100
6d7ee93fc3 Fix: The double click to go fullscreen should only happen if not shift/ctl modifiers are active (skin.js) 
Close #4141
 2024-09-20 17:21:51 +03:00
Isaac Connor
c37d773eba Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-19 18:30:42 -04:00
Isaac Connor
05554757bc Don't use a define for MAX_PRESETS so that we can include control_functions multiple times 2024-09-19 17:43:17 -04:00
Isaac Connor
a6f7d1aa3c Merge pull request #4138 from IgorA100/patch-976391 
Fix: PanZoom Panning didn't work when using "preventDefault"
 2024-09-18 16:01:47 -04:00
Isaac Connor
2ed6ca0c0c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-18 12:27:32 -04:00
Isaac Connor
331390ea20 Move Poller_Healthy and Trigger state into Amcrest_API and ONVIF modules. Add lastTopic and lastValue to onvif. Add values to event notes. Reverse logic for event ending to look for false, as the value could be other things like isMotion or IsPeople. 2024-09-18 12:27:26 -04:00
Isaac Connor
18b1d0a932 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-18 09:49:53 -04:00
Isaac Connor
3d8b738ddc Switch to catch2 for freebsd 2024-09-18 09:49:47 -04:00
Isaac Connor
dfe132caa1 Merge pull request #4139 from IgorA100/patch-641230 
Changed double-click analysis on mobile devices, added double-click processing on MP4 images (video.js) (skin.js)
 2024-09-18 09:42:07 -04:00
Isaac Connor
eb6d2bf5a6 Merge pull request #4136 from IgorA100/patch-5887 
Feat: Progress bar now works when viewing MP4 via video.js on Event page
 2024-09-18 09:40:07 -04:00
Isaac Connor
8c96d3004b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-18 09:33:49 -04:00
Isaac Connor
b5f393d960 prevent fatal php crash when maxfps is '' but forcing it to 0 2024-09-18 09:10:43 -04:00
IgorA100
d358d02987 Chore: Fix space (skin.js) 2024-09-18 14:56:34 +03:00
IgorA100
0eb916e748 Added fullscreen mode on double click on playing event when using MP4 (video.js) (event.js) 
In addition to #4120
 2024-09-18 14:51:59 +03:00
IgorA100
ca5911f551 Changed double-click analysis on mobile devices, added double-click processing on MP4 images (video.js) (skin.js) 2024-09-18 14:44:18 +03:00
IgorA100
52a5bf2a1f Chore: Eslint (panzoom.js) 2024-09-18 12:30:04 +03:00
IgorA100
edf7f808b0 Fix: Panning didn't work when using "preventDefault" (panzoom.js) 
This happened after PR #4137
When Scale panZoom > 1, you need to use "preventDefault" for Panning to work correctly. But at the same time (if Scale panZoom > 1), clicking on the progress bar generated by video.js will not work.
In principle, this is not critical, because when increasing, the progress bar generated by video.js usually goes beyond the visible boundaries.
 2024-09-18 12:23:33 +03:00
Isaac Connor
328ce9fc0c Make no Status record found a debug instead of warning 2024-09-17 11:17:50 -04:00
Isaac Connor
695a78c250 Merge pull request #4137 from IgorA100/patch-255716 
Fix: Disabled preventDefault() when initializing PanZoom (panzoom.js)
 2024-09-17 11:11:29 -04:00
IgorA100
0ecb9a7754 Fix: Disabled preventDefault() when initializing PanZoom (panzoom.js) 2024-09-17 17:42:41 +03:00
Isaac Connor
caa219261d Merge pull request #4135 from IgorA100/patch-184549 
Fix: When executing "setTouchAction: function(el)" check if the element is passed to the function (panzoom.js)
 2024-09-17 09:22:25 -04:00
IgorA100
1cda0a8723 Chore: code optimization (event.js) 2024-09-17 15:06:38 +03:00
IgorA100
6aa59d4170 Feat: Progress bar now works when viewing MP4 via video.js (event.js) 2024-09-17 14:55:57 +03:00
IgorA100
b59c2f564c Chore: Remove extra space (panzoom.js) 2024-09-17 10:53:49 +03:00
IgorA100
6f50c7169e Fix: When executing "setTouchAction: function(el)" check if the element is passed to the function (panzoom.js) 2024-09-17 10:51:57 +03:00
Isaac Connor
7c8738e976 Correct log in debug statusment 2024-09-16 17:22:27 -04:00
Isaac Connor
e68fb77e4b Take frame_mod into account when calculating time to sleep. Fixes rate not really working. 2024-09-16 16:41:00 -04:00
Isaac Connor
21b9b0da31 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-16 14:15:47 -04:00
Isaac Connor
9f2c36be6e Hide stream quality if using video tag 2024-09-16 14:15:38 -04:00
Isaac Connor
d99233782a Add overflow hidden to timeline spans so that if locale format adds am/pm and the width is small it doesn't wrap. 2024-09-16 14:15:16 -04:00
Isaac Connor
f42e5ccfba add gsoap to bookworm build 2024-09-16 13:47:41 -04:00
Isaac Connor
1f1b5951f5 Handle when soap isn't defined 2024-09-16 13:46:35 -04:00
Isaac Connor
62e0d87a6b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-09-16 13:45:06 -04:00
Isaac Connor
8780a9cafc Fix eslint 2024-09-16 13:45:00 -04:00
Isaac Connor
60adcd73e9 Add zm_monitor_onvif.cpp to CMakeLists.txt 2024-09-16 13:40:00 -04:00
Isaac Connor
9b9f0159ad Move onvif event listener code to zm_monitor_onvif.cpp. In the Poll thread, if listener is not healthy, restart it. Fixes #4099 2024-09-16 13:40:00 -04:00
Isaac Connor
8565554b36 Fix missing }, implement getStream, add a check for 0 height 2024-09-16 09:24:50 -04:00
Isaac Connor
f25ced8410 Merge pull request #4133 from IgorA100/patch-498306 
Fix: Don't specify "sizeToContent: true" when initializing GridStack on Montage page
 2024-09-15 18:40:27 -04:00
Isaac Connor
594c39cce4 Merge pull request #4121 from IgorA100/patch-164 
Feat: Scaling of control buttons (Zoom, Edit, etc.) located on the Stream depending on the width of the Stream (Event. Montage, Watch page)
 2024-09-15 18:39:17 -04:00
IgorA100
e94448db8a Run "setRatioForMonitor" before calling "initGridStack()" (montage.js) 
Necessary for more correct sorting when calling "initGridStack()"

- Replaced the variable name "objLiveStream" with "objStream" in the "setRatioForMonitor" function
 2024-09-15 23:18:10 +03:00
IgorA100
6d5bbfec85 Merge branch 'master' into patch-164 2024-09-15 13:23:33 +03:00
IgorA100
69156f2fb9 Don't specify "sizeToContent: true" when initializing GridStack (montage.js) 
Additional verification is required, including on Custom layouts
Possible closure #4127
 2024-09-15 01:29:15 +03:00
Isaac Connor
6b036f9e8a Use an actual flag insead of begin and end comparison for when to output partial content because the partial code start from 0 2024-09-14 07:44:22 -04:00
Isaac Connor
c1da5e485f Remove duplication of progressbar and videoFeedStream div 2024-09-14 07:44:22 -04:00
Isaac Connor
0ac755164b Add margin between buttons. 2024-09-13 18:34:17 -04:00
Isaac Connor
6629e27f89 Don't do bulk frame calculation if we already have the exact frame wanted 2024-09-13 18:27:17 -04:00
Isaac Connor
2b1b38007a Allow setting of layout in request 2024-09-13 15:44:32 -04:00