Isaac Connor
|
6b39f59b3a
|
use delete[] instead of delete.
|
2020-07-16 16:00:23 -04:00 |
|
Isaac Connor
|
2c056c188f
|
Fix compile on old ffmpeg
|
2020-07-16 15:59:08 -04:00 |
|
Isaac Connor
|
4e2732e12d
|
Priming capture logs should be debug not Info
|
2020-07-16 15:51:24 -04:00 |
Isaac Connor
|
9d6e0fc3af
|
Merge pull request #2977 from roddone/fix_events_table_responsive
make events table (events view) responsive
|
2020-07-16 15:49:01 -04:00 |
Isaac Connor
|
a7b76dfe41
|
Remove debug
|
2020-07-16 15:48:09 -04:00 |
|
Isaac Connor
|
0a6321ee56
|
Update linesize when using AssignDirect. Fixes #2979
|
2020-07-16 15:48:06 -04:00 |
|
Isaac Connor
|
d849ee54a4
|
Update state to ALARM AFTER we have opened the event, so that we get the correct event Id. Fixes #2978 Fixes #2894
|
2020-07-16 15:47:01 -04:00 |
|
Isaac Connor
|
dcd67a1acf
|
Remove args with non-sensical values from cgi params as a micro-opt
|
2020-07-13 14:50:21 -04:00 |
|
Isaac Connor
|
016d5119a3
|
increase days limit on stalebot
|
2020-07-13 14:49:54 -04:00 |
|
Isaac Connor
|
6469300af5
|
fix some csp violations
y
|
2020-07-07 18:57:11 -04:00 |
|
Isaac Connor
|
9b447bde8e
|
remove extra {
|
2020-07-07 18:56:51 -04:00 |
|
Isaac Connor
|
89f975e646
|
remove code to play a sound on alarm. Not going to support that when editing a zone.
|
2020-07-07 16:40:33 -04:00 |
|
Isaac Connor
|
33d4680f02
|
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
|
2020-07-07 16:35:37 -04:00 |
|
Isaac Connor
|
916d1ed59e
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-07-07 16:15:23 -04:00 |
|
Isaac Connor
|
c79c65e72e
|
spacing fixes
|
2020-07-07 16:14:57 -04:00 |
|
Isaac Connor
|
af74ecac4c
|
Pass along the image linesize to Image constructors so that Image knows about the requirement for it to be 32byte aligned.
|
2020-07-07 16:14:38 -04:00 |
|
Isaac Connor
|
fd9272241a
|
Introduce constructors that can be passed a linesize which is the # of bytes to use to store a line of image. This can be different from the image width * colours as it should be 32byte aligned for use with sws_scale.
|
2020-07-07 16:13:41 -04:00 |
|
Isaac Connor
|
cae8978501
|
add an alignment variable to ffmpeg_camera to use wherever we want to tell ffmpeg about the buffer and linesize alignment. Figure out linesize in the constructor so that zm_monitor can pass the info along to zm_image.
|
2020-07-07 16:12:14 -04:00 |
|
Isaac Connor
|
533876f313
|
rewrite code to use fewer lines. No logic change.
|
2020-07-07 09:16:42 -04:00 |
|
Isaac Connor
|
864cd4c178
|
introduce a linesize variable which represents the # of bytes to hold a line of the image in the buffer. May be > width * colours
|
2020-07-05 17:51:57 -04:00 |
|
Isaac Connor
|
8a35ae2daf
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-07-04 09:04:38 -04:00 |
|
Isaac Connor
|
ff265d2f17
|
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
|
2020-07-04 09:00:30 -04:00 |
|
Isaac Connor
|
e2a38268a0
|
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
|
2020-07-04 08:59:41 -04:00 |
|
Isaac Connor
|
fd10f545bd
|
if width/height don't evaluate to an integer, set to auto.
|
2020-07-04 08:58:09 -04:00 |
|
Isaac Connor
|
cc0624eb3f
|
Don't allow viewing of monitor setting if monitor permissions are set to View
|
2020-07-03 19:19:13 -04:00 |
|
Isaac Connor
|
1860ad188b
|
Don't allow viewing of zones or zone if Monitor permissions are view
|
2020-07-03 19:18:36 -04:00 |
|
Isaac Connor
|
343d8d832e
|
handle scale values of '' and 'auto'
|
2020-07-03 19:18:05 -04:00 |
|
Isaac Connor
|
2026788e7a
|
Turn close link into a button
|
2020-07-03 19:17:26 -04:00 |
|
Isaac Connor
|
66b155008c
|
Fix scale defaulting to monitor default Scale
|
2020-07-03 19:17:11 -04:00 |
|
Isaac Connor
|
9f821c74f6
|
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
|
2020-07-03 19:16:41 -04:00 |
|
Isaac Connor
|
697f117ecd
|
Make width of content 100% instead of 96%.
|
2020-07-02 17:22:34 -04:00 |
|
Isaac Connor
|
88f3565c0a
|
reduce verbosity of rsync
|
2020-07-02 17:17:44 -04:00 |
|
Isaac Connor
|
ab98deafd7
|
Add Log cleaning to zm_stats.pl
|
2020-07-02 16:02:49 -04:00 |
|
Isaac Connor
|
346fe63ef0
|
Add styles for inputs on monitor view
|
2020-06-30 19:19:17 -04:00 |
|
Isaac Connor
|
c47a348fea
|
Handle empty string version of scale
|
2020-06-30 19:18:45 -04:00 |
|
Isaac Connor
|
c022cae7ef
|
Sleep 10 secs if db connection fails to reduce log spamming and load
|
2020-06-30 18:59:27 -04:00 |
|
Isaac Connor
|
aff7e27dee
|
remove debug in zmtrack.pl.in
|
2020-06-30 18:58:46 -04:00 |
|
Isaac Connor
|
e137e1dacf
|
Don't consult EVENT_CLOSE_MODE if mode is RECORD
|
2020-06-26 19:30:35 -04:00 |
|
Isaac Connor
|
73ec5f10a5
|
sendCmd failures should not be fatal
|
2020-06-26 16:52:34 -04:00 |
|
Isaac Connor
|
d1e7d396f7
|
zmcontrol needs to be able to take floats instead of integers for it's parameters
|
2020-06-26 16:49:55 -04:00 |
|
Isaac Connor
|
4d8d926c89
|
minor code updates. Use user_row instead of generic row variable name.
|
2020-06-23 22:19:46 -04:00 |
|
Isaac Connor
|
e778ea0918
|
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
|
2020-06-23 22:19:04 -04:00 |
|
Isaac Connor
|
93b0552ed7
|
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
|
2020-06-23 22:18:45 -04:00 |
|
Isaac Connor
|
728f41fe9c
|
Log @debug when a linked monitor is disconnected. Use ZM_MAX_RESTART_DELAY instead of hard coded 60 seconds before next reconnect attempt
|
2020-06-23 16:56:35 -04:00 |
|
Isaac Connor
|
31a3be5c8e
|
check shared_data->valid when checking if LinkedMonitor is connected
|
2020-06-23 15:05:17 -04:00 |
|
Isaac Connor
|
e618966e08
|
spacing, improve error message when can't connect.
|
2020-06-23 10:23:17 -04:00 |
|
Isaac Connor
|
9b4a753194
|
deprecate ubuntu disco
|
2020-06-09 14:20:35 -04:00 |
|
Isaac Connor
|
402ab9ad9f
|
Bump version to 1.34.16 for release
|
2020-06-05 16:38:20 -04:00 |
|
Isaac Connor
|
910d4b51c9
|
Escape table names for mysql-8
|
2020-06-04 11:44:59 -04:00 |
|
Isaac Connor
|
20e6a1f53d
|
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
|
2020-06-04 11:37:44 -04:00 |