15b01c2730
timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
...
is off
2021-12-10 16:45:26 -05:00
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
5fdad04a9e
Move Cleanup and framebuffer freeing into Close() so that we don't crash on Reload
2021-12-10 16:41:37 -05:00
a0fd8d64d2
Wait for closeEvent thread to finish. Fixes unfinished event when zmc told to restart
2021-12-10 16:40:52 -05:00
bfbba5474f
Add auth relay to status ajax request. clear statusTimer instead of streamTimer
2021-12-10 16:37:46 -05:00
b7b49437b9
spacing
2021-12-10 16:23:46 -05:00
327f481893
must clear the monitors array before terminating log.
2021-12-10 16:23:31 -05:00
756aa56710
Detect group hierarchy loops and break them.
2021-12-03 13:27:05 -05:00
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
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
7f8195b248
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2021-11-29 13:59:24 -05:00
59e8bca3bc
timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
...
is off
2021-11-29 13:57:39 -05:00
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
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
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
5adf5dab50
Remove text-nowrap from cause/notes column
2021-11-29 13:53:50 -05:00
7d470fa059
Code comments and make warning when the first packet in queue is locked.
2021-11-29 13:53:37 -05:00
11c12f5d10
typo
2021-11-29 13:52:47 -05:00
209d45c5f0
include monitor dimensions when logging about zone mismatch
2021-11-29 13:52:31 -05:00
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
4030fa8bc4
Fix NULL and add special 0 case for Storage area specification in filter
2021-11-29 13:51:50 -05:00
eeb655fd77
Fix underline
2021-11-29 13:50:07 -05:00
4ef5056a91
fix by removing code block
2021-11-29 13:49:55 -05:00
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
48c744caed
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2021-11-29 09:13:20 -05:00
56fdae0f19
timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
...
is off
2021-11-19 12:02:31 -05:00
7a181fc082
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2021-11-17 11:06:38 -05:00
2e62826e6c
Bump version for release
2021-11-17 11:05:50 -05:00
a0b60aa4f7
Restore inclusion of video files in export when not including images. Fixes #3324
2021-11-17 11:04:48 -05:00
d8eb0b2350
Merge pull request #3383 from BlueMax/musl_build_fix
...
fix posix/musl build
2021-11-16 15:01:35 -05:00
b7d8add5ad
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2021-11-16 15:00:34 -05:00
cb8ccaaa49
Set to never timeout while generating video
2021-11-16 15:00:04 -05:00
498d565034
In multi-server when viewing an event it may be coming from a different server than the serverhost. Use monitorUrl instead of thisUrl in ajax calls and include auth data. Fixes failed ajax when viewing h264 using zms on a multi-server environment
2021-11-16 15:00:04 -05:00
51e7aa0983
Fix use of thisUrl instead of monitorUrl when getting stream status. Fix changing stream image due to use of jquery.
2021-11-16 15:00:04 -05:00
f8e6fae013
spacing and check for permission to view the specific event instead of events in general
2021-11-16 15:00:04 -05:00
4b08b0ae84
Add title to Download button
2021-11-16 15:00:04 -05:00
d5f9eb11c6
WHen saving v4l settings redirect back to watch instead of console.
2021-11-16 15:00:04 -05:00
1b3e0eda13
dbError is supposed to take the sql that caused the error. So pass something to satisfy php
2021-11-16 15:00:04 -05:00
90e3345440
implement Event::canEdit
2021-11-16 15:00:04 -05:00
29fe7f76a2
implement UrlToZMS in Monitor
2021-11-16 15:00:04 -05:00
fa533d04ff
Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id
2021-11-16 15:00:04 -05:00
bbf1269e6f
remove extra ,
2021-11-16 15:00:04 -05:00
601df481ed
Add privacy to options tabs so we can get back to it.
2021-11-16 15:00:04 -05:00
92bc6ed552
Allow NOW or CURRENT for PACKAGE_VERSION similar to snapshot
2021-11-16 14:59:37 -05:00
8a4a530cf3
fix posix/musl build
2021-11-16 19:50:17 +00:00
e3d2b14b69
Don't exit(0) on QUIT. Instead set zm_terminate=true so that all the cleanup routines run.
2021-11-09 15:49:25 -05:00
9b723d73a1
Set zm_terminate on crash so that other threads exit instead of continuing
2021-11-09 10:51:39 -05:00
00919314e7
Report error if sql fails. Add check for access to specific event.
2021-11-09 10:51:29 -05:00
55e739d4ea
Whitespace
2021-11-09 10:51:16 -05:00
dd542d5b30
alert error message is an error is returned instead of rows
2021-11-09 10:50:55 -05:00
Isaac Connor
pkubaj
Petter Reinholdtsen
Isaac Connor
BlueMax