Isaac Connor
eba6cec7a1
Merge branch 'master' into storageareas
2017-03-20 12:01:20 -04:00
Andrew Bauer
7bb0d12a4f
Merge pull request #1819 from ZoneMinder/Copyright_patch1
...
Fix failure to attribute previous work
2017-03-20 09:17:03 -05:00
Andrew Bauer
2dcd95bc7f
Merge pull request #1504 from ZoneMinder/improve_filter
...
Improve filter
2017-03-18 21:12:58 -05:00
Steve Gilvarry
3a69238381
Fix failure to attribute previous work
...
Just fixing this up as there is a issue logged from Debian for it.
2017-03-18 23:05:32 +11:00
Dan Walkes
aa1aeeeca4
Additional controls for FI8908W cameras
...
Mobile application ZM View uses relative move commands and presetGoto
commands which were not supported by the previous version of the script.
Add these commands based on documentation in
http://www.foscam.es/descarga/ipcam_cgi_sdk.pdf
Commands were tested on an FI8908W camera running version 11.37.2.65
firmware
2017-02-18 17:14:59 -07: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
7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
SteveGilvarry
2f3ebd80da
Remove zmf, die..die..die
2017-01-16 13:20:05 -08:00
Isaac Connor
052807aaf5
remove extra my
2017-01-15 10:57:39 -05:00
Isaac Connor
c79dfb6a16
fix typos
2017-01-15 10:56:57 -05:00
Isaac Connor
4973d8c74c
add support for connect options
2017-01-15 10:54:46 -05:00
Isaac Connor
d24d151f53
Slurp db update file in and do() it instead of calling mysql
2017-01-15 10:54:23 -05:00
Isaac Connor
ac32b001e9
use a real variable for the file handle so that it sticks around.
2017-01-12 13:05:39 -05:00
Isaac Connor
c97ecc2a38
remove debug line
2017-01-12 13:04:44 -05:00
Isaac Connor
a5cdfd2932
call loadMonitors at the beginning. Otherwise we may not know about a monitor while handling a message from it.
2017-01-12 13:03:53 -05:00
Isaac Connor
513cd68c20
remove the verified caching. It makes calling zmMemVerify useless.
2017-01-12 13:02:16 -05:00
Isaac Connor
ed5c3c4ed4
remove debug stautement
2017-01-12 12:58:09 -05:00
Isaac Connor
d9ce1a68c6
restore defaults
2017-01-12 12:56:55 -05:00
Isaac Connor
e94a797a5e
remove debug stautement
2017-01-12 12:56:20 -05:00
Isaac Connor
65f7350313
remove debug stautement
2017-01-12 12:55:27 -05:00
Isaac Connor
82eaacc624
switch quotes
2017-01-12 12:54:46 -05:00
Isaac Connor
42484f7680
switch quotes, load monitors at the beginnign
2017-01-12 12:54:40 -05:00
Isaac Connor
0197c550ae
Use a real variable for file handle so that it sticks around
2017-01-12 12:54:14 -05:00
Isaac Connor
0f67d9847e
remove caching of verified status of an mmap.
2017-01-12 12:53:57 -05:00
Isaac Connor
7502b81064
zmMemVerify now checks valid, so don't need to do it again.
2017-01-10 15:32:38 -05:00
Isaac Connor
04f66917ae
Merge branch 'fix_mmap_leak' into storageareas
2017-01-10 15:29:54 -05:00
Isaac Connor
7ddd5359d0
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
2017-01-10 15:09:30 -05:00
Isaac Connor
a146d7bee1
add a test for valid in the shared data. zmc sets this to false when it closes properly
2017-01-10 15:08:49 -05:00
Isaac Connor
faeb785961
zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good
2017-01-10 15:08:23 -05:00
Isaac Connor
4d84387807
Merge branch 'fix_mmap_leak' into work
2017-01-10 14:22:58 -05:00
Isaac Connor
a66e9e45a2
merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect
2017-01-10 14:22:42 -05:00
Isaac Connor
d2ff6701f4
test
2017-01-10 13:53:02 -05:00
Isaac Connor
b3c5f4622f
revert knnniggett's zmMemDetach changes
2017-01-10 12:56:19 -05:00
Isaac Connor
3074263e06
Merge branch 'control_fixes' into storageareas
2017-01-10 12:54:46 -05:00
Isaac Connor
66cdcd95fa
Merge branch 'master' into fix_mmap_leak
2017-01-10 08:47:46 -05:00
Isaac Connor
99e823ef33
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-08 11:04:59 -05:00
Isaac Connor
27760ffce2
move pod below __END__ and improve it to include options. Add help option.
2017-01-08 10:12:25 -05:00
Isaac Connor
b3a07c27b8
Add test for lastCheck being in the future. print out a notice when we are sleeping and are being run from a terminal.
2017-01-08 09:40:09 -05:00
Isaac Connor
146a772a21
move ENDPOINT to hidden category
2017-01-06 19:49:03 -05:00
Isaac Connor
03b19bc1fd
when run from terminal, output a line that says that we are sleeping
2017-01-06 18:40:39 -05:00
Isaac Connor
7f2fcddc03
revert print to Info
2017-01-06 18:39:08 -05:00
Isaac Connor
426eabb12d
if running from a terminal, set termLevel to info
2017-01-05 11:24:53 -05:00
Isaac Connor
db1a6f9b3b
fix to remove qqq
2017-01-05 11:24:27 -05:00
Isaac Connor
75cd1de7ab
show the # of entries loaded and saved
2017-01-05 09:42:11 -05:00
Isaac Connor
0c34aa9830
Merge branch 'zmtelemetry_improvements' into storageareas
2017-01-04 12:25:01 -05:00
Isaac Connor
09783a1a39
add some command line options and use the INTERVAL and ENDPOINT from the Config hash
2017-01-04 12:22:40 -05:00
Isaac Connor
cf9747054c
add ZM_TELEMETRY_INTERVAL AND ENDPOINT
2017-01-04 12:22:01 -05:00
Isaac Connor
84183c819c
Merge branch 'master' into storageareas
2017-01-03 09:53:09 -05:00
