217d632f1a
Remove epadding, last_frame_score replaced it
2021-02-17 11:54:30 -05:00
e601c08ed0
last_read_index and last_write_index are not int32_ts. Add last_motion_score which should fix our failure to detect alarms in zmalarm etc
2021-02-16 16:56:10 -05:00
33cabd3621
Merge pull request #3156 from dodexahedron/3155-log-copies-and-moves
...
Added logging for copies/moves to zmfilter.pl
2021-02-10 17:35:06 -05:00
a7eab75cf9
Added logging for copies/moves to zmfilter.pl
2021-02-10 15:31:10 -07:00
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
bf8b3fee2a
Merge pull request #3126 from Carbenium/cmake-man-pages
...
Build: Make building man pages optional (enabled by default)
2021-02-04 12:05:22 -05:00
4db0dea1f2
Build: Make building man pages optional (enabled by default)
...
Add a new CMake option (-DBUILD_MAN) which can be used
to deactivate the man page build steps.
This is especially useful in a development situation where "make all"
is needlessly slowed down by these build steps.
2021-02-03 21:22:28 +01:00
e05fdf423b
Merge pull request #3125 from gmanic/patch-1
...
corrected $this to $self
2021-02-03 10:21:33 -05:00
e085acedc8
ALlow micro version mismatches to not be fatal. Minor and Major are still fatal.
2021-02-03 09:50:37 -05:00
8a99665311
better variable names and code documentation
2021-02-03 09:50:13 -05:00
037f197f54
corrected $this to $self
2021-02-03 12:53:33 +01:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
cb90c06cde
Merge branch 'master' into zma_to_thread
2021-01-17 17:38:34 -05:00
1e59c5bbde
Merge branch 'release-1.34'
2021-01-15 18:46:07 -05:00
7183a47a3a
split Netcat security header into multiple lines for legibility
2021-01-15 18:45:13 -05:00
f2fea95f4b
Merge branch 'master' into zma_to_thread
2021-01-14 13:02:52 -05:00
02386f0c64
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter.
2021-01-14 12:56:54 -05:00
cf2d987fc0
Add MIN_RTSP_PORT config item, but commented out for now
2021-01-11 13:46:50 -05:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
c9ac5dff62
Use parent printMsg
2020-12-21 12:17:02 -05:00
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
bdf9a029ad
Must require ZoneMinder::Monitor if we want to use it
2020-12-15 09:35:17 -05:00
9fec11c4a9
Add missing Monitor() function.
2020-12-14 14:41:34 -05:00
47b3f319e7
Add capture_fps and analysis_fps to shared memory. This also requires support for type double
2020-12-09 12:18:43 -05:00
b0f2ff6302
Add Session cleaning
2020-12-08 10:21:55 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
b30b4cd66a
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
2020-12-03 14:28:48 -05:00
5a489b3e99
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
2020-12-03 14:28:03 -05:00
6e64114ac3
Skip row locking in UpdateDiskSpace if the filter is already locking rows
2020-12-03 14:26:51 -05:00
d1c3864778
Use the ZM_FONTDIR substitution instead of hardcoding a path
2020-12-01 09:21:54 -05:00
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
b212b0e450
Allow modifying font file location
2020-11-28 20:18:17 +05:30
ff4b0e6309
add option to disable thumb animation
2020-11-25 13:03:16 -06:00
51ebaecc44
Fix MN and the various Event Total substitutions
2020-11-21 15:10:23 -05:00
98c2c6cccf
Add Status,CaptureFPS,AnalysisFPS, CaptureBandWidth to MonitorStatus fields
2020-11-21 15:09:43 -05:00
30363c1d4b
Add Monitor Status loading
2020-11-21 15:08:29 -05:00
b44f14691e
Don't exit after 30 minutes. Google code style.
2020-11-21 15:08:09 -05:00
271dcbc4e8
select returns EINTR when HUP'd. This is not fatal. Handling this gracefully reduces log spam
2020-11-21 09:12:41 -05:00
5bf5d58ac1
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:32:50 -05:00
a47b72af49
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:31:36 -05:00
a0dcdd135a
DefaultRate and DefaultScale are Monitor properties, so just load them in a Monitor object so we don't have to JOIN the Monitors table
2020-11-13 17:04:22 -05:00
f1b8266e26
Only join storage and Monitors if necessary
2020-11-13 17:03:51 -05:00
da99426535
if monitor is not found call loadMonitors to make sure it isn't new
2020-11-13 10:40:55 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
7b764d04d3
Fix use of next when it should be return. Improve some logging of errors.
2020-11-11 17:40:31 -05:00
076d649189
Include Record Monitors in zmtrigger
2020-11-11 16:12:30 -05:00
0aef0adf48
Fix more Monitors.Id => Monitor_Status.MonitorId
2020-11-11 11:32:54 -05:00
330023f65b
Move Events totals to Monitor_Status instead of Monitors
2020-11-11 09:30:39 -05:00
Isaac Connor
Isaac Connor
Brandon Thetford
Peter Keresztes Schmidt
gmanic
hax0kartik
Andrew Bauer