ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,097 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

3097 Commits

Author SHA1 Message Date
Isaac Connor 969918781f more updates, currently the log updates are not enough. Filtering does not work. 2013-11-13 10:11:16 -05:00
Isaac Connor a155082997 use parameter passing instead of esacping 2013-11-12 15:39:29 -05:00
Isaac Connor 7528f3d3c1 Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-11-08 11:22:30 -05:00
Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO 
Conflicts:
	zm.conf.in
 2013-11-08 11:22:09 -05:00
Isaac Connor e9c0509399 add rules for a dbg package 2013-11-08 11:09:23 -05:00
Isaac Connor a0c7b8d0fb add rules to build a dbg package 2013-11-08 11:06:31 -05:00
Kfir Itzhak 9979385c3b Remove the crashtrace option from configure.ac (autoconf) 2013-11-07 23:35:44 +02:00
Isaac Connor 03809cfa0f improve error reporting 2013-11-07 10:58:27 -05:00
Isaac Connor 4c6c415f02 fix: wrote dbCon instead of dbConn 2013-11-07 10:03:19 -05:00
Isaac Connor d87709528d fix assigning DB_TYPE 2013-11-06 17:47:23 -05:00
Isaac Connor f4dfd88d9f handle bad config lines better 2013-11-06 17:02:01 -05:00
Isaac Connor fe829e7a4b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-11-06 16:58:23 -05:00
Kyle Johnson 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
Will Scales 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
Kyle Johnson 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
Kfir Itzhak 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
Kfir Itzhak be21a882ab Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf 
Remove ZM_VERSION from zm.conf
 2013-11-04 12:27:50 -08:00
Kfir Itzhak 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
josephevans 7bbcc6ae39 Merge pull request #1 from mastertheknife/contentlengthfix 
Revert content_length to be int
 2013-11-04 11:43:13 -08:00
Isaac Connor 51455b5c85 more updates and removal of escaping and quoting 2013-11-04 12:43:34 -05:00
Isaac Connor f6bf3743f7 very sub-optimisation, removing duplicate comparisons 2013-11-04 10:50:40 -05:00
Isaac Connor 0fd7d857bf put back ZM_PATH_DATA 2013-11-04 10:06:39 -05:00
Isaac Connor 7a2f3b5226 add in missing @ 2013-11-04 09:57:00 -05:00
Kfir Itzhak 4e1d23669f Revert content_length to be int 2013-11-04 10:54:39 +02:00
Kfir Itzhak 9d5ac7ae8c Fix cmake installing wrong files in an out-of-source build 2013-11-04 09:56:40 +02:00
Isaac Connor 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
Isaac Connor 7989e8e980 Merge branch 'master' into mysql2PDO 2013-11-03 16:07:37 -05:00
Isaac Connor 2d0f4dffd1 Fix a missing NULL second paramter to dbFetchAll 2013-11-03 16:06:31 -05:00
Isaac Connor 1798a0a2fb Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2013-11-03 16:06:25 -05:00
Isaac Connor 69cbdf9fa2 Merge pull request #236 from knnniggett/mysql2PDO 
Re-Add ZM_PATH_DATA
 2013-11-03 13:06:04 -08:00
Isaac Connor 6c6da67427 Merge branch 'master' into mysql2PDO 2013-11-03 15:57:45 -05:00
Isaac Connor 3fa91a30a3 allow the value side of config lines potentially be empty. 2013-11-03 15:52:37 -05:00
Isaac Connor 59b841958d use parameter passing instead of explicit exscaping 2013-11-03 15:40:00 -05:00
Andrew Bauer 73845e0562 Re-Add ZM_PATH_DATA 2013-11-03 08:22:19 -06:00
David Nesting b368d306b9 Fix marker-out-of-bounds crash when defining zone points 2013-11-02 15:56:42 -07:00
Kfir Itzhak 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
Kfir Itzhak 846fce0cb7 Fixed out-of-source building not finding config.h 2013-11-02 23:44:50 +02:00
Joe Evans 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
Isaac Connor 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
Isaac Connor d428c832e7 blah 2013-11-01 09:50:50 -04:00
Isaac Connor 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
Kfir Itzhak 3c59961846 Merge branch 'cmake-outofsource' 2013-11-01 14:01:42 +02:00
Kfir Itzhak 21ae767aa7 Merge branch 'rotatefix' 2013-11-01 13:34:21 +02:00
Kfir Itzhak 069552321f Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation 2013-11-01 13:31:37 +02:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
Kyle Johnson 3b07d99510 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-10-30 09:20:37 -04:00
Kyle Johnson 36d94d160f Change zm_monitor.h mem_size from long to unsigned long. Fixes #226. 2013-10-30 09:18:13 -04:00
Kyle Johnson fd03d89ce5 Change mem_size in zm_monitor.h from long to unsigned long 2013-10-30 09:17:26 -04:00
Kyle Johnson 2c04690865 Allow larger shared memory sizes. Fixes #226 2013-10-30 08:39:24 -04:00
Kfir Itzhak 36f525efae Correctly hard code man dir path into cmake this time hopefully 2013-10-29 12:43:28 +02:00