66c66106f5
Process off+time delay condition
2016-01-15 20:31:31 -06:00
7700623b16
Move SQL debug to Execute
2016-01-13 09:02:37 -05:00
f1831383da
add a check for valid event link. Ignore anything that doesn't look right
2016-01-08 10:36:38 -05:00
270c737f40
Merge branch 'master' into storageareas
2016-01-05 09:36:36 -05:00
f0486e5b5e
fix dumb mistake, undefing ZM_SERVBER_ID after setting it.
2016-01-04 22:07:07 -05:00
a6c3d05071
Debug return events and the sql used
2016-01-04 16:01:07 -05:00
455f6d5b7b
have to use ->Path() as {Path} might not be filled in
2016-01-04 15:57:35 -05:00
88f902ea20
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-01-04 15:29:10 -05:00
17adc2b4e5
Rough in a Monitor class
2016-01-04 15:27:42 -05:00
196339b48b
Add new object classes to autoconf
2016-01-04 15:19:46 -05:00
6e685ec8c8
add Monitor object class and use it in zmaudit.pl to print out path where monitor should have been
2016-01-04 15:13:01 -05:00
f04ba9c87e
linefeed when saying that a db monitor doesn't exist in fs
2016-01-04 15:05:49 -05:00
fb7b171d6e
fix merge
2016-01-04 14:37:23 -05:00
1432c6ae1f
Added profiles for Wanscam-HW0025 and IPCC-7210W
2016-01-04 12:30:46 -05:00
b1205bcaa9
Merge branch 'multi-server' into storageareas
...
Conflicts:
CMakeLists.txt
configure.ac
scripts/zmaudit.pl.in
version
2016-01-02 14:45:24 -05:00
bf2195828f
Merge branch 'multi-server' into storageareas
...
Conflicts:
docs/installationguide/index.rst
2016-01-02 14:42:47 -05:00
fc5de5a4f3
Merge pull request #1215 from ZoneMinder/multi-server
...
Multi server
2016-01-01 21:50:31 -06:00
54bff42fa0
Remove warnings when no server set
2016-01-01 21:27:30 -05:00
c827f55580
Merge pull request #1040 from ZoneMinder/multi-server
...
Multi server
2016-01-01 09:36:04 -06:00
6537b61c36
put Storage Path in prompt when filesystem monitor doesn't exist in db
2015-12-30 08:08:01 -05:00
659b3f37f5
Stylistic fix
2015-12-29 21:08:24 -08:00
28bf4dfe7b
Add option for strict host key checking
2015-12-29 16:34:11 -08:00
07af49511c
Load Storage Object so that we can print it's path
2015-12-24 15:33:46 -05:00
d943488475
add sub Storage
2015-12-24 15:32:30 -05:00
92ddd57942
include storage path when saying an event is too young to delete
2015-12-24 15:28:36 -05:00
ec0d6359a0
Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone
2015-12-24 15:26:24 -05:00
177ed076a7
Make zmaudit only look at storage areas that are local
2015-12-24 15:25:56 -05:00
492550b5ef
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-24 12:36:40 -05:00
c174d74987
Set MOnitorId and StorageID because the Event does not exist in the db
2015-12-24 12:36:16 -05:00
45987e92a9
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2015-12-24 12:34:55 -05:00
dfa9a5a390
Add AUTOLOAD
2015-12-23 14:31:56 -05:00
1328492c64
fixes
2015-12-23 14:16:09 -05:00
33a3661958
cleanup, revent to openprint style objects
2015-12-23 14:03:40 -05:00
f32344c647
Add output options to the concat cmd line
2015-12-23 09:33:33 -05:00
1ff2043774
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-12-23 19:24:08 +11:00
ac0425d14b
sort events before testing and deleting. Makes the output easier to grok
2015-12-22 15:08:38 -05:00
12a5621fb8
remove deleted event from fs_events hash so that we don't do it more than once
2015-12-22 14:31:24 -05:00
9c6041d55b
require Object
2015-12-22 13:13:45 -05:00
39bcb20dac
Skip directories that have non-digits in them
2015-12-22 12:59:37 -05:00
9ad22d9ee5
have to set the MonitorId on events that don't exist in db
2015-12-22 12:55:55 -05:00
3932ce692c
remove Exporter stuff
2015-12-22 12:55:36 -05:00
171fcf0dca
Use Object
2015-12-22 12:40:15 -05:00
bc4ce4f009
add Event require and document lgob behaviour and skip monitor dirs that have anything other than digits in them
2015-12-22 12:35:25 -05:00
26a92e5fed
require Object
2015-12-22 12:23:24 -05:00
7663955dc8
Merge branch 'storageareas' into newpointone
...
Conflicts:
scripts/zmaudit.pl.in
2015-12-22 12:14:29 -05:00
e2f8b1adc3
rough in generic object, using some similar syntax to dbix
2015-12-22 12:13:57 -05:00
06a5a6d879
rough in Storage area support
2015-12-22 11:50:29 -05:00
c9dc53b237
add in find and find_one
2015-12-22 11:50:08 -05:00
d4a7258766
rough in Storage Area support
2015-12-22 11:10:17 -05:00
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
12d87c252f
Don't do Videod = 0, since zmvideo might need them to concatting and they won't regenerated if they exist anyways. Or maybe we want to encode them at a higher framerate or something
2015-12-21 16:04:31 -05:00
239b494db8
Add M.Id as MonitorID
2015-12-21 15:31:33 -05:00
07260adb2a
append ZoneMinder::General to executeShellCommand
2015-12-21 15:30:05 -05:00
a4024ffebc
Must do E.*, not *
2015-12-21 15:29:27 -05:00
9d454bdc41
Add test for empty storage path
2015-12-21 15:29:18 -05:00
3e29aa56a3
Return default event path when no Id in Storage
2015-12-21 15:27:53 -05:00
16a1768511
fixes
2015-12-21 15:19:57 -05:00
70039b4c9d
require ZoneMinder::Event
2015-12-21 15:14:23 -05:00
ad038edab4
chdir
2015-12-21 14:49:00 -05:00
99f9145cdd
Fix SQL for loading events
2015-12-21 14:43:55 -05:00
892623ce63
Use * to grab all Event columns
2015-12-21 14:14:00 -05:00
0cb2d141a5
Fix dbh's
2015-12-21 13:16:07 -05:00
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
5683210e42
Add missing ;
2015-12-21 12:42:00 -05:00
ca07b951cb
Merge branch 'master' into newpointone
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-21 12:41:25 -05:00
1039207f3a
Use Event->delete instead of our own delete code
2015-12-21 12:31:48 -05:00
2dfab0b408
Add delete and delete_files methods
2015-12-21 12:29:35 -05:00
872e5eff15
Merge branch 'multi-server' into newpointone
...
Conflicts:
web/lang/en_gb.php
web/skins/classic/views/filter.php
2015-12-21 11:35:16 -05:00
c2a857b498
Merge branch 'storageareas' into newpointone
2015-12-21 11:34:27 -05:00
3d00c3a50d
Make getDiskPercent take an optional path. When a Server is specified, add it to the Filter object so that we can use in getDiskPercent
2015-12-21 11:34:12 -05:00
710197a4f2
Merge branch 'filter_object' into storageareas
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
scripts/zmfilter.pl.in
2015-12-21 11:27:48 -05:00
de83872671
id => Id
2015-12-21 11:25:38 -05:00
118dc12ad5
id => Id
2015-12-21 11:25:17 -05:00
f6d52e77b9
it is important to return the object from the constructor
2015-12-21 11:13:21 -05:00
9f02f4353c
it is important to return the object from the constructor
2015-12-21 11:13:01 -05:00
e7c337f9f3
fix namespace for dbh
2015-12-21 11:10:45 -05:00
ac88867fd2
fix namespace for dbh
2015-12-21 11:10:24 -05:00
8682b1af28
rough in a Storage class for the perl side of things
2015-12-21 11:03:53 -05:00
30353fbcf9
Add special case for Server Attr's because they are on the Monitor, not the event
2015-12-21 10:33:19 -05:00
5553760222
Add special cases for ServerId, ServerName, ServerHost to handle supplying the value of the host that the script is running on.
2015-12-21 10:23:37 -05:00
27597c3401
Merge branch 'master' into storageareas
...
Conflicts:
docs/installationguide/ubuntu.rst
2015-12-20 11:19:44 -05:00
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
27b1b37d5b
added opt_use_api
2015-12-19 17:43:36 -05:00
fd773858a6
Merge branch 'better_zmvideo' into newpointone
...
Conflicts:
scripts/zmfilter.pl.in
2015-12-18 14:17:45 -05:00
d035753971
Add the event class.
...
Also, remove the unused Storage class
2015-12-17 14:38:18 -05:00
b32ef7751b
implement the options to generate videos for events specified by a stored filter. Also implement ability to generate a concatenated video of all events specified by the filter.
2015-12-17 14:36:40 -05:00
c71d1e52ac
Fix
2015-12-17 13:13:04 -05:00
9db9d243f2
Fix
2015-12-17 13:12:37 -05:00
6f34022613
add find and find_one routines
2015-12-17 13:11:32 -05:00
7a979bb891
remove duplicated routines
2015-12-17 13:11:15 -05:00
64f65b55cc
use new Filter object to do some of the heavy lifting in zmfilter.pl
2015-12-17 12:57:14 -05:00
7365c053e6
Create a Filter object, out of some of the code in zmfilter.pl. The purpose is to be able to use it elsewhere like zmvideo.pl.
2015-12-17 12:56:40 -05:00
3121e5550c
Create a new class Storage and use it to handle figureing out where the event is actually stored.
2015-12-17 10:47:47 -05:00
62095b30d0
Added autostop to Down command
2015-12-16 16:58:20 +01:00
39e396eb6e
Merge branch 'master' into multi-server
2015-12-09 10:36:51 -05:00
ac23efebef
Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware
...
Add code to detect the change in REALM from older to newer firmware
2015-12-09 10:36:27 -05:00
7c298c58ed
Add code to detect the change in REALM from older to newer firmware
2015-12-08 16:20:38 -05:00
5390605797
Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version
2015-12-03 10:23:19 +11:00
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
d231ac4533
remove comment at end of line
2015-11-10 14:46:12 -05:00
49a89b75a8
More verbose error reporting
2015-11-09 16:15:53 +01:00
3479af78bd
Add more verbose help
2015-11-06 13:36:29 -05:00
92401193a7
Add missing semicolon
2015-11-06 11:19:12 -05:00
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
a942b22541
Add camera control module for Vivotek ePTZ protocol
2015-11-04 17:12:07 +01:00
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
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
1cce60f6ec
Update version check URL
2015-10-23 11:45:32 -06:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
1367de292e
Fix error message when no ZM_SERVER_NAME or ZM_SERVER_HOST set
2015-10-07 08:57:50 -04:00
79d8e4b74f
Merge branch 'master' into fix_zmaudit
2015-10-06 09:30:32 -04:00
4a506368dc
Fix zmaudit sleeping and deleting Empty Events now that Frames also has an Id field
2015-10-06 09:30:10 -04:00
e0e048fe7e
fixed version compare logic
2015-10-04 09:10:05 -04:00
aa108eff6e
Add Info line on startup saying which Server it is loading for
2015-10-02 12:33:09 +00:00
b0b69c5176
parse ZM_SERVER_HOST into ZM_SERVER
2015-10-02 12:32:41 +00:00
ea87ffe66f
merge master, bump version to 1.28.108
2015-10-01 11:52:49 -04:00
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
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
d754239a51
add debug statements for when LastWriteTime is not defined.
2015-09-24 09:57:58 -04:00
4c2545a5ca
Merge branch 'master' into multi-server
2015-09-17 15:39:26 -04:00
6e3c8bb380
revert
2015-09-14 15:15:44 -04:00
204f2b1e22
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-09-10 13:20:06 -04:00
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
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
9cdf8ec317
tabs to spaces
2015-08-27 11:13:44 -04:00
80a294da34
tabs to spaces
2015-08-27 11:10:13 -04:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
b4e9a0f0cf
whitespacing
2015-08-26 12:08:10 -04:00
46bd7b492b
adds sanity checks to isActive and default states
2015-08-26 11:20:58 -04:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
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
ad23969982
add space instead of + to handle old Axis cameras
2015-07-16 13:06:15 -04:00
c788d70b93
zmtrigger: POD documentation
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
ca9a391d62
Only load the monitors for our server
2015-07-15 16:24:01 -04:00
b8888b9d55
Only load triggers for our Server if ZM_SERVER_ID is set
2015-07-15 16:22:43 -04:00
4e5ca2cead
Merge pull request #937 from ZoneMinder/better_logging
...
improve log
2015-07-15 15:21:08 -05:00
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
51af432468
Only load monitors for our server if ZM_SERVER_ID is specified
2015-07-15 16:18:05 -04:00
e318c3bf37
Add ServerId as a filter option
2015-07-15 16:12:35 -04:00
01518d6aa9
fix. without this zmc won't restart automatically
2015-07-15 16:08:02 -04:00
e4b3344a8c
improve log
2015-07-15 16:06:55 -04:00
cf3f160783
add error handling on failure to open serial port
2015-07-15 16:02:02 -04:00
4630bad24b
add http to control url if it isn't present
2015-07-15 15:59:21 -04:00
561bf43721
fix pod2man generation for out-of-source builds
2015-07-09 19:33:06 -05:00
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
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
b867ee4c4c
Merge pull request #891 from ZoneMinder/zmwatch_cleanup2
...
Zmwatch cleanup2
2015-06-23 08:36:42 -05:00
30c7ab697c
Merge pull request #847 from ZoneMinder/faster_shutdown
...
faster shutdown
2015-06-23 08:19:25 -05:00
e4106e34a1
put back build replacements, don't know how I lost those
2015-06-22 13:56:27 -04:00
91e7281695
Merge pull request #890 from ZoneMinder/zmwatch_cleanup1
...
reverse the if statement to reduce indenting
2015-06-22 12:53:06 -05:00
612e96bbfe
fix problem causing processes to not be restarted. Also, tabs to spaces
2015-06-22 13:37:26 -04:00
e758d9bf7c
Modified to handle setting isActive for custom states
2015-06-21 09:30:46 -04:00
fa835359a1
Add install target for C binary man pages
2015-06-20 17:33:13 -05:00
13b9921680
Modify zmsystemctl pod documentation
2015-06-20 16:13:40 -05:00
fd239f6545
Generate man pages for perl scripts in the bin folder
2015-06-20 15:22:11 -05:00
f8cc27e224
Protocol for 8918W
2015-06-19 15:45:50 -04:00
991291ce67
declared so perl does not complain of globals
2015-06-19 14:12:08 -04:00
39ee845ff0
Updated 9831W foscam script
2015-06-19 12:58:40 -04:00
1f87a696cf
improve debugging for analysis check and restart if can't read shared data
2015-06-19 11:07:20 -04:00
3be4a0aa11
re-enable restarting capture process if mem invalid
2015-06-19 09:04:19 -04:00
a9175705c1
reverse the if statement to reduce indenting
2015-06-19 08:59:49 -04:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
f6a226e700
Correct bareword config entries with newer {} style
2015-05-27 10:00:24 -04:00
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
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
8c7e633d8f
Undo ZM_VERSION changes
2015-05-18 21:55:00 -07:00
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
fb5c1abc87
Undid ZM_VERSION hacks
2015-05-18 21:44:41 -07:00
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
8eb5e53aad
Remove with {ZM_PATH_SWAP}
2015-05-14 10:27:11 -04:00
3709ac411d
Not having ZM_AUDIT_MIN_AGE should be fatal
2015-05-13 12:36:35 -04:00
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
9c73b7247c
Revert "Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting"
...
This reverts commit a5fed03524
2015-05-13 11:37:13 -04:00
a5fed03524
Switch from a MIN_AGE constant in zmaudit.pl to using a ZM_AUDIT_MIN_AGE Config setting
2015-05-13 11:33:22 -04:00
246fadb097
support the old use of just putting the password in the control field
2015-05-13 08:23:16 -04:00
e8114c90bb
Fix printMsg. We don't use it as an object method. Update to parse a user:password out of ControlAddress which is what a lot of other scripts do.
2015-05-12 17:08:55 -04:00
c7a50a7cbc
Replace newlines with a space
2015-05-09 12:13:38 -05:00
c7c0622673
rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency.
2015-05-09 12:10:12 -05:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
abc8d3fdd1
ConfigData.pm: wrap extraordinary long lines using new "qqq()" function.
2015-04-19 18:15:51 +10:00
458ed9ede9
ZoneMinder.pm: minor re-wrapping
2015-04-19 18:15:23 +10:00
62c1429039
wrap long lines
2015-04-19 16:31:53 +10:00
6a150d2607
tabs-to-spaces
2015-04-19 15:17:10 +10:00
85d75b0b27
Logger.pm: define '$LOGFILE'
...
non-bareword LOGFILE should be defined.
2015-04-17 11:15:49 +10:00
59b63188cb
eliminating {Two-argument "open"}/{Bareword file handle}. See pages 202,204 of PBP. (Severity: 5)
2015-04-17 09:33:06 +10:00
3d512dbada
eliminate Subroutine prototypes
2015-04-17 09:22:47 +10:00
f02b9c94ec
PelcoP.pm: correct package declaration (thanks, perlcritic)
...
Package declaration must match filename at line 25, column 1. Correct the filename or package statement. (Severity: 5)
2015-04-17 08:24:01 +10:00
b0909a4c57
autouse Data::Dumper
2015-04-16 15:48:51 +10:00
b0d98c6052
zmx10.pl: pod2usage + readability
2015-04-16 15:48:50 +10:00
14f3c106fe
zmwatch.pl: comments to POD + readability
2015-04-16 15:48:49 +10:00
7ba03132fc
zmvideo.pl: pod2usage + readability
2015-04-16 15:48:48 +10:00
fcdd9b6fb5
zmtrigger.pl: comments to POD + readability
2015-04-16 15:48:47 +10:00
60b355cb92
zmtrack.pl: pod2usage + readability
2015-04-16 15:48:36 +10:00
6f3baca5cd
zmsystemctl.pl: pod2usage
2015-04-16 14:38:27 +10:00
b3b9647740
zm.in: tabs-to-spaces
2015-04-16 14:26:31 +10:00
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
c17d156d95
Merge pull request #798 from onlyjob/PBP
...
zmcontrol.pl, zmfilter.pl: pod2usage + readability improvements.
2015-04-13 10:19:59 -04:00
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -05:00
afb127125d
zmpkg.pl: correction for "Use of uninitialized value $command in string eq at zmpkg.pl line 62"
2015-04-11 22:41:07 +10:00
fa97348535
zmpkg.pl: pod2usage, tabs-to-spaces + readability
2015-04-11 22:39:32 +10:00
ac685fd247
zmfilter.pl: pod2usage + beautification
2015-04-11 11:18:21 +10:00
fba085a1c5
zmcontrol.pl: pod2usage (draft) + minor readability improvements.
...
Looks like "zmcontrol.pl" was based upon "zmfilter.pl" so it inherited
commented description of the latter.
Therefore "zmcontrol.pl" needs a description...
2015-04-11 11:15:56 +10:00
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
53907eeba1
zmcamtool.pl: readability
2015-04-11 00:35:40 +10:00
90fa57788a
zmcamtool.pl: pod2usage
2015-04-11 00:35:35 +10:00
4dee542e99
zmcamtool.pl: tabs-to-spaces
2015-04-11 00:07:36 +10:00
4bb8043fe5
zmaudit.pl: PBP/5 + readability
2015-04-10 20:34:17 +10:00
aeb3486322
zmaudit.pl: convert to pod2usage
2015-04-10 20:34:17 +10:00
e6631ebaf1
Propagate new perl changes to the ONVIF perl modules
2015-04-09 20:11:32 -05:00
373b53f8f3
zmdc.pl: Usage() --> pod2usage()
2015-04-09 03:56:04 +10:00
81860d99a6
zmdc.pl: PBP/5 + reformatting
2015-04-09 03:55:51 +10:00
a2d9c0c042
Don't copy .in files into staging
2015-04-08 12:22:46 -05:00
e895fd26f7
cmake - use perl INSTALLDIRS
2015-04-07 08:19:21 -05:00
904f2989ed
Improving ZM_USE_DEEP_STORAGE description ( #783 ):
...
Removed "If you are upgrading from a previous version of ZoneMinder" from
description. From data loss prospective it is irrelevant whether database
is upgraded or not as fresh install is just as vulnerable.
Changed "enable" to "change" to emphasize the above.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:39:13 +10:00
078c5aa14b
Briefly document "--migrate-events" option in zmupdate.pl ( #783 ).
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-06 18:38:14 +10:00
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05:00
2671e71e33
Merge pull request #763 from onlyjob/podhelp
...
POD: zmupdate.pl converted to "pod2usage"
2015-03-30 13:29:03 -04:00
5f6c559476
POD: zmupdate.pl converted to "pod2usage"
...
Best practice for POD documentation is to (re-)use it for displaying usage
info. Now `perldoc zmupdate.pl` shows expected information and we can even
generate man page automatically with `pod2man zmupdate.pl`.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-31 02:47:16 +11:00
b0faa138bd
POD: added missing NAME sections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:07:03 +11:00
11f7af3b03
fixing POD errors
...
manpage-has-errors-from-pod2man (forgotten '=back' before '=head2')
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 14:41:01 +11:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
856a8ce1d0
minor improvement removing 1 coll to time()
...
improve logging tell which monitor the event belonged to
2015-02-06 09:30:48 -05:00
20fec3ed7a
According perldoc DBI we should NOT be calling finish after processing all rows.
2015-02-04 11:15:31 -05:00
d787ad3f7a
Merge pull request #666 from ZoneMinder/kill_zmcontrol
...
Kill zmcontrol
2015-01-07 17:28:08 -06:00
21ccb9b91a
introduce the quit command which makes the resident zmcontrol.pl exit
2015-01-07 16:37:26 -05:00
a10f2aa31c
Add version to the usage line in zmx10.pl
2015-01-07 09:14:00 -05:00
7f934e0e69
Add version to the usage line in zmvideo.pl
2015-01-07 09:11:07 -05:00
5b79139a05
Add version to the usage line in zmsystemctl.pl
2015-01-07 09:07:40 -05:00
3013d87783
Add -v --version command line param to zmpkg.pl
2015-01-07 09:05:16 -05:00
8ea01e631b
Add -v --version command line param to zmfilter.pl
2015-01-07 09:00:46 -05:00
94e0ec542a
Add -v --version command line param to zmdc.pl
2015-01-07 08:47:32 -05:00
76d0dfa475
Add -v --version command line param to zmcamtool.pl
2015-01-07 08:43:51 -05:00
71c94475ff
Add -v --version command line parameters to zmaudit.pl
2015-01-06 21:08:41 -05:00
89a603cf27
Modified zmfilter.pl.in to fix #652 , crashing while processing background filter with no terms
2015-01-03 12:45:18 -05:00
4c97bd1137
Merge pull request #638 from KristofRobot/instantNotification
...
zmfilter: Send message for events that are still ongoing
2014-12-29 12:02:51 -05:00
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -05:00
d7586c2a28
fix a bare ZM_PATH_BIN which should be $Config{ZM_PATH_BIN}
2014-12-17 16:35:30 -05:00
643438e3f2
zmfilter: Send message for events that are still ongoing
2014-12-15 08:15:59 +01:00
78f0243c69
This replaces Module::Load with Module::Load::Conditional which can actually handle errors.
...
Then I move the module load call up before the fork so that any errors will be visible and will make zmcontrol.pl die quickly instead of waiting 11 seconds for something that will never happen.
2014-12-12 16:33:18 -05:00
a52f07fa8e
Some cleanups, remove code that does nothing.
...
Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password
enforce a port, which fixes the Digest Auth.
2014-12-08 15:54:27 -05:00
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11:00
Andy Bauer
Isaac Connor
Isaac Connor
Isaac Connor
Simpler1
Adam Reiser
Isaac Connor
SteveGilvarry
arjunrc
Marco
Isaac Connor
Robin Daermann
dreaddy
Kyle Johnson
Bobby Billingsley
Dmitry Smirnov
Andrew Bauer
Rick Sayre
abauer
Stephen Arthur
Kristof Robot