Isaac Connor
|
3e55795cad
|
Handle different command line syntax for zmcontrol.pl
|
2020-03-26 13:57:43 -04:00 |
|
Isaac Connor
|
b354641df3
|
fix syntax errors in triggers in monitor view
|
2020-03-26 13:57:19 -04:00 |
|
Isaac Connor
|
af36cc3e52
|
Fix starting and stopping zmcontrol processes across servers.
|
2020-03-26 13:57:00 -04:00 |
|
Isaac Connor
|
45299955a1
|
Fix SLOW FWD not working
|
2020-03-26 12:21:42 -04:00 |
Pliable Pixels
|
cf6b24b432
|
add ES status to telemetry and --show option to display what is being sent to ZM
|
2020-03-26 12:11:00 -04:00 |
hax0kartik
|
eed45ae66c
|
Fix 2892
|
2020-03-26 12:08:44 -04:00 |
|
Isaac Connor
|
ea7bea4c6e
|
fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int.
|
2020-03-26 12:08:21 -04:00 |
|
Isaac Connor
|
a5ec89ab1b
|
use bool instead of my_bool to fix #2886
|
2020-03-26 12:07:58 -04:00 |
|
Isaac Connor
|
cbda9848ab
|
Fix SLOW FWD not working
|
2020-03-26 12:06:07 -04:00 |
|
hax0kartik
|
8f5a3c1bf2
|
Add a missing endif
|
2020-03-26 00:52:34 -07:00 |
|
hax0kartik
|
156728c9b6
|
Use preprocessors to ensure libvnc monitor is only built when libvnc is found
|
2020-03-26 00:08:00 -07:00 |
|
hax0kartik
|
5b1409d8df
|
Add cmake rules to check for libvnc
|
2020-03-25 23:29:22 -07:00 |
|
hax0kartik
|
1d3ad05bb5
|
Start implementing VNC
|
2020-03-25 23:21:34 -07:00 |
|
Isaac Connor
|
2bd805c1f1
|
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
|
2020-03-24 16:16:32 -04:00 |
|
Isaac Connor
|
b611e2616b
|
handle scale=auto
|
2020-03-24 16:15:24 -04:00 |
|
Isaac Connor
|
adf953dcdd
|
use bool instead of my_bool to fix #2886
|
2020-03-24 15:30:52 -04:00 |
|
Isaac Connor
|
0ecd35e1c6
|
fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int.
|
2020-03-24 15:30:16 -04:00 |
|
Isaac Connor
|
7fcd71e684
|
Use fputc instead of printf for separator to be a tiny bit more efficient. Report current state when forcing alarm on
|
2020-03-24 15:19:16 -04:00 |
|
Isaac Connor
|
188b8a7f2d
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-03-24 14:57:00 -04:00 |
|
Isaac Connor
|
0b5ebbbe59
|
add focal to ubuntu builds
|
2020-03-24 14:56:25 -04:00 |
Isaac Connor
|
5914cf3cad
|
Merge pull request #2900 from hax0kartik/2892-fix
Fix issue #2892
|
2020-03-24 12:46:56 -04:00 |
|
hax0kartik
|
a70ab85407
|
Fix 2892
|
2020-03-24 09:29:19 -07:00 |
|
Isaac Connor
|
e06912a995
|
Merge branch 'release-1.34'
|
2020-03-21 15:28:27 -04:00 |
|
Isaac Connor
|
d3df0defc9
|
Support missing openssl_random_pseudo_bytes by using alternate functions
|
2020-03-21 15:28:18 -04:00 |
|
Isaac Connor
|
5a20ef959f
|
Merge branch 'release-1.34'
|
2020-03-20 11:07:46 -04:00 |
|
Isaac Connor
|
d7ea798c09
|
add modern stracktrace to log messages
|
2020-03-20 11:06:32 -04:00 |
|
Isaac Connor
|
ecaaae90f3
|
fix streamImg loading when using applet. Also don't alter actParms as it is not a global.
|
2020-03-20 11:06:01 -04:00 |
|
Isaac Connor
|
4aaaeda6ed
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-16 21:06:39 -04:00 |
|
Isaac Connor
|
ad61a0e385
|
Escape Function to fix mysql8. Fixes #2885
|
2020-03-16 21:06:31 -04:00 |
|
Isaac Connor
|
13bab59f30
|
Merge pull request #2889 from pliablepixels/dev
add ES status to telemetry and --show option to display what is being…
|
2020-03-16 16:04:37 -04:00 |
|
Pliable Pixels
|
090cd845b0
|
add ES status to telemetry and --show option to display what is being sent to ZM
|
2020-03-16 14:49:27 -04:00 |
|
Isaac Connor
|
d54b2e5b21
|
Merge pull request #2888 from pliablepixels/mp4objdetect
Mp4 animations for objdetect
|
2020-03-15 10:45:52 -04:00 |
|
Isaac Connor
|
7be56aeb00
|
Merge pull request #2887 from pliablepixels/dev
Re-enable fragmented MP4, allow previews while event is recorded
|
2020-03-15 10:44:58 -04:00 |
|
Pliable Pixels
|
921c4c5bbd
|
don't return mp4 if objdetect is used
|
2020-03-14 15:00:33 -04:00 |
|
Pliable Pixels
|
4342506e5b
|
fix media type allocations
|
2020-03-14 14:24:39 -04:00 |
|
Pliable Pixels
|
4d5f9f7de0
|
add back gif, make nomenclature consistent of objdetect_subtypes
|
2020-03-14 14:18:25 -04:00 |
|
Isaac Connor
|
f8fa0340fc
|
fix eslint
|
2020-03-14 09:27:07 -04:00 |
|
Pliable Pixels
|
9a31d545d4
|
replace GIF function with MP4
|
2020-03-14 08:08:52 -04:00 |
|
Pliable Pixels
|
30d45aee8f
|
formatting/comment
|
2020-03-13 15:11:00 -04:00 |
|
Pliable Pixels
|
dd76ee2c9f
|
spacing
|
2020-03-13 15:01:19 -04:00 |
|
Pliable Pixels
|
6b61f4ac84
|
when an event is created, write video name if applicable so image.php can extract frames while recording is in progress
|
2020-03-13 14:47:22 -04:00 |
|
Pliable Pixels
|
ff7defa84e
|
re-enable fragmented mp4 recordings
|
2020-03-13 14:46:20 -04:00 |
|
Isaac Connor
|
11b1bf1100
|
undo random addition
|
2020-03-11 10:54:52 -04:00 |
|
Isaac Connor
|
c90655d178
|
fix build on libavtools < 12
|
2020-03-11 10:54:35 -04:00 |
|
Isaac Connor
|
4c984c3617
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-03-10 18:47:33 -04:00 |
|
Isaac Connor
|
9a3127da06
|
Merge branch 'rate_dropdown'
|
2020-03-10 18:47:19 -04:00 |
|
Isaac Connor
|
59bd658a96
|
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
|
2020-03-10 18:46:20 -04:00 |
|
Isaac Connor
|
84d719f2dd
|
Merge branch 'release-1.34' into rate_dropdown
|
2020-03-10 16:06:11 -04:00 |
|
Isaac Connor
|
79f98c78cc
|
Merge pull request #2881 from pliablepixels/dev
Added options to render objdetect, objdetectanim and objdetectimage
|
2020-03-10 14:46:22 -04:00 |
|
Pliable Pixels
|
49f23cb35b
|
Added options to render objdetect, objdetectanim and objdetectimage
|
2020-03-10 13:51:55 -04:00 |