008624451f
Merge pull request #1856 from connortechnology/remove_BOM
...
use dos2unix to remove BOM
2017-04-17 08:32:17 -05:00
24c50ea7bd
Merge pull request #1832 from mastertheknife/cmake_pod2man_outofsource
...
Fix out-of-source building failing because pod2man
2017-04-17 07:45:42 -05:00
cea31f205a
Update zoneminder.tmpfiles.in
...
remove cake cache folders from tmpfiles.d since we changed the cake cache engine to apc
2017-04-16 20:44:41 -05:00
5e0012569f
use dos2unix to remove BOM
2017-04-16 09:22:37 -04:00
71e6735b60
Neon32 functions now work on 64 bytes at a time. This results in 4-6x performance increase over standard functions
...
Memory allocations and image size requirements changed to be as needed for 64 byte alignment.
Self-test code for Blend modified accordingly and added Self-test for the delta functions.
2017-04-16 10:57:37 +03:00
f10d3f10a0
packpack - add full path to deply_rsa.enc
2017-04-15 09:36:53 -05:00
3b1ef579d5
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-04-15 09:24:45 -05:00
4240f03f4e
rpm readmefile changes
2017-04-15 09:23:28 -05:00
0efca38d68
Merge pull request #1854 from knnniggett/caketmp
...
make cake tmp = zoneminder tmp
2017-04-15 10:23:03 -04:00
432a38720a
Merge pull request #1788 from knnniggett/travis_test1
...
packpack nightly builds
2017-04-15 10:21:42 -04:00
7e9b9944ae
rpmspecfile changes to reflect recent commits
2017-04-15 08:51:59 -05:00
65f96df477
Merge pull request #1791 from dwalkes/FI8908ControlAdd
...
Additional controls for FI8908W cameras
2017-04-15 07:23:29 -05:00
8c298b96d0
Merge pull request #1820 from SteveGilvarry/Remove_arg_r
...
Remove zmc -r argument as it does not seem to be implemented.
2017-04-15 07:17:56 -05:00
ab4b5e6b69
Merge pull request #1853 from knnniggett/cakecache
...
change cake cache engine from File -> Apc
2017-04-14 21:10:23 -04:00
5dd4359b80
Merge pull request #1852 from knnniggett/cakelog
...
move cake log to zoneminder log folder
2017-04-14 21:09:50 -04:00
0b729cf295
modify cmakelists.txt
2017-04-14 15:15:29 -05:00
d2490cf7e3
make cake tmp = zoneminder tmp
2017-04-14 15:11:41 -05:00
48a73f7e78
change cache engine from File -> Apc
2017-04-14 14:31:42 -05:00
3cbd32cd41
move cake log to zoneminder log folder
2017-04-14 14:24:29 -05:00
48e2c5f6ec
Update redhat.rst
2017-04-14 12:40:32 -05:00
09d8d7e40f
Merge pull request #1851 from knnniggett/timestamponcapture
...
invert timestamp_on_capture condition
2017-04-14 11:05:04 -04:00
a6799a8aaa
remove unneeded files
2017-04-14 06:40:09 -05:00
6b0f587725
invert timestamp_on_capture condition
2017-04-13 15:51:50 -05:00
e28be26978
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-04-12 13:41:16 -04:00
6e7bd9311d
add the api tmp cache folders to the tmpfiles
2017-04-12 13:41:02 -04:00
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
5f6332f313
Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection
2017-03-30 20:35:31 +03: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
Andrew Bauer
Isaac Connor
Kfir Itzhak
Andy Bauer
Andrew Bauer
Isaac Connor
Eliot Kent Woodrich
Matthew Noorenberghe
Michael Schupikov