Commit Graph

25925 Commits (master)

Author SHA1 Message Date
IgorA100 d7b44d557d
Fix: When calling "debugFilter()", do not use the global variable "form", but get it from the page (filter.js)
Closing issue #4415
Also, it is still necessary to put things in order with the formation of the global variable "form" in "CsrfMagic.end"
I believe that the global variable "form" should not be formed in "CsrfMagic.end"
2025-08-09 18:08:52 +03:00
Isaac Connor 41ad2bbe25 Bump version for trigger updates 2025-08-09 09:54:02 -04:00
Isaac Connor a668086d69 Add rules to install zm_update-1.37.69.sql 2025-08-09 09:53:15 -04:00
Isaac Connor adba371cd1 pause when we receive CMD_STOP 2025-08-07 14:39:04 -04:00
Isaac Connor 5a57239eb1 Fix self=>event 2025-08-07 14:16:54 -04:00
Isaac Connor ed57267258 Remove updating the Storage table in triggers. Do those updates manually because there is frequently too much contention around the Storage table and filters get locked on it. 2025-08-07 14:08:45 -04:00
Isaac Connor 316b68e6bc Call stop instead of kill. Kill should be used when browsing away. 2025-08-07 12:25:18 -04:00
Isaac Connor ada08701bf Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-08-07 12:24:14 -04:00
Isaac Connor e16679b4b1 Make ZMS MJPEG vs go2rtc mjpeg more clean. Don't set img.src to single mode, just send STOP. Send QUIT in kill(). 2025-08-07 12:24:11 -04:00
Isaac Connor 7dee8e6b17
Merge pull request #4413 from IgorA100/patch-970619
Fix: When executing the "streamCmdReq" command, check "activePlayer" instead of "RTSP2WebEnabled" and "Go2RTCEnabled" (MonitorStream.js)
2025-08-07 11:58:25 -04:00
IgorA100 d4ba17c919
Fix: When executing the "streamCmdReq" command, check "activePlayer" instead of "RTSP2WebEnabled" and "Go2RTCEnabled" (MonitorStream.js) 2025-08-07 18:40:07 +03:00
Isaac Connor 2ba42345a7 Don't commit updated DiskSpace to the db. If we want to do that, we can call Save. This prevents UI from hanging waiting for this update to happen 2025-08-07 11:29:46 -04:00
Isaac Connor 1a8847f686 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-08-07 11:20:16 -04:00
Isaac Connor 27c227d5f3 If there was an error copying, release the lock before returning 2025-08-07 11:20:10 -04:00
IgorA100 6804761ad9
When quickly switching between cameras on the Watch page, the audioStream may not yet exist (MonitorStream.js) 2025-08-07 12:25:42 +03:00
IgorA100 47f593317d
When quickly switching between cameras on the Watch page, the audioStream may not yet exist (MonitorStream.js) 2025-08-07 12:19:37 +03:00
Isaac Connor d211e7dcbb
Merge pull request #4411 from wyn-williams/master
Removed An Easy To Use Docker Image links from install guide
2025-08-06 15:24:43 -04:00
Wyn Williams e81cca5c37
Update easydocker.rst
Edited to remove info and links to easy docker, file left in place so as to not break any guides or links to it.
2025-08-06 21:39:27 +03:00
Wyn Williams 4c1df8a80e
Update packpack.rst
Removed link to now depreciated easy docker images
2025-08-06 21:32:37 +03:00
Wyn Williams d407f3dbcf
Update easydocker.rst
added a warning to not use these docker images in production
2025-08-06 21:31:13 +03:00
Wyn Williams 51145d3560
Update index.rst
removed easy docker reference
2025-08-06 21:28:10 +03:00
Isaac Connor f04d4f0c17 Fix # in getElemeentById 2025-08-06 09:06:37 -04:00
Isaac Connor c288fa3046
Merge pull request #4409 from IgorA100/patch-544888
Fix: Changed text color to darker for disabled item in "select" list for dark skin "skin.css"
2025-08-06 09:05:27 -04:00
IgorA100 329fbc761c
Fix: Changed text color to darker for disabled item in "select" list for dark skin "skin.css"
Otherwise, on a dark background there is very little difference between the item being on and off.
2025-08-06 15:43:14 +03:00
Isaac Connor 094b2bd639 Rough in restream code, use new refactored user methods 2025-08-05 14:14:40 -04:00
Isaac Connor fc17c2d6f1 Add ::find methods and getAuthHash 2025-08-05 14:13:39 -04:00
Isaac Connor a27214b676 Only load form if there isn't one in the changed element. Use getElementById where possible 2025-08-05 13:13:10 -04:00
Isaac Connor a1d2b6072c
Merge pull request #4408 from IgorA100/patch-178464
Fix: Check for existence of "this.webrtc" before checking "close" method (MonitorStream.js)
2025-08-05 12:17:58 -04:00
IgorA100 a16143aae9
Fix: Check for existence of "this.webrtc" before checking "close" method (MonitorStream.js)
In addition to #4407
Otherwise, there may be an error when switching start/stop quickly.
2025-08-05 19:02:06 +03:00
Isaac Connor 6340096a62 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-08-05 10:34:00 -04:00
Isaac Connor 07b03ca0cf Improve warning when event has already been moved 2025-08-05 10:33:53 -04:00
Isaac Connor 5d1707a409 Fix generated sql for filterServerId 2025-08-05 10:33:33 -04:00
IgorA100 5f6db1fda6
Merge branch 'ZoneMinder:master' into patch-896443 2025-08-05 16:09:56 +03:00
Isaac Connor b42c5061f6
Merge pull request #4407 from IgorA100/patch-351429
Fix: Correct stop of go2rtc. It is required to close the stream, not just disconnect (MonitorStream.js)
2025-08-05 08:56:36 -04:00
IgorA100 c962575d90
Fix: Correct stop of go2rtc. It is required to close the stream, not just disconnect (MonitorStream.js)
Otherwise, the stream may remain alive and there will be problems when switching players and parasitic network traffic is possible.
2025-08-05 12:33:34 +03:00
Isaac Connor 6ef9c7128f
Merge pull request #4406 from IgorA100/patch-850681
Chore: Extra semicolon (Monitor.php)
2025-08-04 17:34:23 -04:00
IgorA100 66322e03f1
Chore: Extra semicolon (Monitor.php) 2025-08-04 20:52:51 +03:00
IgorA100 87796632bf
Merge branch 'master' into patch-896443 2025-08-04 19:19:12 +03:00
Isaac Connor 8e46bc0933
Merge pull request #4397 from IgorA100/patch-552676
Fix: Change stream channel for Player=Auto on Watch page
2025-08-04 12:09:44 -04:00
Isaac Connor 9370d56b03
Merge pull request #4404 from IgorA100/patch-512860
Information block "<div class="info">" use for all players on Montage & Watch pages
2025-08-04 12:09:03 -04:00
Isaac Connor 833b01312c MOve montage specific gridstack css out of functions.php to montage.php 2025-08-04 11:55:52 -04:00
Isaac Connor ef299441de
Merge pull request #4405 from IgorA100/patch-298190
Fix: When executing the stringToNumber() function, always cast the incoming argument to the "string" type to avoid an error (skin.js)
2025-08-04 11:18:04 -04:00
IgorA100 28b70a777f
Fix: When executing the stringToNumber() function, always cast the incoming argument to the "string" type to avoid an error (skin.js) 2025-08-04 17:48:39 +03:00
IgorA100 e89c608ec9
On error set 'current-mode'='ERROR' (video-stream.js) 2025-08-04 13:11:16 +03:00
IgorA100 cdfa0df471
Set the value of the "current-mode" attribute (video-stream.js)
Because it is much easier to track attribute changes than property changes
2025-08-04 13:08:55 +03:00
IgorA100 be84f309e7
Save the current mode in the variable "currentMode" (video-stream.js)
Relevant for the "Auto" mode
2025-08-03 23:11:05 +03:00
IgorA100 8cd9212660
Update video-stream.js 2025-08-03 18:19:11 +03:00
IgorA100 34c62f538c
Update MonitorStream.js 2025-08-03 12:02:20 +03:00
IgorA100 9f35ad6b53
Added method "updateStreamInfo()" (MonitorStream.js) 2025-08-03 12:00:35 +03:00
IgorA100 9a51f30da1
Update skin.css 2025-08-03 01:06:44 +03:00