6c6da67427
Merge branch 'master' into mysql2PDO
2013-11-03 15:57:45 -05:00
3fa91a30a3
allow the value side of config lines potentially be empty.
2013-11-03 15:52:37 -05:00
7b585d182a
remove extra stuff that I don't think we need because we are the source.
...
Also unconditionally call zmupdate.pl since it should do all the checking of versions to see if anything needs doing.
We don't need to be doing that work in a postinst bash script.
2013-11-03 15:49:37 -05:00
59b841958d
use parameter passing instead of explicit exscaping
2013-11-03 15:40:00 -05:00
73845e0562
Re-Add ZM_PATH_DATA
2013-11-03 08:22:19 -06:00
833705b613
Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled
2013-11-03 10:26:04 +02:00
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
1d0e721ba2
Attempt to get the perl modules to be fully out of source during an out-of-source build
2013-11-03 00:20:49 +02:00
846fce0cb7
Fixed out-of-source building not finding config.h
2013-11-02 23:44:50 +02:00
550040474f
Cast content_length to signed int for error-check comparison, preventing segfault when attempting to read buffer.
2013-11-01 14:11:48 -07:00
93560652f1
make sortorder be asc or desc, not something arbitrary which needs to be escaped
...
other fixes to use parameter passing to PDO instead of escaping them ourselves
2013-11-01 12:30:07 -04:00
d428c832e7
blah
2013-11-01 09:50:50 -04:00
72b80d7417
remake this branch off master instead of off mysql2PDO.
...
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
3c59961846
Merge branch 'cmake-outofsource'
2013-11-01 14:01:42 +02:00
21ae767aa7
Merge branch 'rotatefix'
2013-11-01 13:34:21 +02:00
069552321f
Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation
2013-11-01 13:31:37 +02:00
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
3b07d99510
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-10-30 09:20:37 -04:00
36d94d160f
Change zm_monitor.h mem_size from long to unsigned long. Fixes #226 .
2013-10-30 09:18:13 -04:00
fd03d89ce5
Change mem_size in zm_monitor.h from long to unsigned long
2013-10-30 09:17:26 -04:00
2c04690865
Allow larger shared memory sizes. Fixes #226
2013-10-30 08:39:24 -04:00
36f525efae
Correctly hard code man dir path into cmake this time hopefully
2013-10-29 12:43:28 +02:00
910200c369
Merge branch 'cmakeperlfixes'
2013-10-29 11:24:38 +02:00
604b7f4ccc
Clean files generated by MakeMaker when running cmake's make clean target
2013-10-29 11:21:23 +02:00
23ec8266d9
Hard code man dir path into cmake to fix issues with some distros
2013-10-29 11:02:47 +02:00
234e742c10
Merge pull request #223 from fastolfe/batch-frame-inserts
...
Apply INSERTs in Event::AddFrames in batches to fix issue #222
2013-10-29 01:08:48 -07:00
0143969498
Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled
2013-10-29 10:01:29 +02:00
b743375dcf
Attempt to get travis working again by skipping whole system update
2013-10-29 09:15:24 +02:00
79c7a1b255
Apply INSERTs in Event::AddFrames in batches to avoid excessive query length
2013-10-26 18:41:12 -07:00
54512ff6b3
Fixed a mistake in the INSTALL file
2013-10-24 15:36:32 +03:00
c2477eb661
cmake text improvements
2013-10-21 17:13:07 +03:00
a341778ca2
Merge branch 'cmakefixes'
...
Conflicts:
distros/fedora/zoneminder.cmake.f19.spec
distros/redhat/zoneminder.cmake.el6.spec
2013-10-21 16:58:04 +03:00
f5f573af93
Added an uninstall target to cmake and few text corrections to the INSTALL file
2013-10-21 16:11:37 +03:00
c25a7ffc99
Update zoneminder.cmake.f19.spec
...
We need to strip the prefix from perl_vendorlib before passing it to cmake
2013-10-20 12:59:31 -05:00
183ce4b422
Update zoneminder.cmake.el6.spec
...
We need to strip the prefix from perl_vendorlib macro before passing it to cmake.
2013-10-20 12:44:09 -05:00
17f2736860
Merge pull request #218 from ZoneMinder/ffmpegfixes
...
ffmpeg detection improvements
2013-10-19 13:06:03 -07:00
cdd2920767
Merge pull request #217 from knnniggett/cmake_redhat
...
cmake support files for redhat/centos distros
2013-10-19 13:03:16 -07:00
eeca5928dd
Merge pull request #216 from knnniggett/cmake_targetdistro
...
Create ZM_TARGET_DISTRO option in cmake
2013-10-19 13:02:55 -07:00
9858c06a4f
Merge pull request #215 from knnniggett/cmake_nox10
...
Add ZM_NO_X10 cmake option to toggle x10 support
2013-10-19 13:02:14 -07:00
4c803299bc
Merge pull request #214 from knnniggett/cmake_fedora
...
Cmake support files for fedora distro
2013-10-19 13:01:12 -07:00
d544a92ccb
change chkconfig default
2013-10-19 13:54:25 -05:00
60962566a5
cmake support files for redhat/centos distros
2013-10-19 13:50:59 -05:00
72973ff7e7
Add new zoneminder cmake specfile
2013-10-19 12:14:43 -05:00
539c760d3c
Create ZM_TARGET_DISTRO
2013-10-19 09:38:58 -05:00
54a22e7fe8
We need a toggle for x10 support
2013-10-19 09:22:59 -05:00
b1c76ad0b6
Cmake support files for fedora distro
2013-10-19 08:49:47 -05:00
ae51ac5519
redo changes to use new dbFetch functions with parameter arrays
2013-10-18 14:24:08 -04:00
7fdb933d6b
rework dbQuery, dbFetchOne to take a parameters array, and use it
2013-10-18 14:15:24 -04:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
92591a6835
more removal of quotes
2013-10-17 17:05:50 -04:00
Isaac Connor
Andrew Bauer
Kfir Itzhak
David Nesting
Joe Evans
Kyle Johnson
Andy Bauer