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
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
f69f46c2fb
Don't use Data::Dumper unless you are actually using it for debugging. No need to use ram. It is probably being included by one of the libraries anyways, but let's at least try to keep things as light as possible.
2014-11-25 14:44:08 -05:00
9d7f3c2026
Update zm.in
...
The legacy sysv init script will not work with systemd. This is by design.
2014-11-23 11:09:52 -06:00
83120e69b1
Merge pull request #584 from ZoneMinder/zmupdatefixes
...
Zmupdatefixes
2014-11-19 13:09:07 -06:00
cc989dbe19
fix putting the mode back. I merged it to the wrong place
2014-11-19 13:54:10 -05:00
f8dd2c6eaf
Merge branch 'master' into controlversionfixes
2014-11-19 12:53:28 -05:00
793998484c
Merge branch 'master' into zmupdatefixes
...
Conflicts:
scripts/zmupdate.pl.in
2014-11-19 12:47:31 -05:00
a00f719f12
Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
...
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
5fe0b84b3c
Create 3S.pm
...
3S API Control Protocol Module
2014-11-12 08:40:35 -03:00
17e38560d6
just update the perldoc parts
2014-11-06 10:02:34 -05:00
4863ce96a3
remove annoying warning.
2014-10-31 14:12:36 -04:00
c9c6c17699
add script for TVIP862IC. Should also work with IP672 and others.
2014-10-22 15:08:58 -04:00
e23c756ca4
Revert "replace uri_encode with uri_escape"
...
This reverts commit ce5396f4ea
2014-10-21 15:17:34 -04:00
ce5396f4ea
replace uri_encode with uri_escape
2014-10-21 09:47:31 -04:00
5dedbc2135
detect when the control address has a http in front, and do the right thing
2014-10-20 16:55:24 -04:00
9ce7da4147
Don't 'use Data::Dumper'; it was only there for debug
2014-10-20 16:47:03 -04:00
a043526994
Merge pull request #462 from knnniggett/memory
...
Fix for shared data size conflict
2014-10-17 09:18:21 -04:00
58b826b0a2
more url documentation
2014-10-15 13:14:56 -04:00
348538b778
distros/ubuntu1204/changelog
2014-10-15 13:14:19 -04:00
9eb88d3f15
add a check for db connection to handle the db going away and coming back
2014-10-15 09:43:00 -04:00
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
9c8419f89a
detaint to keep perl from complaining
2014-10-10 09:03:30 -05:00
19482851ff
New method to determine bitness
2014-10-10 08:10:03 -05:00
1a5844afef
auto-recreate missing folders during startup
2014-10-05 11:25:41 -05:00
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
60ed8d7366
Update ConfigData.pm.in
...
Changing the help text for DIR_EVENTS, DIR_IMAGES, and DIR_SOUNDS to make it more obvious that one should not specify a folder outside the web root and that one should probably not ever change these values from their default.
2014-09-12 08:05:15 -05:00
4d579e239a
Merge pull request #502 from knnniggett/systemd-2
...
Initial systemd support.
2014-09-03 15:59:42 -04:00
980a7a83bf
Add some text referencing the settings on the monitor settings page
2014-08-21 10:04:08 -04:00
ad364d090a
rename and process zmsystemctl.pl.in
2014-08-19 17:19:44 -05:00
411d77dc7f
remove obsoleted code
2014-08-13 19:02:59 -05:00
1e8e710f5a
full systemd support
2014-08-10 08:47:11 -05:00
7cbb079370
revert size check for now
2014-08-04 11:26:33 -04:00
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05:00
a87f75eee0
any size discrepancy is caused for bailing
2014-08-01 11:27:51 -04:00
d5a7a1849a
make zmupdate re-run the most recent update.
2014-07-29 09:47:22 -04:00
fa67e21c07
Update FI9821W_Y2k.pm
...
Fixed this issue:
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 138.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 141.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 144.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 154.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 156.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 195.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 222.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 247.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 275.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 302.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 329.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 356.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 383.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 399.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 414.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 448.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 671.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 690.
2014-07-22 19:06:04 +02:00
3513f87163
Fix for shared data size conflict
2014-07-07 15:56:56 -05:00
c58c4a9720
add the glue to define HOST_OS and use it to detect BSD and use different arguments to killall
2014-06-25 15:28:10 -04:00
a148e04ea2
Update zmtrigger.pl.in
...
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder.
Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.
This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
2014-04-30 15:07:29 +02:00
fd9e808fe1
Update zmupdate.pl.in
...
Fix typo 'from' version replaced with 'to' version.
2014-03-24 13:35:53 +00:00
fbf4de5eb2
Update Wanscam.pm
...
No longer needed for zm 1.27
2014-03-19 11:56:08 -05:00
faacea50ef
Update Wanscam.pm
...
Use full package name when using ZM_VERSION
2014-03-19 11:52:58 -05:00
626c7bd6b7
pull this from the Wiki
2014-03-19 11:57:42 -04:00
189d9938cc
Add zmcamtool to autotools file manifest
2014-03-16 07:32:18 -05:00
15f014eb8b
Changes from nagyrobi:
...
Todays computer hardware and internet speeds allow for a much more responsive user interface to be ran. I suggest to optimize these values in the "High bandwidth" profile for today's technology. These values were established at least 8 years ago... There's no risk for the user because on a fresh install and new logins, new browsers "Low bandwidth" is always the default. Optimizing these values produce no noticeable load increase on modern hardware, and a snapy, pleasant user interface if desired.
Also increased event image digits because I often run into situations where very long events run out of file naming digits (max 999 files is too short, that's only 40 seconds).
2014-02-26 09:00:10 -06:00
e5ac6e95fa
Update zmupdate.pl.in
...
mysql generates a warning, instead of an error, when trying to convert to InnoDB and that engine is not available. By temporarily elevating warnings to errors, we can catch these rather than silently failing.
2014-02-04 15:30:04 -06:00
f5ce597609
final cleanup and changes before 1.27 release
2014-02-01 12:17:46 -06:00
e707e72fe3
Perl::Critic recommended a couple minor changes
2014-01-25 12:42:33 -06:00
dbe6fc539c
Additional error checking
2014-01-25 11:26:29 -06:00
ae1731477b
further refinements
2014-01-25 10:39:38 -06:00
2037afb3ca
new subroutine runQuery
2014-01-23 08:41:47 -06:00
869a139809
create rmName subroutine
2014-01-22 19:18:08 -06:00
91b0676343
Call checkName for certain reptitive tasks
2014-01-22 09:20:56 -06:00
f00e72be1e
Initial commit for new zmcamtool.pl script
2014-01-21 16:22:30 -06:00
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
5ccfa305d3
Merge pull request #294 from knnniggett/glob_ptz_scripts
...
glob ptz scripts under control folder
2014-01-06 08:50:48 -08:00
faaf237731
Revert "Broke zmfilter.pl.in in order to test travis"
...
This reverts commit acc158f3cb
2014-01-04 15:10:15 -05:00
acc158f3cb
Broke zmfilter.pl.in in order to test travis
2014-01-04 15:04:14 -05:00
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05:00
3d55dde548
COnfig fixes
2014-01-03 09:33:49 -05:00
c5afecc2b4
Revert "Introducing a bug in zmfilter.pl.in to test travis"
...
This reverts commit 337750430b
2014-01-02 12:15:06 -05:00
337750430b
Introducing a bug in zmfilter.pl.in to test travis
2014-01-02 12:02:07 -05:00
07b4d83d74
Have Usage() in zmcontrol.pl exit 0 instead of -1
2014-01-02 11:50:39 -05:00
0eac723409
glob ptz scripts under control folder
2014-01-01 12:17:13 -06:00
20dd76b354
Using the full path for ZM_VERSION. Using "Control Device" value for user/password.
2014-01-01 13:16:53 +01:00
3fb76eaf35
Initial version of control file for Foscam IP cameras.
...
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
2013-12-29 22:24:35 +01:00
7b26636bcd
Merge pull request #280 from ZoneMinder/zmfixremoval
...
Remove zmfix
2013-12-22 11:22:18 -08:00
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
b5e4e1e573
Update FI8608W_Y2k.pm
...
Fix typo
2013-12-21 11:32:47 -06:00
2cadb3c5a6
Fixed a small typo in ConfigData.pm.in
2013-12-21 10:55:36 -05:00
7251a8e1ae
fixes to $Config changes, also exit if no EVENT_PATH
2013-12-19 13:41:55 -05:00
4d9234089c
fix ZM_URL to $Config{ZM_URL}
2013-12-19 13:01:52 -05:00
462108583b
fix ZM_EVENT_PATH
2013-12-19 12:55:14 -05:00
42642937e4
fix ZM_VERSION
2013-12-17 13:05:58 -05:00
9e7d729ca8
use the full path for ZM_VERSION
2013-12-17 12:06:14 -05:00
2ced76c20d
do this one too
2013-12-17 11:24:33 -05:00
8777295468
use fully specified version
2013-12-17 11:23:03 -05:00
1d338ed879
more
2013-12-16 16:36:12 -05:00
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
b0b471eb5b
Update zm.in
2013-12-14 09:13:49 -06:00
cd43496a7d
Update zm.in
...
Don't think this is needed. This may contribute to the corrupt Config table issue
2013-12-14 09:05:15 -06:00
c3c3cfbfb9
Merge pull request #264 from ZoneMinder/improvezmpkg
...
Use proper DBI parameter passing in zmpkg.pl to improve security
2013-12-13 10:34:48 -08:00
f39f2fab66
Merge pull request #241 from ZoneMinder/alarmrefblendoption
...
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
Andrew Bauer
Isaac Connor
Stephen Arthur
Isaac Connor
Kristof Robot
jmcastro2014
Sune1337
Andrew Bauer
Jan M. Hochstein
Kyle Johnson
Florian Asche
Martin Hagelin
barjac
Andy Bauer
tim
Kyle Johnson
Dmitry Katsubo
Kfir Itzhak