ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,053 Commits
34 Branches
96 Tags
177 MiB
Commit Graph

26053 Commits (fdfe87be38e4d642caf227787fec7d8a69a8944b)

Author SHA1 Message Date
Isaac Connor 0d88341712 Fix url and uri 2025-08-18 15:50:40 -04:00
Isaac Connor 035b81dff5 Remove trixie as packpack doesn't support it yet 2025-08-18 15:40:00 -04:00
Isaac Connor b64351b3e1 Fix streams not restarting because player='' auto and we need to be looking at activePlayer 2025-08-18 15:14:49 -04:00
Isaac Connor 6185c53818 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-08-18 13:29:59 -04:00
Isaac Connor d0b7c6a04d Fix eslint 2025-08-18 09:30:02 -04:00
Isaac Connor 9022fa00e2 Fix casing on SecondPathInput. Fixes #4424 2025-08-18 08:58:05 -04:00
Isaac Connor 7200e6c067 Only show groups if there are any in the system. Add autocomplete=one-time-code to prevent autocomplete on manufacturer and model 2025-08-15 18:22:48 -04:00
Isaac Connor 7cf58d230e Rename Event to event, and use new fix_DefaultVideo and guess_EndDateTime to make the recovered video more useuful by fixing DefaultVideo and EndDateTime 2025-08-14 18:07:55 -04:00
Isaac Connor 69551f4ca6 Add guess_EndDateTime and fix_DefaultVideo to be used in zmrecover.pl 2025-08-14 18:06:55 -04:00
Isaac Connor b0b42353b0 Don't add default EndDateTime, just use StartDateTime. Is way more intuitive and will show incomplete events 2025-08-14 15:26:03 -04:00
Isaac Connor 88d1a93716 Add debian trixie to package generation 2025-08-14 10:48:21 -04:00
Isaac Connor 1e5fbaea5d Add a post method 2025-08-14 10:47:22 -04:00
Isaac Connor 661ac28a32 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-08-14 09:10:42 -04:00
Isaac Connor b8fc2d08d5 Add guess_credentials to parent Control module 2025-08-14 09:09:44 -04:00
Isaac Connor f1e76360fd
Merge pull request #4422 from IgorA100/patch-878829 
Fix: Incorrect 'streamMode' setting for Watch page
 2025-08-13 16:12:38 -04:00
IgorA100 2fc1542374
Fix: Incorrect 'streamMode' setting for Watch page (watch.js.php) 
We cycle through monitors and the current monitor in the loop is "$m"
 2025-08-13 22:48:56 +03:00
Isaac Connor 46dc4f3f17 Add reboot, use parent get() 2025-08-12 19:51:59 -04:00
Isaac Connor 31e497ec91
Merge pull request #4421 from ZoneMinder/dependabot/github_actions/actions/checkout-5 
Bump actions/checkout from 4 to 5
 2025-08-11 22:16:49 -04:00
dependabot[bot] a209c41a6a
Bump actions/checkout from 4 to 5 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-08-12 02:14:37 +00:00
Isaac Connor 95ad036f73 Add List button and make Edit go directly to the selected Control as well as being a button. 2025-08-11 20:09:10 -04:00
Isaac Connor 2ed2b270f6 Handle SecondPath not existing 2025-08-11 20:08:07 -04:00
Isaac Connor 682da9f8d9
Merge pull request #4420 from VersusBG/patch-1 
Create Serial_HEX_PelcoD.pm
 2025-08-11 09:49:21 -04:00
VersusBG 429e54359b
Create Serial_HEX_PelcoD.pm 
Pelco PTZ D protocol send using SERIAL_HEX in ACTi ACD2100 encoder

With control caps

INSERT INTO `Controls` VALUES (NULL,'Serial_HEX_PelcoD','Remote','Serial_HEX_PelcoD',0,0,0,0,1,0,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,32,0,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,12,1,12,1,NULL,NULL,NULL,NULL,1,0,12,1,12,0,0);
 2025-08-11 15:59:28 +03:00
Isaac Connor 63c777876e
Merge pull request #4417 from IgorA100/patch-654353 
Fix: Do not generate global variables "form" and "forms" (csrf-magic.js)
 2025-08-09 14:32:48 -04:00
Isaac Connor f047176378
Merge pull request #4394 from IgorA100/patch-896443 
Feat: New design of the audio stream control slider
 2025-08-09 11:58:14 -04:00
Isaac Connor bf41af8793
Merge pull request #4416 from IgorA100/patch-957359 
Fix: When calling "debugFilter()", do not use the global variable "form", but get it from the page (filter.js)
 2025-08-09 11:56:56 -04:00
IgorA100 9450799d1f
Until we use "use strict", additional code analysis is required (csrf-magic.js) 2025-08-09 18:54:45 +03:00
IgorA100 66276bf762
Fix: Now we use "use strict" and do not generate global variables "form" and "forms" (csrf-magic.js) 
It is necessary to analyze the consequences of such a change.
Related to #4415

Perhaps somewhere else there was a use of the global variable "form", which is essentially very incorrect!
 2025-08-09 18:23:08 +03:00
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