Isaac Connor
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
Andrew Bauer
b533c8b257
don't zmMemInvalidate when reloading monitors ( #2225 )
...
* remove call to zmMemVerify when reloading monitors
* need to call zmMemVerify to attach to the mem handle
2018-09-28 13:35:42 -04:00
Isaac Connor
d45406bce7
ode style and some more debug
2018-09-28 11:50:34 -04:00
Isaac Connor
e6f366c5cb
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-28 09:48:37 -04:00
Isaac Connor
e0dc8a5f6b
Merge branch 'master' into storageareas
2018-09-27 13:54:53 -04:00
Isaac Connor
66f11435b9
perhaps fix memory corruption due to libx264 writing to stderr which may be closed.
2018-09-27 13:50:11 -04:00
Isaac Connor
8f6db1c279
Merge branch 'master' into storageareas
2018-09-25 13:54:44 -04:00
Isaac Connor
5fd1034b0b
Add ServerId to perl Logging to DB
2018-09-25 13:53:50 -04:00
Isaac Connor
af69dab9c5
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-22 14:58:28 -04:00
Isaac Connor
5dba17e1fc
Merge branch 'master' into storageareas
2018-09-21 10:50:10 -04:00
Isaac Connor
3f0336e63e
Fix event_id detection from link (re was wrong). Add extra check for db event when we find an event dir without identifying id info in Deep mode
2018-09-21 10:31:54 -04:00
Isaac Connor
6aa71dfc11
Fix calculation of LinkPath, as it was using RelativePath instead of Path
2018-09-21 10:31:11 -04:00
Isaac Connor
a568948eab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-20 12:31:36 -04:00
Isaac Connor
884eb48420
fix the section that deletes events that have lost their event links.
2018-09-20 12:31:19 -04:00
Jonathan Lassoff
c7e1e7b901
Control plugin for Dahua PTZ cameras ( #2192 )
...
* Control plugin for Dahua PTZ cameras
* Update http/https protocol handling
* Update doc and license
* Remove license from top of file
* Use named regex capture groups for ControlAddress parsing
* Remove trailing whitespace in Trendnet.pm
2018-09-20 12:29:54 -04:00
Isaac Connor
7abe4c40d5
Merge branch 'fix_2213' into storageareas
2018-09-19 20:02:27 -04:00
Isaac Connor
95bcac4c5a
Implement delete_empty_subdirs that uses delete_empty_directories. The idea is to use it on the monitor dir so that the monitor dir gets left behind and not deleted when there are no events
2018-09-19 20:00:26 -04:00
Isaac Connor
3a9f96e8e8
Skip deleting event if event is archived. And event not having a scheme is now an error
2018-09-19 12:03:51 -04:00
Isaac Connor
34c7ee32ee
Merge branch 'master' into storageareas
2018-09-14 15:13:57 -04:00
Isaac Connor
f2a117c85b
fix undefined $event
2018-09-14 11:06:08 -04:00
Isaac Connor
4528a043c5
fixtypo
2018-09-14 11:04:52 -04:00
Isaac Connor
ca3fd5ddf8
get rid of deleteEventFiles function. People should use the object method
2018-09-14 10:08:35 -04:00
Isaac Connor
11137d271e
Create utility functions in event for creating linkPath and idPath. Replace the code in Generate::createEventPath with using these nice new functions
2018-09-14 10:06:36 -04:00
Isaac Connor
63bed3af10
replace all uses of getEventPath with object function event->Path(). Remove getEventPath
2018-09-14 09:23:09 -04:00
Isaac Connor
60b952ab86
Merge branch 'master' into storageareas
2018-09-13 16:20:36 -04:00
Isaac Connor
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
Jonathan Lassoff
7bcf9d59e1
Use named regex capture groups.
2018-09-12 12:55:31 +00:00
Isaac Connor
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
Isaac Connor
b545528bb0
If DefaultVideo is set, use the passthrough mp4 instead of generating and mp4 from jpegs
2018-09-11 08:49:42 -04:00
Isaac Connor
042d4c3099
Default to auditing all Storage Areas. Add a Server flag to audit only areas on a specific server.
2018-09-09 18:32:00 -04:00
Isaac Connor
5eec7e00c5
Merge branch 'master' into storageareas
2018-09-09 14:09:52 -04:00
Isaac Connor
882e47c9ab
Fix deleting empty directories
2018-09-09 13:28:24 -04:00
Isaac Connor
9e8a876101
Fix finding Storage by ServerId
2018-09-09 13:28:11 -04:00
Isaac Connor
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
Isaac Connor
fa690826a3
clean up zmstats, add db reconnect
2018-09-07 16:30:47 -04:00
Isaac Connor
b7aa11f109
Fix infinite loop reconnecting to db in Logging
2018-09-07 16:30:24 -04:00
Isaac Connor
def72b8e66
tidy up license
2018-09-07 16:29:59 -04:00
Isaac Connor
426aeea95b
add db reconnects to zmwatch.
2018-09-07 16:29:23 -04:00
Isaac Connor
4b69f520d5
Merge branch 'master' into storageareas
2018-09-05 12:08:23 -04:00
Isaac Connor
730e1fda37
We only use File::Slurp when moving files to s3fs so only require it if doing that
2018-09-05 10:14:45 -04:00
Isaac Connor
c34f899d31
eliminate warning when no Storage area is set.
2018-09-04 13:57:35 -04:00
Isaac Connor
8245d193e2
Merge branch 'master' into storageareas
2018-09-04 09:48:47 -04:00
Andrew Bauer
13558b2c12
convert existing http urls in help text to markdown
2018-09-04 07:39:46 -05:00
Jonathan Lassoff
4deaa49048
Remove license from top of file
2018-09-04 10:48:28 +00:00
Andy Bauer
ce48343d1a
embed link to privacy statment in telemetry help text
2018-09-03 13:55:11 -05:00
Isaac Connor
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
Jonathan Lassoff
b3a0b0e731
Update doc and license.
2018-09-03 14:08:59 +00:00
Jonathan Lassoff
a3baf2c371
Update protocol selection handling
2018-09-03 14:08:52 +00:00
Jonathan Lassoff
2074e1ccc3
use strict and remove base class methods
2018-09-03 13:51:33 +00:00
Isaac Connor
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
