Commit Graph

855 Commits

Author SHA1 Message Date
dreaddy ced0240fc3 Use the ssmtp path set in options first. shell command if ssmtp path empty. display debug suggesting set ssmtp path in option. 2015-11-06 10:43:30 -05:00
dreaddy 35617a6cf7 #1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter 2015-11-02 22:16:10 -05:00
Kyle Johnson 1cce60f6ec Update version check URL 2015-10-23 11:45:32 -06:00
Isaac Connor 79d8e4b74f Merge branch 'master' into fix_zmaudit 2015-10-06 09:30:32 -04:00
Isaac Connor 4a506368dc Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field 2015-10-06 09:30:10 -04:00
Pliable Pixels e0e048fe7e fixed version compare logic 2015-10-04 09:10:05 -04:00
Bobby Billingsley 4eb4bdbfb5 Added control script for SunEyes SP-P1802SWPTZ
(http://www.amazon.com/SunEyes-SP-P1802SWPTZ-Wireless-Camera-1080P/dp/B00MOTBXK6)
2015-09-30 13:39:50 +02:00
Isaac Connor d754239a51 add debug statements for when LastWriteTime is not defined. 2015-09-24 09:57:58 -04:00
Isaac Connor 204f2b1e22 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-10 13:20:06 -04:00
Isaac Connor 31ad75dea9 only add -h hostname to mysql command if it is defined. This helps support local unix-socket mysql access 2015-09-10 13:04:52 -04:00
Pliable Pixels 73fa051ef8 Google recaptcha 2015-08-29 13:29:52 -04:00
Pliable Pixels b4e9a0f0cf whitespacing 2015-08-26 12:08:10 -04:00
Pliable Pixels 46bd7b492b adds sanity checks to isActive and default states 2015-08-26 11:20:58 -04:00
Andrew Bauer 10adae3696 Merge pull request #941 from ZoneMinder/trigger_on_space
add space instead of + to handle old Axis cameras
2015-07-16 13:09:36 -05:00
Isaac Connor ad23969982 add space instead of + to handle old Axis cameras 2015-07-16 13:06:15 -04:00
Dmitry Smirnov c788d70b93 zmtrigger: POD documentation
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
Andrew Bauer 4e5ca2cead Merge pull request #937 from ZoneMinder/better_logging
improve log
2015-07-15 15:21:08 -05:00
Andrew Bauer 104f375669 Merge pull request #936 from ZoneMinder/handle_serial_trigger_problem
add error handling on failure to open serial port
2015-07-15 15:20:56 -05:00
Isaac Connor 01518d6aa9 fix. without this zmc won't restart automatically 2015-07-15 16:08:02 -04:00
Isaac Connor e4b3344a8c improve log 2015-07-15 16:06:55 -04:00
Isaac Connor cf3f160783 add error handling on failure to open serial port 2015-07-15 16:02:02 -04:00
Isaac Connor 4630bad24b add http to control url if it isn't present 2015-07-15 15:59:21 -04:00
Andy Bauer 561bf43721 fix pod2man generation for out-of-source builds 2015-07-09 19:33:06 -05:00
Isaac Connor 58448adb51 Merge pull request #896 from knnniggett/pod2man
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
Andy Bauer 1aebbec4e8 Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
Conflicts:
	db/zm_create.sql.in
	db/zm_update-1.28.99.sql
2015-06-27 16:32:32 -05:00
Andrew Bauer b867ee4c4c Merge pull request #891 from ZoneMinder/zmwatch_cleanup2
Zmwatch cleanup2
2015-06-23 08:36:42 -05:00
Andrew Bauer 30c7ab697c Merge pull request #847 from ZoneMinder/faster_shutdown
faster shutdown
2015-06-23 08:19:25 -05:00
Isaac Connor e4106e34a1 put back build replacements, don't know how I lost those 2015-06-22 13:56:27 -04:00
Andrew Bauer 91e7281695 Merge pull request #890 from ZoneMinder/zmwatch_cleanup1
reverse the if statement to reduce indenting
2015-06-22 12:53:06 -05:00
Isaac Connor 612e96bbfe fix problem causing processes to not be restarted. Also, tabs to spaces 2015-06-22 13:37:26 -04:00
Pliable Pixels e758d9bf7c Modified to handle setting isActive for custom states 2015-06-21 09:30:46 -04:00
Andrew Bauer fa835359a1 Add install target for C binary man pages 2015-06-20 17:33:13 -05:00
Andrew Bauer 13b9921680 Modify zmsystemctl pod documentation 2015-06-20 16:13:40 -05:00
Andrew Bauer fd239f6545 Generate man pages for perl scripts in the bin folder 2015-06-20 15:22:11 -05:00
Pliable Pixels f8cc27e224 Protocol for 8918W 2015-06-19 15:45:50 -04:00
Pliable Pixels 991291ce67 declared so perl does not complain of globals 2015-06-19 14:12:08 -04:00
Pliable Pixels 39ee845ff0 Updated 9831W foscam script 2015-06-19 12:58:40 -04:00
Isaac Connor 1f87a696cf improve debugging for analysis check and restart if can't read shared data 2015-06-19 11:07:20 -04:00
Isaac Connor 3be4a0aa11 re-enable restarting capture process if mem invalid 2015-06-19 09:04:19 -04:00
Isaac Connor a9175705c1 reverse the if statement to reduce indenting 2015-06-19 08:59:49 -04:00
Isaac Connor f6a226e700 Correct bareword config entries with newer {} style 2015-05-27 10:00:24 -04:00
Isaac Connor 47192156cd alter shutdown behaviour to send a term signal to all processes and then go through again to send a KILL if neccessary. This eliminates unneccesary sleeping. 2015-05-21 15:37:08 -04:00
Andrew Bauer d509861f9e Merge pull request #838 from ZoneMinder/zmaudit_update1
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
Rick Sayre 8c7e633d8f Undo ZM_VERSION changes 2015-05-18 21:55:00 -07:00
Rick Sayre ffe46978d2 Undid PATH change, needed for mysqldump; which I see is indeed called
many other places with incorrect paths.
Make macros should be setting all this up correctly!
mysqldump is [for example] in /opt/local/bin, not /usr/bin, with pkgin
2015-05-18 21:49:08 -07:00
Rick Sayre fb5c1abc87 Undid ZM_VERSION hacks 2015-05-18 21:44:41 -07:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Isaac Connor 8eb5e53aad Remove with {ZM_PATH_SWAP} 2015-05-14 10:27:11 -04:00
Isaac Connor 3709ac411d Not having ZM_AUDIT_MIN_AGE should be fatal 2015-05-13 12:36:35 -04:00
Isaac Connor 950cd06535 Revert "Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting""
This reverts commit 9c73b7247c.
2015-05-13 11:38:55 -04:00