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
56fdae0f19
timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
...
is off
2021-11-19 12:02:31 -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
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
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
5d93e9a957
av_write_trailer can return a positive value which is not an error
2021-11-02 17:24:54 -04:00
2aa7293326
Fix event listing when not paginated.
2021-11-02 17:23:46 -04:00
84b8e43034
Only start a transaction if we are not already in a transaction
2021-10-28 15:28:55 -04:00
15a7c22b94
layout->layer
2021-10-28 15:26:12 -04:00
d7abdb1505
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
2021-10-28 15:18:55 -04:00
7fd8efeaef
is no longer in existence
2021-10-28 15:17:33 -04:00
94752e0cf3
Make delete dialog disappear on success. Fixes #3377
2021-10-28 15:15:24 -04:00
bd8ed71ffc
Remove debugging
2021-10-28 15:11:42 -04:00
e344141222
merge fix from master for filters not deleting
2021-10-28 15:10:55 -04:00
8061b4f71d
Define Date formats
...
Set Locale for time to en_GB.utf8, changed STRF_FMT_DATETIME_SHORTER to %x which is locale aware short date, but does include year. Makes event table wider, not sure if that is a problem for others
2021-10-28 14:41:19 -04:00
198d9c0f5a
Restore the download button's behaviour. It is a simple link to the mp4, not an export. Also add a handler for the video.js rate control to sync up our non video.js rate dropdown and stored cookie.
2021-10-28 14:37:47 -04:00
bf7c13558c
Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4.
2021-10-28 14:37:19 -04:00
615ce5d4c2
Set rows on email textarea
2021-10-28 14:36:06 -04:00
649eec4dae
Update italian (it_it) translation ( #3357 )
2021-10-28 14:35:29 -04:00
0dbcd680df
Update it_it.php
2021-10-28 14:35:16 -04:00
64b60613d8
Update it_it.php
2021-10-28 14:35:08 -04:00
8600a0af87
Add some extra parenthesis to make sure the logic works right
2021-10-28 13:21:50 -04:00
Isaac Connor
Isaac Connor
BlueMax
ColorfullyZhang
Steve Gilvarry
Andrea Vezzali