463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
e9c0509399
add rules for a dbg package
2013-11-08 11:09:23 -05:00
a0c7b8d0fb
add rules to build a dbg package
2013-11-08 11:06:31 -05:00
9979385c3b
Remove the crashtrace option from configure.ac (autoconf)
2013-11-07 23:35:44 +02:00
03809cfa0f
improve error reporting
2013-11-07 10:58:27 -05:00
4c6c415f02
fix: wrote dbCon instead of dbConn
2013-11-07 10:03:19 -05:00
c08e4de42e
Added the database update file for 1.26.5 with includes the AlarmRefBlendPerc option
2013-11-07 16:29:02 +02:00
d87709528d
fix assigning DB_TYPE
2013-11-06 17:47:23 -05:00
f4dfd88d9f
handle bad config lines better
2013-11-06 17:02:01 -05:00
fe829e7a4b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-11-06 16:58:23 -05:00
5c369fffff
Merge pull request #246 from dtmf/patch-1
...
Add "After=" rule to prevent ZoneMinder from starting before mysqld (fedora)
2013-11-06 04:40:37 -08:00
82a3f4622f
Update zoneminder.service
...
Added "After=" rule to [unit] section to prevent Zoneminder from starting before mysqld.
2013-11-06 06:30:43 -06:00
2564512d86
Merge pull request #243 from ZoneMinder/zmconfcleanup
...
Delete PATH_BUILD and TIME_BUILD from zm.conf and fix ZM_DB_TYPE
2013-11-05 09:13:26 -08:00
90d7ce98f1
Delete PATH_BUILD and TIME_BUILD from zm.conf and setup default for
...
ZM_DB_TYPE
2013-11-04 22:38:21 +02:00
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
891757da74
Merge pull request #232 from josephevans/master
...
Cast content_length to signed int for error-check comparison
2013-11-04 11:59:44 -08:00
7bbcc6ae39
Merge pull request #1 from mastertheknife/contentlengthfix
...
Revert content_length to be int
2013-11-04 11:43:13 -08:00
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
f6bf3743f7
very sub-optimisation, removing duplicate comparisons
2013-11-04 10:50:40 -05:00
f73585dbaa
Few web interface corrections regarding cURL
2013-11-04 17:28:15 +02:00
c1970a51e3
Fix few errors and syntax errors regarding curl
2013-11-04 17:10:07 +02:00
0fd7d857bf
put back ZM_PATH_DATA
2013-11-04 10:06:39 -05:00
8944531f75
Added cURL checks to cmake
2013-11-04 16:57:22 +02:00
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05:00
a1cb1e6de2
bump version # for snapshot
2013-11-04 09:56:20 -05:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
fd656c55cf
Changed default blend percentages and the dropdown list for alarm reference image blend
2013-11-04 12:10:53 +02:00
4e1d23669f
Revert content_length to be int
2013-11-04 10:54:39 +02:00
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
4565068093
Merge pull request #233 from fastolfe/zone-marker-overflow
...
Fix marker-out-of-bounds crash when defining zone points
2013-11-03 13:10:07 -08:00
7989e8e980
Merge branch 'master' into mysql2PDO
2013-11-03 16:07:37 -05:00
2d0f4dffd1
Fix a missing NULL second paramter to dbFetchAll
2013-11-03 16:06:31 -05:00
1798a0a2fb
Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO
2013-11-03 16:06:25 -05:00
69cbdf9fa2
Merge pull request #236 from knnniggett/mysql2PDO
...
Re-Add ZM_PATH_DATA
2013-11-03 13:06:04 -08:00
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
Isaac Connor
Kfir Itzhak
Kyle Johnson
Will Scales
josephevans
Isaac Connor
Andrew Bauer
David Nesting