39ee845ff0
Updated 9831W foscam script
2015-06-19 12:58:40 -04:00
3f20a08d16
Add cmake support
2015-05-31 02:37:58 +02:00
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
d509861f9e
Merge pull request #838 from ZoneMinder/zmaudit_update1
...
Zmaudit update1: Make MIN_AGE Configurable
2015-05-21 12:10:08 -05:00
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
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
630c8f335f
Merge master
2015-05-05 23:37:20 +02: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
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -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
3e8c894a3e
Update ConfigData.pm.in
2015-04-04 09:20:21 -05: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
9929233e75
Merge branch 'master' into plugin_support_test
...
Conflicts:
configure.ac
web/lang/fr_fr.php
2015-02-25 23:14:25 +01: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
d070b36aec
Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support
2014-12-31 12:23:26 +01: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
d961831355
Fix conflict when merging upstream master
2014-12-13 19:54:54 +01: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
dde1e13f22
Merge branch 'master' into plugin_support
2014-11-21 14:02:12 +01:00
f8dd2c6eaf
Merge branch 'master' into controlversionfixes
2014-11-19 12:53:28 -05:00
dac1756d0d
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support
2014-11-14 10:55:05 +01: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
7ff86427b3
Add config options for plugins in web ui
2014-11-11 23:40:42 +01: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
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
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
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
980a7a83bf
Add some text referencing the settings on the monitor settings page
2014-08-21 10:04:08 -04: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
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
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
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
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
d185f05006
robustness/code style changes
2014-01-03 12:55:30 -05: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
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
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
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
8c0ad352f5
Fix shared memory errors on centos 6.4
2013-11-08 14:53:01 -05:00
f4dfd88d9f
handle bad config lines better
2013-11-06 17:02:01 -05:00
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
d428c832e7
blah
2013-11-01 09:50:50 -04:00
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
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
60258e7aa1
Check the size of the mmap file before mmaping it. If the mmap file 0 ( can happen with remote cameras that can't be reached because it is offline ) we get sigbus. I think the mmap succeeds, but is zero sized, so the first access causes SIGBUS.
2013-10-04 11:54:21 -04:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
4cc878e930
Merge branch 'release-1.26' into develop
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
8608250b06
This adds PTZ control files and camera presets for specific ptz cameras.
2013-08-22 13:20:38 -05:00
c014f3faaa
delete generated files
2013-08-13 10:06:37 -04:00
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
d458c145a3
Add Brian Rudy's script to control SkyIPCam cameras.
2013-04-29 12:04:12 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
f27b424503
Much more progress!
...
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
0932f50d80
1) Added the image size and format to the shared memory. This is useful for viewer applications relying on the shared memory.
...
2) Small changes to improve the response time of the DVR controls. Going through frames in a paused event is now much faster.
2012-03-22 08:30:57 +02:00
60a042e44b
Fixed an error in zmMemWrite(), breaking shared memory writes from perl, which prevented zmtrigger.pl (and perhaps others) from working.
2012-03-12 19:52:53 +02:00
de2df49d64
1) Added support for the new formats to the mpeg code.
...
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
2012-02-01 07:33:20 +02:00
8ac3dda54b
1) Removal of the ZM_LOCAL_BGR_INVERT option.
...
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
2012-02-01 07:33:20 +02:00
b0bc227232
1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
...
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
2012-02-01 07:33:20 +02:00
Pliable Pixels
Emmanuel Papin
Andrew Bauer
Isaac Connor
Andrew Bauer
Dmitry Smirnov
jmcastro2014
Isaac Connor
Sune1337
Jan M. Hochstein
Florian Asche
tim
Dmitry Katsubo
Kyle Johnson
Patrick McGuire
Kfir Itzhak
Isaac Connor
Isaac Connor
Kyle Johnson
nextime