Isaac Connor
|
5e4676c660
|
Add Debian buster instructions. Update other debian dists to reference 1.34.
|
2020-07-14 11:31:10 -04:00 |
Isaac Connor
|
9b05337e57
|
Priming capture logs should be debug level, especially if they ar egoing to log passwords
|
2020-07-13 15:03:04 -04:00 |
|
Isaac Connor
|
926c3b8d34
|
Isaac added these explicit zmc~_heartbeat and zma_heartbeat entries.
|
2020-07-13 14:53:03 -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 |
Romain ODDONE
|
785ab58a80
|
make events table (events view) responsive
|
2020-07-13 11:33:26 +02:00 |
|
Isaac Connor
|
a747cd70d4
|
Use /run/zm instead of /var/run/zm
|
2020-07-11 10:44:28 -04:00 |
|
Isaac Connor
|
973450425d
|
Use /run/zm instead of /var/run/zm
|
2020-07-11 10:44:06 -04:00 |
|
Isaac Connor
|
ba8ab85411
|
Merge pull request #2975 from LocutusOfBorg/master
Quote some more MySQL8 Reserved keywords
|
2020-07-11 10:39:13 -04:00 |
Joseph Yasi
|
cc93d553d8
|
Quote some more MySQL8 Reserved keywords
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
|
2020-07-10 23:11:59 +02:00 |
|
Isaac Connor
|
b53b666442
|
Increase time limits on stalebot
|
2020-07-10 09:49:44 -04:00 |
Andrew Bauer
|
cfd57a851f
|
fix eslint
|
2020-07-08 20:53:12 -05:00 |
Isaac Connor
|
cd707571e7
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-07-08 17:22:32 -04:00 |
|
Isaac Connor
|
a469fdef9a
|
include the non-existent path in the warning
|
2020-07-08 17:21:59 -04:00 |
|
Isaac Connor
|
e5afc1a2db
|
Cleanup code that sets digest credentials. Fixes #2972
|
2020-07-08 17:20:52 -04:00 |
|
Isaac Connor
|
880219bb0f
|
Merge branch 'release-1.34'
|
2020-07-07 18:58:32 -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
|
e675c8373e
|
Merge branch 'release-1.34'
|
2020-07-07 16:15:56 -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
|
209cbe1000
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-07 09:23:46 -04:00 |
|
Isaac Connor
|
b0f87eabc2
|
comment out hexdump stuff to remove the dependency
|
2020-07-07 09:23:32 -04:00 |
|
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 |