Pliable Pixels
991291ce67
declared so perl does not complain of globals
2015-06-19 14:12:08 -04:00
Pliable Pixels
39ee845ff0
Updated 9831W foscam script
2015-06-19 12:58:40 -04:00
Emmanuel Papin
3f20a08d16
Add cmake support
2015-05-31 02:37:58 +02:00
Emmanuel Papin
eff56664c3
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
...
Conflicts:
web/lang/de_de.php
web/skins/classic/views/monitor.php
web/skins/classic/views/plugin.php
2015-05-28 23:43:13 +02:00
Andrew Bauer
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
Emmanuel Papin
6b2c435460
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2015-05-14 11:12:38 +02:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
Isaac Connor
246fadb097
support the old use of just putting the password in the control field
2015-05-13 08:23:16 -04:00
Isaac Connor
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
Andrew Bauer
c7a50a7cbc
Replace newlines with a space
2015-05-09 12:13:38 -05:00
Andrew Bauer
c7c0622673
rpmbuild incorrectly interprets the text "use standard" as a Perl module dependency.
2015-05-09 12:10:12 -05:00
Emmanuel Papin
630c8f335f
Merge master
2015-05-05 23:37:20 +02:00
Dmitry Smirnov
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
Dmitry Smirnov
abc8d3fdd1
ConfigData.pm: wrap extraordinary long lines using new "qqq()" function.
2015-04-19 18:15:51 +10:00
Dmitry Smirnov
458ed9ede9
ZoneMinder.pm: minor re-wrapping
2015-04-19 18:15:23 +10:00
Dmitry Smirnov
62c1429039
wrap long lines
2015-04-19 16:31:53 +10:00
Dmitry Smirnov
6a150d2607
tabs-to-spaces
2015-04-19 15:17:10 +10:00
Dmitry Smirnov
85d75b0b27
Logger.pm: define '$LOGFILE'
...
non-bareword LOGFILE should be defined.
2015-04-17 11:15:49 +10:00
Dmitry Smirnov
59b63188cb
eliminating {Two-argument "open"}/{Bareword file handle}. See pages 202,204 of PBP. (Severity: 5)
2015-04-17 09:33:06 +10:00
Dmitry Smirnov
3d512dbada
eliminate Subroutine prototypes
2015-04-17 09:22:47 +10:00
Dmitry Smirnov
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
Isaac Connor
1668949f18
Merge pull request #792 from knnniggett/perl
...
cmake - use perl INSTALLDIRS
2015-04-15 11:07:14 -04:00
Andrew Bauer
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -05:00
Andrew Bauer
0cf82a0b71
Allow user to override perl installation. Replace old perl cmake vars with new.
2015-04-10 12:09:01 -05:00
Andrew Bauer
e6631ebaf1
Propagate new perl changes to the ONVIF perl modules
2015-04-09 20:11:32 -05:00
abauer
a2d9c0c042
Don't copy .in files into staging
2015-04-08 12:22:46 -05:00
Andrew Bauer
e895fd26f7
cmake - use perl INSTALLDIRS
2015-04-07 08:19:21 -05:00
Dmitry Smirnov
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
Andrew Bauer
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05:00
Dmitry Smirnov
b0faa138bd
POD: added missing NAME sections
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:07:03 +11:00
Dmitry Smirnov
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
Emmanuel Papin
9929233e75
Merge branch 'master' into plugin_support_test
...
Conflicts:
configure.ac
web/lang/fr_fr.php
2015-02-25 23:14:25 +01:00
Andrew Bauer
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
Andy Bauer
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
Emmanuel Papin
d070b36aec
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2014-12-31 12:23:26 +01:00
Isaac Connor
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -05:00
Emmanuel Papin
d961831355
Fix conflict when merging upstream master
2014-12-13 19:54:54 +01:00
Isaac Connor
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
Emmanuel Papin
dde1e13f22
Merge branch 'master' into plugin_support
2014-11-21 14:02:12 +01:00
Isaac Connor
f8dd2c6eaf
Merge branch 'master' into controlversionfixes
2014-11-19 12:53:28 -05:00
manupap1
dac1756d0d
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
2014-11-14 10:55:05 +01:00
Andrew Bauer
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
jmcastro2014
5fe0b84b3c
Create 3S.pm
...
3S API Control Protocol Module
2014-11-12 08:40:35 -03:00
manupap1
7ff86427b3
Add config options for plugins in web ui
2014-11-11 23:40:42 +01:00
Isaac Connor
17e38560d6
just update the perldoc parts
2014-11-06 10:02:34 -05:00
Isaac Connor
4863ce96a3
remove annoying warning.
2014-10-31 14:12:36 -04:00
Isaac Connor
c9c6c17699
add script for TVIP862IC. Should also work with IP672 and others.
2014-10-22 15:08:58 -04:00
Isaac Connor
e23c756ca4
Revert "replace uri_encode with uri_escape"
...
This reverts commit ce5396f4ea
.
2014-10-21 15:17:34 -04:00
Isaac Connor
ce5396f4ea
replace uri_encode with uri_escape
2014-10-21 09:47:31 -04:00
Isaac Connor
5dedbc2135
detect when the control address has a http in front, and do the right thing
2014-10-20 16:55:24 -04:00
Isaac Connor
a043526994
Merge pull request #462 from knnniggett/memory
...
Fix for shared data size conflict
2014-10-17 09:18:21 -04:00
Isaac Connor
58b826b0a2
more url documentation
2014-10-15 13:14:56 -04:00
Isaac Connor
348538b778
distros/ubuntu1204/changelog
2014-10-15 13:14:19 -04:00
Sune1337
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
Andrew Bauer
9c8419f89a
detaint to keep perl from complaining
2014-10-10 09:03:30 -05:00
Andrew Bauer
19482851ff
New method to determine bitness
2014-10-10 08:10:03 -05:00
Andrew Bauer
56fd08d6e9
Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR
2014-10-05 09:42:47 -05:00
Jan M. Hochstein
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
Andrew Bauer
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
Isaac Connor
980a7a83bf
Add some text referencing the settings on the monitor settings page
2014-08-21 10:04:08 -04:00
Isaac Connor
7cbb079370
revert size check for now
2014-08-04 11:26:33 -04:00
Andrew Bauer
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05:00
Isaac Connor
a87f75eee0
any size discrepancy is caused for bailing
2014-08-01 11:27:51 -04:00
Florian Asche
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
Andrew Bauer
3513f87163
Fix for shared data size conflict
2014-07-07 15:56:56 -05:00
Andrew Bauer
fbf4de5eb2
Update Wanscam.pm
...
No longer needed for zm 1.27
2014-03-19 11:56:08 -05:00
Andrew Bauer
faacea50ef
Update Wanscam.pm
...
Use full package name when using ZM_VERSION
2014-03-19 11:52:58 -05:00
Isaac Connor
626c7bd6b7
pull this from the Wiki
2014-03-19 11:57:42 -04:00
Andrew Bauer
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
tim
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
Andrew Bauer
5ccfa305d3
Merge pull request #294 from knnniggett/glob_ptz_scripts
...
glob ptz scripts under control folder
2014-01-06 08:50:48 -08:00
Isaac Connor
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05:00
Andrew Bauer
0eac723409
glob ptz scripts under control folder
2014-01-01 12:17:13 -06:00
Dmitry Katsubo
20dd76b354
Using the full path for ZM_VERSION. Using "Control Device" value for user/password.
2014-01-01 13:16:53 +01:00
Dmitry Katsubo
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
Andrew Bauer
b5e4e1e573
Update FI8608W_Y2k.pm
...
Fix typo
2013-12-21 11:32:47 -06:00
Kyle Johnson
2cadb3c5a6
Fixed a small typo in ConfigData.pm.in
2013-12-21 10:55:36 -05:00
Isaac Connor
9e7d729ca8
use the full path for ZM_VERSION
2013-12-17 12:06:14 -05:00
Isaac Connor
2ced76c20d
do this one too
2013-12-17 11:24:33 -05:00
Isaac Connor
8777295468
use fully specified version
2013-12-17 11:23:03 -05:00
Isaac Connor
1d338ed879
more
2013-12-16 16:36:12 -05:00
Isaac Connor
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
Kyle Johnson
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
Patrick McGuire
8c0ad352f5
Fix shared memory errors on centos 6.4
2013-11-08 14:53:01 -05:00
Isaac Connor
f4dfd88d9f
handle bad config lines better
2013-11-06 17:02:01 -05:00
Kfir Itzhak
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
Isaac Connor
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05:00
Kfir Itzhak
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
Kfir Itzhak
1d0e721ba2
Attempt to get the perl modules to be fully out of source during an out-of-source build
2013-11-03 00:20:49 +02:00
Isaac Connor
d428c832e7
blah
2013-11-01 09:50:50 -04:00
Kfir Itzhak
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
Kfir Itzhak
36f525efae
Correctly hard code man dir path into cmake this time hopefully
2013-10-29 12:43:28 +02:00
Kfir Itzhak
604b7f4ccc
Clean files generated by MakeMaker when running cmake's make clean target
2013-10-29 11:21:23 +02:00
Kfir Itzhak
23ec8266d9
Hard code man dir path into cmake to fix issues with some distros
2013-10-29 11:02:47 +02:00
Kfir Itzhak
0143969498
Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled
2013-10-29 10:01:29 +02:00
Kfir Itzhak
b558d42cdc
Improvements to cmake: Better support for CMAKE_PREFIX_PATH enviroment variable (and similar ones), added ZM_PERL_SUBPREFIX and ZM_PERL_USE_PATH options and improved detection of libraries and headers
2013-10-09 15:41:14 +03:00
Kfir Itzhak
ba727a5611
Changed default HTTP version to 1.0 instead of 1.1, as we don't fully support important HTTP/1.1 features such as chunked encoding
2013-10-07 16:57:26 +03:00
Kfir Itzhak
1609fd688b
Changed default option of ZM_COLOUR_JPEG_FILES to no. It impacts performance and is not needed anymore, all modern image viewers support grayscale JPEG images
2013-10-07 16:54:13 +03:00