a0b0f0aa79
Merge pull request #1847 from ekwoodrich/patch-1
...
Suppress debug messages on ZM service start/restart
2017-04-07 13:26:04 -04:00
68ab2cb756
Merge pull request #1837 from DarkDeepBlue/fix-format-string-local-cam
...
zm_local_camera.cpp: Improve format strings
2017-04-06 08:54:20 -04:00
b4ac277ecb
Merge pull request #1846 from mnoorenberghe/docker_vhost
...
Use misc/apache.conf instead of utils/docker/apache-vhost in docker
2017-04-06 08:41:21 -04:00
c4ec2d7fab
Suppress debug messages on ZM service start/restart
...
The tests in the script General.pm that determine the format for superuser calls on the target environment may leak debug messages to STDOUT. This can be replicated on a Docker installation of Zoneminder lacking sudo. Starting the Zoneminder process will display an intimidating series of error messages that can safely be ignored by the user:
e.g.
'''
root@2bfdd23cc27a:~# service zoneminder start
Starting ZoneMinder: Can't exec "sudo": No such file or directory at /usr/share/perl5/ZoneMinder/General.pm line 1 10.
Use of uninitialized value $output in scalar chomp at /usr/share/perl5/ZoneMinder/General.pm line 119.
Use of uninitialized value $output in concatenation (.) or string at /usr/share/perl5/ZoneMinder/General.pm line 1 20.
success
'''
This patch redirects STDERR from the qx(...) calls to the debug message., And if the output of qx(...) is undefined, replaces it with any error in $! resulting from the qx(...) call.
2017-04-05 17:26:19 -07:00
b609b9ad4c
Merge pull request #1826 from connortechnology/uri_decode_in_zms
...
Uri decode in zms
2017-04-03 20:13:30 -05:00
a10d52a3e1
Merge pull request #1844 from connortechnology/fix_1812
...
fix Monitors filtering SQL
2017-04-03 20:06:39 -05:00
a1f0ec3ecf
Use misc/apache.conf instead of utils/docker/apache-vhost in docker
...
This avoids duplication and fixes a few things that were missing in the Docker version for modern Apache:
* AllowOverride All
* Require all granted
Deleted `ServerName @WEB_HOST@` since `WEB_HOST` was never defined in ZM code so it would give an Apache error.
2017-04-02 21:54:49 -07:00
8555b07f95
Update redhat.rst
...
update rpm building instructions to reflect latest changes
2017-04-01 08:26:27 -05:00
a40de3b588
Update redhat.rst
...
better way to create a tarball from a local git repo
2017-04-01 08:20:34 -05:00
cd1b09d977
Update zoneminder.spec
...
use rpm macros
2017-03-31 20:35:24 -05:00
716a25fc1f
rpmspecfile - ensure cache folders are created during install
2017-03-31 20:17:05 -05:00
7068efd581
rpmspecfile - modify tarball handling
2017-03-30 18:31:58 -05:00
9a2c31d2c0
bump rpmspecfile to 1.30.2 release
2017-03-30 18:20:41 -05:00
3405a540a4
Merge pull request #1843 from connortechnology/fix_1842
...
Test for Controllable as well as ControlId
2017-03-30 13:43:06 -05:00
d3f6ab3d29
fix Monitors filtering SQL
2017-03-30 13:06:54 -04:00
7e3b27a130
Test for Controllable as well as ControlId
2017-03-30 10:49:02 -04:00
538658403c
Merge pull request #1822 from knnniggett/csrf
...
Implement CSRF Mitigation
2017-03-30 10:39:55 -04:00
e46f64125e
Update zoneminder.tmpfiles.in
...
With cakephp debug mode off, we must ensure cake's tmp folders are created
2017-03-29 13:28:15 -05:00
96b14bd646
Merge pull request #1836 from connortechnology/fix_x10
...
fix inserting x10 record with missing comma
2017-03-29 08:01:28 -05:00
fe5fe63254
Update zoneminder.service.in
...
This was a typo. Quotes are not needed.
2017-03-29 07:53:15 -05:00
184eb507a7
zm_local_camera.cpp: Improve format strings
...
This avoids printing '0x0' as char and hence terminating the output too
early.
2017-03-29 12:45:44 +02:00
589b369109
fix inserting x10 record with missing ,
2017-03-28 20:03:46 -04:00
eb55a6bb9b
set action,view, and/or request to NULL if there are not defined
2017-03-28 17:52:31 -05:00
4e16ae6d19
add ZM_ENABLE_CSRF_MAGIC toggle
2017-03-28 17:29:36 -05:00
c69b37c4ac
Merge pull request #1835 from connortechnology/setup_api_cache_dirs
...
Setup api cache dirs
2017-03-24 12:35:49 -05:00
7c86bcdfce
add the link from /usr/share/zoneminder/www/api/app/tmp to /var/tmp
2017-03-24 11:52:55 -04:00
f082183fd6
add the cache directories used by cake php under /var/tmp
2017-03-24 11:52:29 -04:00
a43adc241f
fix incorrect gpl license mailing address
2017-03-22 07:03:53 -05:00
eaca58bb7c
Merge pull request #1815 from mnoorenberghe/postlogin
...
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
676f92d3f1
Merge pull request #1828 from mnoorenberghe/api_user_enabled
...
Fix check that API user is enabled
2017-03-20 21:09:14 -04:00
ea558c79a0
Fix check that API user is enabled
2017-03-20 17:16:24 -07:00
b1d5fbef0b
revert an unintended change
2017-03-20 13:19:50 -04:00
badbf1c74c
Merge pull request #1816 from mnoorenberghe/flat_window_sizes
...
Increase default window sizes for the flat theme. Fixes #1059
2017-03-20 13:10:13 -04:00
9f30ccfa75
Use new UriDecode function to decode username and password
2017-03-20 11:16:39 -04:00
3b15ba91d1
Rough in a CURL based UriDecode
2017-03-20 11:16:21 -04:00
7bb0d12a4f
Merge pull request #1819 from ZoneMinder/Copyright_patch1
...
Fix failure to attribute previous work
2017-03-20 09:17:03 -05:00
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
d38bae72ae
integrate csrf-magic library
2017-03-18 20:12:06 -05:00
3a69238381
Fix failure to attribute previous work
...
Just fixing this up as there is a issue logged from Debian for it.
2017-03-18 23:05:32 +11:00
91ad6afffb
Increase default window sizes for the flat theme. Fixes #1059
...
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
ea5342abd2
Properly escape postLoginQuery. Fixes #1797
2017-03-17 21:05:28 -07:00
c24853ad11
Merge pull request #1806 from adam900710/compile_fix
...
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
2017-03-17 09:42:15 -04:00
0d4acb9bc8
Merge pull request #1811 from connortechnology/fix_crash_with_invalid_zones
...
Fix zmc crashing when zones are no good
2017-03-16 14:51:42 -05:00
6a447194eb
Fix zmc crashing when zones are no good bby decreasing n_zone before continuing
2017-03-16 10:55:13 -04:00
9681a444b4
Merge pull request #1765 from SteveGilvarry/ffmpeg_url
...
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
7e0ac4b239
Merge pull request #1780 from connortechnology/fix_1775
...
use escapeshellarg on inputs to daemonControl and other functions
2017-03-16 09:27:04 -05:00
0b9853e1d4
ZoneMinder: Rename public enum CHAR_WIDTH/CHAR_HEIGHT to avoid conflicts
...
CHAR_WIDTH is defined by limits.h, and class Image redefines it to 6,
which causes gcc6, clang, gcc5 to complain about it.
Fix by adding ZM_ prefix to CHAR_WIDTH and CHAR_HEIGHT, so it can be
compiled.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
2017-03-12 22:00:46 +08:00
2686946ce9
Merge pull request #1800 from knnniggett/fix_deb_zm.conf_perms
...
fix permissions on zm.conf in deb pkg scripts
2017-03-05 13:32:48 -05:00
f66408b998
update the path to zm.conf
2017-03-05 10:50:09 -06:00
cfeb12fc73
fix permissions on zm.conf in deb pkg scripts
2017-03-05 10:37:44 -06:00
Isaac Connor
Eliot Kent Woodrich
Andrew Bauer
Matthew Noorenberghe
Isaac Connor
Michael Schupikov
Andy Bauer
Andrew Bauer
Steve Gilvarry
Qu Wenruo