Isaac Connor
|
663cc6df87
|
improve logging of zmfilter
|
2017-10-27 09:09:12 -07:00 |
|
Isaac Connor
|
82fbec697f
|
add IS and IS NOT as filter operators so that we can do IS NULL and IS NOT NULL because = NULL and !=NULL are not valid
|
2017-10-27 08:37:53 -07:00 |
|
Isaac Connor
|
e27b95c820
|
make zmfilter update DiskSPace. ALso rename DiskUsage in Event to DiskSpace
|
2017-10-27 08:05:35 -07:00 |
|
Isaac Connor
|
653d213d62
|
Add EndTime and DiskSpace to Filters
|
2017-10-25 11:11:19 -07:00 |
Isaac Connor
|
c75215ad29
|
fix merge problems
|
2017-06-09 09:13:30 -04:00 |
|
Isaac Connor
|
451714a403
|
Merge branch 'master' into storageareas
|
2017-06-04 21:42:56 -04:00 |
|
Isaac Connor
|
07704dd5d6
|
coments
|
2017-06-04 17:30:39 -04:00 |
|
Isaac Connor
|
b6b4738b9f
|
fix quotes
|
2017-06-02 12:31:54 -04:00 |
|
Isaac Connor
|
71b9ca97c6
|
no need to store filters as an array ref
|
2017-06-02 12:25:26 -04:00 |
|
Isaac Connor
|
5228b9d008
|
move command line option parsing up, so if we are just getting the version we exit quick before doing a bunch of other things.
|
2017-06-02 11:54:40 -04:00 |
|
Isaac Connor
|
be5b93a64e
|
whitespace, braces, quotes
|
2017-06-02 11:39:35 -04:00 |
|
Isaac Connor
|
f4224bb88e
|
Merge branch 'master' into storageareas
|
2017-05-17 17:47:39 -04:00 |
Vladimir Poluyaktov
|
2c9d21f59f
|
1768 fix email tokens for h264 storage (#1814)
* 1768-Fix-email-tokens-for-h264-storage Snapshot extraction impmemented
* 1768-Fix-email-tokens-for-h264-storage: Video file path fixed
* 1768-Fix-email-tokens-for-h264-storage: vframes 1 option added
* 1768-Fix-email-tokens-for-h264-storage: generateImage sub created
* 1768-Fix-email-tokens-for-h264-storage: Few typos fixed
* 1768-Fix-email-tokens-for-h264-storage: Code refactoring. EI1A and EIMA macros added
|
2017-05-16 13:04:42 -04:00 |
|
Isaac Connor
|
fd44ff4e60
|
Merge branch 'master' into storageareas
|
2017-05-10 13:16:08 -04:00 |
Isaac Connor
|
de24ba7120
|
Merge pull request #1779 from vajonam/1778-add-subtituteTags-for-exec
add the ability to add substitued tags to the commandline
|
2017-05-10 09:00:36 -04:00 |
|
Isaac Connor
|
c2461f93cd
|
google code style and a better debug message
|
2017-03-20 16:47:58 -04:00 |
Manojav Sridhar
|
7c765b5516
|
added feature to allow %tags% in arguments of exec command
|
2017-02-15 09:37:45 -05:00 |
|
Isaac Connor
|
d135216ac7
|
Merge branch 'master' into storageareas
|
2017-02-15 09:30:35 -05:00 |
|
Manojav Sridhar
|
f0b2910647
|
fix typo for correct checking if a command has excuted for an event, prevents execution on every filter run
|
2017-02-15 08:10:50 -05:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
4b3ac63a68
|
merge master, deprecate qqq()
|
2016-11-08 11:30:44 -05:00 |
|
Andrew Bauer
|
29e48da3b9
|
fix sftp xfers in zmfilter (#1677)
|
2016-11-07 16:08:43 -05:00 |
mdrush
|
69a71b1a37
|
cleaned up logic
|
2016-08-27 16:16:01 -07:00 |
|
mdrush
|
16a9de3b1b
|
added missing brackets
|
2016-08-27 15:39:04 -07:00 |
|
mdrush
|
2d161924c0
|
changed error message to debug message
|
2016-08-27 15:34:10 -07:00 |
|
mdrush
|
52255e594e
|
improved style, added fallback when ssmtp can't be found
|
2016-08-27 15:18:00 -07:00 |
|
mdrush
|
574390730a
|
added missing ssmtp support in sendMessage
|
2016-08-27 13:10:39 -07:00 |
|
Isaac Connor
|
85c0377280
|
When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it
|
2016-07-12 14:21:54 -04:00 |
|
Isaac Connor
|
2b4bad86cb
|
Merge branch 'master' into storageareas
|
2016-09-13 10:21:10 -04:00 |
|
Isaac Connor
|
8eac8a1e1a
|
Merge branch 'master' into storageareas
|
2016-07-13 09:50:30 -04:00 |
Steve Gilvarry
|
6bf43631e2
|
Merge pull request #1428 from ZoneMinder/better_zmvideo
Better zmvideo
|
2016-04-28 22:00:52 +10:00 |
|
Isaac Connor
|
0adbaafd98
|
Merge branch 'master' into storageareas
|
2016-04-26 13:10:37 -04:00 |
Andrew Bauer
|
3a9ab7f685
|
Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option
|
2016-04-21 07:27:19 -05:00 |
|
Isaac Connor
|
67f38d07df
|
Merge branch 'master' into better_zmvideo
|
2016-04-20 12:04:15 -04:00 |
|
Isaac Connor
|
87088d95ac
|
change error to Warning... it is possible to not have any filters returned
|
2016-04-05 09:22:36 -04:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
|
Isaac Connor
|
d3558c5688
|
Merge pull request #1323 from knnniggett/zmfilter
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-21 10:47:50 -04:00 |
|
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04:00 |
Kyle Johnson
|
b9085cea64
|
Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
|
2016-03-11 14:28:16 -07:00 |
|
Andy Bauer
|
ab3c35c629
|
fix missing Net::SFTP::Foreign::debug warning
|
2016-03-04 17:21:32 -06:00 |
Isaac Connor
|
ddb377245e
|
fix error report
|
2016-02-10 13:29:55 -05:00 |
|
Isaac Connor
|
2cd21a07c0
|
use system() instead of backticks
|
2016-02-10 09:09:36 -05:00 |
|
Isaac Connor
|
1cb8a7ecf5
|
add missing -
|
2016-02-10 09:07:48 -05:00 |
|
Isaac Connor
|
2ca2b07a5e
|
detaint calls for concurrent zmfilter.pl
|
2016-02-05 13:14:04 -05:00 |
|
Isaac Connor
|
d7f350ac34
|
fix parm => name
|
2016-02-05 11:41:54 -05:00 |
|
Isaac Connor
|
009211ae1e
|
exec zmfilter concurrently if the flag is et
|
2016-02-05 11:24:40 -05:00 |
|
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
|
Andrew Bauer
|
748754a213
|
Merge pull request #1209 from adamreiser/StrictKeyChecking
Strict key checking
|
2016-02-04 10:07:19 -06:00 |
Adam Reiser
|
28bf4dfe7b
|
Add option for strict host key checking
|
2015-12-29 16:34:11 -08:00 |