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

23055 Commits (7d5b91949c24d284bd7a359ade90362f5d7e43ea)

Author SHA1 Message Date
Isaac Connor 7d5b91949c Remove duplicate .cherry-picked commit wasn't needed. 2023-12-29 11:25:10 -05:00
Isaac Connor d2a264b79f define count. Fixes #3799 2023-12-29 11:06:46 -05:00
Isaac Connor 72e8ee0e5e Move session inclusion down to where it is first used. 2023-12-29 11:06:46 -05:00
Isaac Connor 326a4ca201 Clean out old unused debugging code. The code further down is more useful 2023-12-29 11:06:46 -05:00
Isaac Connor df72726eed Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-12-24 12:29:58 -05:00
Isaac Connor 6e93e3df4c Allow untrsuted ssl certs when sending commands to other servers 2023-12-24 12:17:08 -05:00
Isaac Connor fa6156f914
Merge pull request #3795 from ZoneMinder/dependabot/github_actions/github/codeql-action-3 
Bump github/codeql-action from 2 to 3
 2023-12-23 10:07:28 -05:00
Isaac Connor 002528cfde
Merge pull request #3796 from efranzwa/update-docs-viewmonitors 
Updates to Viewing Monitors Doc Section
 2023-12-20 10:01:22 -05:00
efranzwa 0026e3446b Add images for Viewing Monitors Doc Section 2023-12-20 06:24:37 -08:00
efranzwa bd863d026b Update Viewing Monitors Doc Section 2023-12-20 06:22:43 -08:00
Isaac Connor ac1c6203c2 Remove really old utility scripts for changing php tags 2023-12-20 09:20:11 -05:00
Isaac Connor 112eb6b9ad Add support for EISNAP and EPISNAP for snapshot image 2023-12-19 12:27:02 -05:00
Isaac Connor d1c52987bd Add returning both the sth and res 2023-12-19 12:16:36 -05:00
Isaac Connor 4eaf274c67 Use new zmDbExecute helper function, when there are no alarm frames, still do the substitutions so that we don't leave the tags. EIMOD and EIMODG don't depend on frames, so move them out. 2023-12-19 12:16:19 -05:00
Isaac Connor 7a6c0e2743 Comment out unneeded debug 2023-12-19 10:54:35 -05:00
Isaac Connor 27cfd11d95 Increase debug log leve 2023-12-19 10:54:35 -05:00
Isaac Connor 29b16a5384 Implement zmDbExecute which is slightly more useful than zmSQLExecute 2023-12-19 10:54:22 -05:00
dependabot[bot] 4a3bacecfe
Bump github/codeql-action from 2 to 3 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-18 17:27:12 +00:00
Isaac Connor 66e1f968c0 Add a warning when a filter takes longere than it's execution period 2023-12-18 11:40:20 -05:00
Isaac Connor 591e900fcf Remove debug 2023-12-18 11:39:52 -05:00
Isaac Connor 4e2dd31cdc Use ZM_PATH_API instead of hard coded /zm/api 2023-12-15 09:18:04 -05:00
Isaac Connor 4193de1f00 Add functionality to undelete a Monitor 2023-12-14 13:55:16 -05:00
Isaac Connor ea3d91b46f Actually fix problem by not putting () on an integer has-post_sql_conditions 2023-12-14 09:32:32 -05:00
Isaac Connor b618030b7a Increase time between TERM and KILL because ffmpeg connect can take way more than 10 secs 2023-12-14 09:29:03 -05:00
Isaac Connor d910585ed9 Be a little more specific about what we are int'ing. https://forums.zoneminder.com/viewtopic.php?t=32942 has a weird error report that this might address 2023-12-13 19:39:11 -05:00
Isaac Connor 27f25df2d9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-12-12 11:41:45 -05:00
Isaac Connor f9b82ca037 Always append username to zmu command line so that auth is more efficient 2023-12-12 11:14:29 -05:00
Isaac Connor ac2c2225be Add user we are authentication as to debug 2023-12-12 11:14:29 -05:00
Isaac Connor 23bee4bb9d
Merge pull request #3793 from efranzwa/update-docs-definezone 
Update to Defining Zones Doc Section
 2023-12-11 14:14:42 -05:00
Isaac Connor 164e003ab6 Set Heartbeat when not capturing due to ondemand 2023-12-10 09:46:28 -05:00
Isaac Connor af3f380692 set defaults on properties of user object to fix neew user creation. 2023-12-09 18:01:04 -05:00
Isaac Connor 5fc785aca5 Fix crash when a monitor is in query mode and hence doesn't have a camera to close. Fixes #3794 2023-12-09 16:51:21 -05:00
efranzwa b033134596 Add images for Defining Zones Doc Section 2023-12-09 09:49:15 -08:00
efranzwa 6298d48db0 Update Defining Zones Doc Section 2023-12-09 09:47:12 -08:00
Isaac Connor e132181f6a Make reconnection logging a debug 2023-12-08 17:42:50 -05:00
Isaac Connor 3bca776214 Handle change of res/colours in zms by reloading the monitor object. 2023-12-08 10:14:38 -05:00
Isaac Connor 74591dc71f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-12-07 13:31:29 -05:00
Isaac Connor afcc07facd Rough in a Uri class, use it to populate onvif_url if not filled in 2023-12-07 13:31:24 -05:00
Isaac Connor 88db0e9854 Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor. 2023-12-07 13:17:08 -05:00
Isaac Connor 2514b3533a Fix spacing between monitor filters 2023-12-07 10:31:33 -05:00
Isaac Connor d10335f83a
Merge pull request #3792 from Simpler1/patch-7 
Fix(uname): Copy/paste typo in comment
 2023-12-07 10:08:30 -05:00
Isaac Connor 599d21050d Only log error when not sigpipe 2023-12-07 09:15:41 -05:00
Simpler1 dc71acb1e3
Fix(uname): Copy/paste typo in comment 2023-12-06 22:08:46 -05:00
Isaac Connor 6dc0e88988 Turn common Errors into Info beacuse they happen all the time when reloading a monitor 2023-12-06 14:40:29 -05:00
Isaac Connor d67fb2b175 Handle RenewRequest not being supported 2023-12-06 13:23:06 -05:00
Isaac Connor f07612c25f Only calculate keyframe interval using video stream 2023-12-06 12:25:30 -05:00
Isaac Connor c2946f203e Reduce debug logging. Clean up Play/Pause a bit. 2023-12-06 12:25:12 -05:00
Isaac Connor a7e56a44a7 If the response to Renew is actionNotSupported, then just assume that we can be healthy. Apparenlty Dahua cameras don't support Renew. 2023-12-06 09:52:27 -05:00
Isaac Connor b03838018c When Capturing=ONDEMAND, still PrimeCapture to get an image, and then Pause. 2023-12-06 09:42:26 -05:00
Isaac Connor 1253a5fffe Add streams to RTSP2Web and Janus earlier, in connect so that Capturing=ONDEMAND streams are streamable. Add Pause/Play functions to Play/Pause capturing. 2023-12-06 09:41:45 -05:00