Commit Graph

23023 Commits (af3f380692419c9cd0509f681f77445ef56f6e0d)

Author SHA1 Message Date
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
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
Isaac Connor db135cba46 Add isPrimed to camera class instead of it just being in ffmpeg_camera. Rename mCanCapture to isPrimed in ffmpeg_camera. 2023-12-06 09:38:38 -05:00
Isaac Connor ffc111f1e7 Need to a () so that ModelId is called as a function and so it doesn't complain about lack of property 2023-12-06 09:37:45 -05:00
Isaac Connor ccfcd33855 modal requests require csrf-magic. 2023-12-05 09:47:35 -05:00
Isaac Connor 803cc8bc1a Add zmDbSupportsFeature with skip_locked support 2023-12-05 09:42:01 -05:00
Isaac Connor aafd4067e0 Dont' restart a monitor if it has been deleted 2023-12-04 14:50:37 -05:00
Isaac Connor 6bf0533341 Better logging, only commit if no error. 2023-12-04 14:17:18 -05:00
Isaac Connor d51c99ce44 Fix groups not being shown when monitors not specifically selected. 2023-12-04 14:11:57 -05:00
Isaac Connor 03858ba1a2 Code style, using ->Id() instead of checking for property existence. 2023-12-04 14:06:49 -05:00
Isaac Connor 5e9f53b41a Fixup issues with label for's 2023-12-03 17:57:22 -05:00
Isaac Connor 983ccb7afc Add support for double in zmMemWrite 2023-12-03 10:37:53 -05:00
Isaac Connor 379028123e add wrap to monitor filters 2023-12-03 10:25:30 -05:00
Isaac Connor 89f90dc5fa Don't output the boundary if we aren't streaming. Single jpegs don't need it and I think something was complaining about it. 2023-12-03 09:24:27 -05:00
Isaac Connor c2f05911b1 Put a 1 sec wait limit on zms when in single image mode. 2023-12-03 09:15:28 -05:00
Isaac Connor be61184faf Add defaults to GenerateVideo, don't chdir, fix other code 2023-12-01 13:05:36 -05:00
Isaac Connor 70b1432c1f Have to check for property_exists instead of empty. empty includes a valid value of 0 2023-12-01 12:46:49 -05:00
Isaac Connor 49af487746 port over generateVideo from perl side and stick into Event. 2023-12-01 12:46:26 -05:00
Isaac Connor 44a3a7a6a8 Fix loading event due to missing GROUP BY. Fixes event video generation. 2023-12-01 12:46:05 -05:00
Isaac Connor 4ff215e8bd Fix for when system_utilisation is empty 2023-11-30 14:38:41 -05:00
Isaac Connor 99c9eb5e0e Fix missing ) 2023-11-30 14:23:17 -05:00
Isaac Connor bb94d02019 Make sure groups is always defined else we get error from user.js.php 2023-11-30 10:00:40 -05:00
Isaac Connor 02f922d4b7 Don't include csrf on ajax requests. We only return json for ajax and the csrf kills the json parsing. 2023-11-28 10:16:58 -05:00
Isaac Connor 065bed894c Use empty array instead of null for allowedMonitors 2023-11-24 08:57:35 -05:00
Isaac Connor 420a5a5ea5 Load events using post so that we can send a large request 2023-11-23 16:59:59 -05:00
Isaac Connor c1ae4336a7 Change Got Good Repsonse fro ONVIF to a debug 2023-11-23 16:06:32 -05:00
Isaac Connor 39a0ee1230 Add loading speed from COOKIES 2023-11-23 14:27:04 -05:00
Isaac Connor bde6870a21 Add support for Notes as a filter, setup for altering the terms later. Add CASE so that incomplete events have and EndTimeSecs 2023-11-23 14:25:52 -05:00
Isaac Connor b0a6ef5624 Add Sorting monitors by user preference. 2023-11-23 14:10:29 -05:00
Isaac Connor a7885a4c04 Make montagereview default to history mode 2023-11-23 14:00:19 -05:00
Isaac Connor 2fb0e40503 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-11-23 13:00:51 -05:00
Isaac Connor 164ec3667e Fix eslint 2023-11-23 13:00:44 -05:00
Isaac Connor b08c44172a Add back a little padding to mfbpanel in montage 2023-11-23 13:00:30 -05:00
Isaac Connor 1fa3e18e5c Remove extra padding in headers 2023-11-23 13:00:13 -05:00