Isaac Connor
|
5ee086bbfe
|
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
|
2020-08-10 12:25:44 -04:00 |
|
Isaac Connor
|
06a521e30e
|
populate ZM_PATH_SHUTDOWN
|
2020-08-10 12:02:42 -04:00 |
|
Isaac Connor
|
e64e786c5b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-09 22:20:08 -04:00 |
|
Isaac Connor
|
f04e1a0ba7
|
Apply min=0 to filterX and Y so that we don't get negative values
|
2020-08-09 22:20:06 -04:00 |
|
Isaac Connor
|
ec707acdd1
|
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
|
2020-08-09 22:19:43 -04:00 |
|
Isaac Connor
|
25426d5fdd
|
Don't add 442 for https and 80 for http. Just cleaner
|
2020-08-09 22:18:35 -04:00 |
|
Isaac Connor
|
b4a3ccdfed
|
only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport.
|
2020-08-09 22:18:07 -04:00 |
Andrew Bauer
|
42fe024681
|
Update skin.js
|
2020-08-09 17:43:39 -05:00 |
|
Andrew Bauer
|
9a03a2c7d4
|
Update skin.js
|
2020-08-09 17:43:07 -05:00 |
|
Andrew Bauer
|
15005a2f17
|
fix typo
|
2020-08-09 14:25:11 -05:00 |
|
Andrew Bauer
|
d0e7443a3c
|
rough in update reminder dropdown
|
2020-08-09 14:18:44 -05:00 |
|
Andrew Bauer
|
b22f12dadb
|
rough in new zmversion widget
|
2020-08-09 12:20:11 -05:00 |
|
Isaac Connor
|
6c831be61f
|
remove extra ,
|
2020-08-08 14:27:37 -04:00 |
|
Andrew Bauer
|
a6ae4aee01
|
eslint nanny
|
2020-08-08 12:26:42 -05:00 |
|
Andrew Bauer
|
dd757d3e27
|
move eslint check to the top
let's us see the results quicker
|
2020-08-08 12:13:05 -05:00 |
|
Andrew Bauer
|
fd4b9ba4f4
|
move jquery in functions.php to skin.js
|
2020-08-08 12:06:57 -05:00 |
|
Andrew Bauer
|
b626e0de1c
|
eslint nanny strikes again
|
2020-08-08 11:19:29 -05:00 |
|
Isaac Connor
|
a001c93321
|
fix zone editing globals and inputs being too big
|
2020-08-08 11:41:24 -04:00 |
|
Andrew Bauer
|
96bd6397c6
|
eslint nanny
|
2020-08-08 10:38:58 -05:00 |
|
Isaac Connor
|
8533ce7018
|
fix CSP on polygons
|
2020-08-08 11:38:54 -04:00 |
|
Isaac Connor
|
82357a0675
|
reapply click function to bandwidth dropdown entries after getNavBar
|
2020-08-08 11:17:26 -04:00 |
|
Andrew Bauer
|
3792043707
|
implement bw widget as dropdown
|
2020-08-08 10:07:26 -05:00 |
|
Isaac Connor
|
bf2cb5fb1f
|
Add PrimeCapture to zm_remote_camera_http. PrimeCapture is used to determine if we can connect and so by not implementing it, monitors like this say capturing even though they are not.
|
2020-08-08 10:21:06 -04:00 |
|
Isaac Connor
|
ec7f6034fa
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-08 09:58:23 -04:00 |
|
Isaac Connor
|
bf7aa3f5c2
|
this version of set_cookie_params was introduced in 7.3. So put back code for previous versions of php which unfortunately do not support the samesite parameter. Fixes #3009
|
2020-08-08 09:58:18 -04:00 |
|
Andrew Bauer
|
98f315951e
|
Merge pull request #3003 from marillat/patch-1
Don't prefix manpage with zoneminder-
|
2020-08-07 12:34:30 -07:00 |
|
Andrew Bauer
|
ef37d9441d
|
remove i386 builds
|
2020-08-07 14:29:37 -05:00 |
|
Andrew Bauer
|
f43003a98b
|
need epel-rpm-macros on rhel for new cmake macros
|
2020-08-07 13:44:20 -05:00 |
|
Andrew Bauer
|
7d14f2a727
|
Update .travis.yml
|
2020-08-07 10:55:15 -05:00 |
|
Isaac Connor
|
0d8e5aa2be
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-07 09:53:50 -04:00 |
|
Isaac Connor
|
da757d075b
|
Only save the DiskSpace on completed events. Fixes #3007
|
2020-08-07 09:53:35 -04:00 |
|
Isaac Connor
|
eff96c5fa3
|
Only save the DiskSpace on completed events. Fixes #3007
|
2020-08-07 09:53:15 -04:00 |
dmo
|
ed496e74fc
|
Update CMakeLists.txt
|
2020-08-07 07:54:58 +02:00 |
|
Andrew Bauer
|
10a4929f75
|
disable LTO on redhat builds
|
2020-08-06 14:36:54 -05:00 |
|
Isaac Connor
|
5a34bb4571
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-06 12:25:00 -04:00 |
|
Isaac Connor
|
fc5fabf1c5
|
fix zone editing globals and inputs being too big
|
2020-08-06 12:24:51 -04:00 |
|
Isaac Connor
|
a19990f4d7
|
Merge branch 'release-1.34'
|
2020-08-06 11:57:35 -04:00 |
|
Andrew Bauer
|
fce0dc86c1
|
remove f30 support, add f32
|
2020-08-06 09:51:27 -05:00 |
|
Isaac Connor
|
6b9ffb505d
|
Bump version to 1.34.18 for Rrelease
|
2020-08-06 10:38:39 -04:00 |
|
Isaac Connor
|
3242ce6ec9
|
Handle backticks in matches sort fields. Fixes regression in 1.34.17
|
2020-08-06 10:37:56 -04:00 |
|
Isaac Connor
|
302189a65e
|
Don't use camera->LineSize when allocating shared images. It doesn't work because other processes don't know about it.
|
2020-08-06 10:11:00 -04:00 |
|
Isaac Connor
|
ef2ad12846
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-05 20:00:45 -04:00 |
|
Isaac Connor
|
ddeef6f031
|
Fix globals and a Fatal without ZM\ prefix
|
2020-08-05 20:00:39 -04:00 |
|
Isaac Connor
|
cc9413b44b
|
replace python=sphinx with sphinx-doc in depends for ubuntu 2004
|
2020-08-05 20:00:25 -04:00 |
Isaac Connor
|
4d4fab46d6
|
Spacing, use FFMpegInit instead of deprecated ffmpeg calls
|
2020-08-05 19:17:00 -04:00 |
|
Isaac Connor
|
76e0d155d3
|
declare globals
|
2020-08-05 19:15:01 -04:00 |
|
dmo
|
c102c35c42
|
Don't prefix manpage with zoneminder-
|
2020-08-05 23:56:30 +02:00 |
|
Isaac Connor
|
b6463c6917
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-08-05 11:33:28 -04:00 |
|
Isaac Connor
|
b867d0c463
|
Fix image copy when line sizes are not the same.
|
2020-08-05 11:33:22 -04:00 |
|
Andrew Bauer
|
3ba8ad579e
|
fix pod2man out-of-source builds
|
2020-08-04 21:18:37 -05:00 |