Isaac Connor
|
acf8a30434
|
Merge branch 'release-1.34'
|
2020-07-07 09:22:56 -04:00 |
Isaac Connor
|
533876f313
|
rewrite code to use fewer lines. No logic change.
|
2020-07-07 09:16:42 -04:00 |
Andrew Bauer
|
d0eb00474c
|
fix typo in rpm specfile
|
2020-07-07 07:39:44 -05:00 |
Isaac Connor
|
516255b85e
|
Merge pull request #2974 from knight-of-ni/create_analysis_images
remove global config item CREATE_ANALYSIS_IMAGES
|
2020-07-06 21:24:34 -04:00 |
Andrew Bauer
|
5e4c189a3d
|
Update zoneminder.spec
Account for new zmonvif-zmtrigger.pl in rpm specfile
|
2020-07-06 12:34:10 -05:00 |
Andrew Bauer
|
dcab218a2e
|
remove global config item CREATE_ANALYSIS_IMAGES
|
2020-07-06 12:22:41 -05: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
|
2eac69dd88
|
fix duplicate extrapad names
|
2020-07-04 17:16:43 -04:00 |
Isaac Connor
|
2db65d3821
|
Merge branch 'release-1.34'
|
2020-07-04 09:09:24 -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
|
d6d70ab06d
|
Put a list of cameras to cycle through on the left
|
2020-07-04 09:04:26 -04:00 |
Isaac Connor
|
db5370024a
|
implement moveMap and moveRel. Please note that many cameras do not implement these functions and may even report that they do implement them and then silently do nothing when you use them. So YMMV
|
2020-07-04 09:02:01 -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
|
3ecbd8c73e
|
Merge pull request #2971 from pwnbus/fix_auth_type_text
Fix typo in AUTH_TYPE help text
|
2020-06-27 09:30:40 -04:00 |
Brandon Myers
|
ce4e04cd0b
|
Fix typo in AUTH_TYPE help text
|
2020-06-27 00:23:05 -05: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
|
0a383c02c4
|
Better debugging of REQUEST/POST vars
|
2020-06-23 22:20:07 -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
|
7354b4d30f
|
Fix compile on old ffmpeg
|
2020-06-23 14:43:11 -04:00 |
Isaac Connor
|
e618966e08
|
spacing, improve error message when can't connect.
|
2020-06-23 10:23:17 -04:00 |
Isaac Connor
|
a15aace2fb
|
introduce shared_data->zmc_heartbeat_time and zma_heartbeat_time.
|
2020-06-22 10:40:00 -04:00 |
Isaac Connor
|
4d020bab56
|
spacing
|
2020-06-22 10:39:29 -04:00 |
Isaac Connor
|
f73cb3bebe
|
Don't start filter if the command was execute
|
2020-06-17 13:36:28 -04:00 |
Isaac Connor
|
e68bf13a6b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-17 12:50:42 -04:00 |
Isaac Connor
|
d3c474fc8b
|
use translate on Show/Hide Zones
|
2020-06-17 12:50:36 -04:00 |
Isaac Connor
|
8efe00157d
|
add a User object
|
2020-06-17 12:50:22 -04:00 |
Isaac Connor
|
1a838b1137
|
Merge pull request #2964 from roddone/stream-zoom-accuracy
apply stream scale in zoom coordinates
|
2020-06-17 09:30:52 -04:00 |
Romain ODDONE
|
dcb77cdaea
|
apply stream scale in zoom coordinates
|
2020-06-17 14:46:10 +02:00 |
Isaac Connor
|
aba403e3f2
|
Correct handling of Transport in onvif results
|
2020-06-16 16:48:17 -04:00 |