Commit Graph

19192 Commits

Author SHA1 Message Date
Isaac Connor 5b9ccc6889 Implement a check on change of language. Make sure that the specified language file exists. Reports errors to UI 2022-02-08 13:37:39 -05:00
Isaac Connor 9973b1fbaf Move the version detection down to after we have a repo and hence a commit history on version. Fixes CURRENT builds always being commit 0 2022-02-02 20:56:41 -05:00
Isaac Connor df16099463 Default limit to 0 which means no limit 2022-02-02 11:02:34 -05:00
Isaac Connor b28f97c5c3 Implement filter limits. Which go before pagination/advanced search limits 2022-02-02 10:50:28 -05:00
Isaac Connor 4501a7c2a1 Remove field that ffmpeg 5.0 doesn't have. 2022-02-01 07:25:13 -05:00
Isaac Connor 0125efb93e add some brackets to make logic more clear 2022-01-25 14:25:27 -05:00
Isaac Connor 1bdb4f302c Fix mTerminate not being initialised. 2022-01-25 14:25:13 -05:00
Isaac Connor df7e34a51d Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image. 2022-01-25 14:24:52 -05:00
Isaac Connor 988f118ba9 Fix fail to get Sources in RTSP. the string msg although initially reserved to ZM_NETWORK_BUFSIZ, after use it's capacity is changed whatever it's contents are. So need to re-reserve. 2022-01-25 12:07:32 -05:00
Isaac Connor ae17b2316e break out when zm_terminate is true 2022-01-24 20:07:14 -05:00
Isaac Connor 8891feec74 Fix missing text-right align on Port/Path labels. Set step to 1 for Port 2022-01-24 18:31:31 -05:00
Isaac Connor 42d5101f08 Make Remote Host 100% 2022-01-24 18:31:05 -05:00
Isaac Connor 01030e9850 Preface Debug with ZM 2022-01-13 22:15:29 -05:00
Isaac Connor 9893d37bf1 include user and function error message about insufficient permissions. Will make it easier to figure out who tried what. 2021-12-14 12:26:47 -05:00
makers-mark 9f8fc65cd3 Update zm_update-1.35.25.sql 2021-12-14 10:27:07 -05:00
Isaac Connor 4a51253aa9 Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress. 2021-12-14 10:26:17 -05:00
Isaac Connor 3ee649406c Warning=>Debug when -1 is passed to GetImage 2021-12-14 10:25:48 -05:00
Isaac Connor 3a8c740a69 Bump version to 1.36.12 2021-12-10 17:36:30 -05:00
Isaac Connor 15b01c2730 timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
is off
2021-12-10 16:45:26 -05:00
pkubaj a577c3fe79 Fix build on FreeBSD/armv7
1. FreeBSD uses elf_aux_info instead of getauxval.
2. FreeBSD uses HWCAP_NEON macro for Neon.
2021-12-10 16:42:08 -05:00
Isaac Connor 5fdad04a9e Move Cleanup and framebuffer freeing into Close() so that we don't crash on Reload 2021-12-10 16:41:37 -05:00
Isaac Connor a0fd8d64d2 Wait for closeEvent thread to finish. Fixes unfinished event when zmc told to restart 2021-12-10 16:40:52 -05:00
Isaac Connor bfbba5474f Add auth relay to status ajax request. clear statusTimer instead of streamTimer 2021-12-10 16:37:46 -05:00
Isaac Connor b7b49437b9 spacing 2021-12-10 16:23:46 -05:00
Isaac Connor 327f481893 must clear the monitors array before terminating log. 2021-12-10 16:23:31 -05:00
Isaac Connor 756aa56710 Detect group hierarchy loops and break them. 2021-12-03 13:27:05 -05:00
Petter Reinholdtsen ea0e65d300 Make config file comment on unix socket option a bit clearer
Initially I took the comment for granted, and the 'unix_socket' string
as a magic string to tell zoneminder to use the mysql default socket.  Alas,
this do not work, as the setting really need to point to the path of the socket.
Rewrite the comment to make this more clear, and less confusing for the
future users.
2021-12-03 13:26:52 -05:00
Isaac Connor fb0f184d1d Revert "timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE"
This reverts commit 59e8bca3bc.
2021-11-30 12:03:21 -05:00
Isaac Connor 7f8195b248 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-11-29 13:59:24 -05:00
Isaac Connor 59e8bca3bc timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
is off
2021-11-29 13:57:39 -05:00
Isaac Connor 9764875449 Move init of ctx up before we setup the monitors. I think in some cases we can calls functions that assume ctx has a value. Uncaught%20TypeError%3A%20Cannot%20read%20properties%20of%20undefined%20(reading%20'getImageData') 2021-11-29 13:55:23 -05:00
Isaac Connor 0f476998d4 kill the background timer when switching to history so that we don't cause a javascript error. comment out debugging and use native javascript instead of jquery. 2021-11-29 13:54:42 -05:00
Isaac Connor afc21cd14d If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart. 2021-11-29 13:54:11 -05:00
Isaac Connor 5adf5dab50 Remove text-nowrap from cause/notes column 2021-11-29 13:53:50 -05:00
Isaac Connor 7d470fa059 Code comments and make warning when the first packet in queue is locked. 2021-11-29 13:53:37 -05:00
Isaac Connor 11c12f5d10 typo 2021-11-29 13:52:47 -05:00
Isaac Connor 209d45c5f0 include monitor dimensions when logging about zone mismatch 2021-11-29 13:52:31 -05:00
Isaac Connor 765886ae72 Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area 2021-11-29 13:52:05 -05:00
Isaac Connor 4030fa8bc4 Fix NULL and add special 0 case for Storage area specification in filter 2021-11-29 13:51:50 -05:00
Isaac Connor eeb655fd77 Fix underline 2021-11-29 13:50:07 -05:00
Isaac Connor 4ef5056a91 fix by removing code block 2021-11-29 13:49:55 -05:00
Isaac Connor c14d7889a5 Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files 2021-11-29 13:48:44 -05:00
Isaac Connor 48c744caed Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-11-29 09:13:20 -05:00
Isaac Connor 56fdae0f19 timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
is off
2021-11-19 12:02:31 -05:00
Isaac Connor 7a181fc082 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-11-17 11:06:38 -05:00
Isaac Connor 2e62826e6c Bump version for release 2021-11-17 11:05:50 -05:00
Isaac Connor a0b60aa4f7 Restore inclusion of video files in export when not including images. Fixes #3324 2021-11-17 11:04:48 -05:00
Isaac Connor d8eb0b2350
Merge pull request #3383 from BlueMax/musl_build_fix
fix posix/musl build
2021-11-16 15:01:35 -05:00
Isaac Connor b7d8add5ad Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2021-11-16 15:00:34 -05:00
Isaac Connor cb8ccaaa49 Set to never timeout while generating video 2021-11-16 15:00:04 -05:00