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 |
|
Isaac Connor
|
ac88490338
|
When use warnings is on and there is a null value in the monitor data it causes warnings. So add skip if __git_main is not defined.
|
2017-01-02 12:49:37 -05:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
25ab1bee18
|
more fixed to gpl license text
|
2016-12-26 10:40:09 -06:00 |
|
Andy Bauer
|
0f15b3ae62
|
update gpl 2 mailing address
|
2016-12-26 10:33:03 -06:00 |
|
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
|
Isaac Connor
|
631c13ab1a
|
revert to zmMemInvalidate
|
2016-12-23 09:26:38 -05:00 |
|
Isaac Connor
|
98a3d8f9f2
|
remove <<<< line
|
2016-12-22 11:02:07 -05:00 |
|
Isaac Connor
|
c27d0270dc
|
Merge branch 'knnniggett-zmMemDetach' into storageareas
|
2016-12-20 15:40:14 -05:00 |
|
Andy Bauer
|
c6368c4a1a
|
replace zmMemInvalidate with zmMemDetach
|
2016-12-20 13:49:07 -06:00 |
|
Isaac Connor
|
ed618ff7b0
|
Merge branch 'master' into storageareas
|
2016-12-20 11:29:31 -05:00 |
|
Andrew Bauer
|
02e534dcff
|
Merge pull request #1694 from connortechnology/disk_space_in_events
Disk space in events
|
2016-12-20 09:19:21 -06:00 |
|
Isaac Connor
|
1bf93d76b7
|
fix www and parenthesis.
|
2016-12-13 14:56:29 -05:00 |
|
Isaac Connor
|
6ceb4cc93e
|
fix qqq and replace doube quotes with single quotes
|
2016-12-13 14:32:28 -05:00 |
|
Isaac Connor
|
708f52beda
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-12-13 13:36:18 -05:00 |
|
Isaac Connor
|
a9548d3f6b
|
Add a config entry to turn event disk space on/off
|
2016-12-13 13:34:56 -05:00 |
|
Isaac Connor
|
8009bce3d9
|
quote the link name so that spaces don't break it
|
2016-12-13 13:23:20 -05:00 |
|
Isaac Connor
|
2c0a868eea
|
fix typo
|
2016-12-08 11:02:59 -05:00 |
|
Andrew Bauer
|
ecbaaef59a
|
Merge pull request #1670 from connortechnology/fix_braces
Fix braces
|
2016-12-06 08:39:43 -06:00 |
Kyle Johnson
|
49620d51b9
|
Merge pull request #1692 from ZoneMinder/small_fixes
Small fixes
|
2016-11-24 20:42:45 -07:00 |
Isaac Connor
|
cf49a234b3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-22 13:05:03 -05:00 |
|
Isaac Connor
|
9e8404516b
|
add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files
|
2016-11-22 11:02:38 -05:00 |
|
Isaac Connor
|
02cd3e8cba
|
Merge branch 'master' into small_fixes
|
2016-11-22 10:52:07 -05:00 |
|
Isaac Connor
|
27b5b60eae
|
Merge branch 'master' into fix_braces
|
2016-11-14 21:46:25 -05:00 |
|
Isaac Connor
|
911256785e
|
Merge branch 'fix_braces' into storageareas
|
2016-11-08 13:14:12 -05:00 |
|
Isaac Connor
|
1be6c57aee
|
fix extra semi colon
|
2016-11-08 13:11:10 -05:00 |
|
Isaac Connor
|
5f0c1c0e26
|
fix layout in a complex map
|
2016-11-08 12:55:07 -05:00 |
|
Isaac Connor
|
4b3ac63a68
|
merge master, deprecate qqq()
|
2016-11-08 11:30:44 -05:00 |
|
Isaac Connor
|
eb2177e76a
|
whitespace fixes in prep for merging master
|
2016-11-08 10:44:00 -05:00 |
|
Andrew Bauer
|
29e48da3b9
|
fix sftp xfers in zmfilter (#1677)
|
2016-11-07 16:08:43 -05:00 |
|
Isaac Connor
|
0dbde8e290
|
correct a lot of braces
|
2016-11-04 15:53:14 -04:00 |
|
Isaac Connor
|
93725b3f4b
|
fixup spacing in ConfigData
|
2016-11-04 14:05:51 -04:00 |
|
Isaac Connor
|
3d17067276
|
change tabs to spaces
|
2016-11-03 14:30:23 -04:00 |
|
Isaac Connor
|
68c8178648
|
remove some extra spaces
|
2016-11-03 14:21:07 -04:00 |
|
Isaac Connor
|
bb371612c3
|
tabs to spaces
|
2016-11-03 14:18:03 -04:00 |
|
Isaac Connor
|
d9a31f7fb6
|
Merge branch 'master' into storageareas
|
2016-10-26 13:39:31 -04:00 |
Andrew Bauer
|
191efed8e3
|
change fast_delete to off - fixes #1597
|
2016-10-19 14:10:28 -05:00 |
|
Isaac Connor
|
10e451faa6
|
fix log line
|
2016-10-02 12:23:19 -04:00 |
|
Isaac Connor
|
a77de33997
|
add a test for lib existence
|
2016-09-27 12:51:04 -04: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 |