Isaac Connor
|
1783eff58a
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-29 16:21:40 -05:00 |
|
Isaac Connor
|
7b9c86111c
|
Move Cleanup and framebuffer freeing into Close() so that we don't crash on Reload
|
2021-11-29 16:21:34 -05:00 |
|
Isaac Connor
|
65dacbc317
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2021-11-29 14:15:10 -05:00 |
|
Isaac Connor
|
089563d1ce
|
rework do_debian_package to properly support the CURRENT style of snapshots and make the code a little easier to read
|
2021-11-29 14:14:56 -05:00 |
|
Isaac Connor
|
82a4cbaec5
|
Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files
|
2021-11-29 13:49:07 -05:00 |
|
Isaac Connor
|
072d181f79
|
Fix AlarmStartCommand => EventStartCommand
|
2021-11-29 13:49:07 -05:00 |
|
Isaac Connor
|
ea6a84ae66
|
Fix AlarmEndCommand => EventEndCommand
|
2021-11-29 13:49:07 -05:00 |
|
Isaac Connor
|
1f19ad7c9d
|
fix by removing code block
|
2021-11-29 13:49:07 -05:00 |
|
Isaac Connor
|
01f4aee450
|
Fix underline
|
2021-11-29 13:49:07 -05:00 |
maddios
|
b47e96d7cf
|
Fix Copy/Move to Default Storage
When moving from a 2nd storage to Default it fails with "New storage does not have an id. Moving will not happen" because the default ID is 0.
|
2021-11-29 00:20:25 -05:00 |
Isaac Connor
|
6aaebafd17
|
Merge pull request #3391 from pkubaj/patch-1
Fix build on FreeBSD/armv7
|
2021-11-28 20:08:19 -05:00 |
pkubaj
|
74a2276671
|
Fix build on FreeBSD/armv7
1. FreeBSD uses elf_aux_info instead of getauxval.
2. FreeBSD uses HWCAP_NEON macro for Neon.
|
2021-11-29 00:03:45 +00:00 |
|
Isaac Connor
|
ba73321628
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-26 19:23:12 -05:00 |
|
Isaac Connor
|
28d8b22377
|
bump version 1.37.5
|
2021-11-26 19:22:53 -05:00 |
|
Isaac Connor
|
21218491f7
|
Add EventStartCommand and EventEndCommand to monitors ui
|
2021-11-26 19:22:07 -05:00 |
|
Isaac Connor
|
b626de50dc
|
Add code to fork and exec EventStartCommand and EventEndCommand
|
2021-11-26 19:21:51 -05:00 |
|
Isaac Connor
|
d51eb63947
|
Add EventStartCommand and EventEndCommand to monitors table
|
2021-11-26 19:21:24 -05:00 |
|
Isaac Connor
|
f9f2615d48
|
Return if unable to lock the event record. Improve code around CopyTo call.
|
2021-11-26 15:26:38 -05:00 |
|
Isaac Connor
|
7468727b75
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-26 13:38:05 -05:00 |
|
Isaac Connor
|
a1bf8f7f5b
|
Fix NULL and add special 0 case for Storage area specification in filter
|
2021-11-26 10:35:15 -05:00 |
|
Isaac Connor
|
af5436d009
|
Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area
|
2021-11-26 10:31:54 -05:00 |
|
Isaac Connor
|
e8bb095730
|
include monitor dimensions when logging about zone mismatch
|
2021-11-24 14:28:31 -05:00 |
|
Isaac Connor
|
e061f3b34a
|
typo
|
2021-11-24 14:28:15 -05:00 |
|
Isaac Connor
|
6037cdc2a3
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-24 13:44:59 -05:00 |
|
Isaac Connor
|
77d3109152
|
Increase to 20 before warning about db queue size. Put lock in it's own scope so that we unlock before notifying
|
2021-11-24 13:44:45 -05:00 |
|
Isaac Connor
|
67556430c6
|
Add option ZM_NO_PCRE to disable testing for libpcre3. debian wants to remove it so this allows us to test building without it. Remove libpcre3 from depends and set ZM_NO_PCRE=ON in debian build config
|
2021-11-24 12:44:07 -05:00 |
|
Isaac Connor
|
4be9c6cdd2
|
Code comments and make warning when the first packet in queue is locked.
|
2021-11-24 12:42:31 -05:00 |
|
Isaac Connor
|
81ffc6df4e
|
Remove text-nowrap from cause/notes column
|
2021-11-24 12:06:13 -05:00 |
|
Isaac Connor
|
ffdb0f9824
|
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-23 11:05:39 -05:00 |
|
Isaac Connor
|
46a835b28a
|
fix error when no monitors defined and we are adding one.Fixes #3385
|
2021-11-22 14:26:48 -05:00 |
|
Isaac Connor
|
1f75b017cc
|
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-22 14:17:50 -05:00 |
|
Isaac Connor
|
cc65c99791
|
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-22 12:53:51 -05:00 |
|
Isaac Connor
|
40e7f607f5
|
If no protocol defined, fall back to the name of the Control
|
2021-11-22 11:38:40 -05:00 |
|
Isaac Connor
|
2529765df3
|
timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
is off
|
2021-11-19 11:59:19 -05:00 |
|
Isaac Connor
|
2c798069d3
|
improve debug logging when loading Control in Monitor
|
2021-11-18 18:12:07 -05:00 |
|
Isaac Connor
|
bd89e85ea0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-18 11:09:59 -05:00 |
|
Isaac Connor
|
0a30c55042
|
install manufacturers.sql and models.sql
|
2021-11-18 11:09:49 -05:00 |
|
Isaac Connor
|
084a66af4b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-18 09:56:27 -05:00 |
|
Isaac Connor
|
6ee3c238e7
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-18 09:55:51 -05:00 |
|
Isaac Connor
|
f63c124988
|
include manufacturers and models
|
2021-11-18 09:55:39 -05:00 |
|
Isaac Connor
|
18610fd601
|
Add an update script that includes manufacturers and models
|
2021-11-18 09:55:19 -05:00 |
|
Isaac Connor
|
ae6925fb89
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-17 18:59:46 -05:00 |
|
Isaac Connor
|
805ef16e73
|
bump version
|
2021-11-17 18:59:37 -05:00 |
|
Isaac Connor
|
7b18b22f82
|
Fix value of unknown Model
|
2021-11-17 18:58:02 -05:00 |
|
Isaac Connor
|
9160ee932f
|
remove debug
|
2021-11-17 18:57:53 -05:00 |
|
Isaac Connor
|
836fe8c2b1
|
spacing
|
2021-11-17 18:57:44 -05:00 |
|
Isaac Connor
|
b1d881b118
|
Report more saving errors to ui
|
2021-11-17 18:57:36 -05:00 |
|
Isaac Connor
|
a0666e777a
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-17 17:45:47 -05:00 |
|
Isaac Connor
|
c37d8eeded
|
spacing and report save errors
|
2021-11-17 17:45:38 -05:00 |
|
Isaac Connor
|
1c9f43bcaf
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-17 14:43:22 -05:00 |