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
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
2775752a41
use proper DBI parameter passing to improve security
...
remark out call to zmupdate.pl -f
2013-12-06 16:46:21 -05:00
f6dca0f575
Fixing bug that stops installation/upgrade if DB is already at current version
2013-11-20 10:39:51 +01:00
7da2cdd159
cleanups, only connect and disconnect once. Remove unncessary require's of DBI
...
cleanup MyISAM to InnoDB code
2013-11-13 11:45:53 -05:00
29e2cdf561
split the innoDB upgrade out of the version section, so that it always checked for MyISAM tables and if found, offers to update them.
2013-11-13 09:42:10 -05: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
be21a882ab
Merge pull request #242 from ZoneMinder/removeversionnumberfromzm.conf
...
Remove ZM_VERSION from zm.conf
2013-11-04 12:27:50 -08:00
7a2f3b5226
add in missing @
2013-11-04 09:57:00 -05:00
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +02:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
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
d428c832e7
blah
2013-11-01 09:50:50 -04:00
72b80d7417
remake this branch off master instead of off mysql2PDO.
...
Establish an automake substitution of @VERSION@ and use it throughotu to override whatever is in zm.conf
2013-11-01 09:47:28 -04:00
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
36f525efae
Correctly hard code man dir path into cmake this time hopefully
2013-10-29 12:43:28 +02:00
604b7f4ccc
Clean files generated by MakeMaker when running cmake's make clean target
2013-10-29 11:21:23 +02:00
23ec8266d9
Hard code man dir path into cmake to fix issues with some distros
2013-10-29 11:02:47 +02:00
0143969498
Do not print progress while building zoneminder perl modules unless CMAKE_VERBOSE_MAKEFILE is enabled
2013-10-29 10:01:29 +02:00
54a22e7fe8
We need a toggle for x10 support
2013-10-19 09:22:59 -05:00
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
03d12ef3e4
Point zmupdate to the github pages site (non-https) for version numbers
2013-10-07 10:11:09 -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
6b11db11ca
Update CMakeLists.txt
...
Need the zm.in file to be processed by CMake
2013-10-06 17:43:59 -05:00
32ee0a8976
create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db
2013-10-05 18:40:54 -05:00
d0cbb3f498
remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target
2013-10-05 14:29:12 -05:00
3dbef94b04
Removed INSTALLDIRS from the cmake perl modules CMakeLists.txt
2013-10-04 22:50:50 +03:00
5607f2823f
Fixed missing perl5 in path in the last commit
2013-10-04 22:40:09 +03:00
9c3540a952
Attempt to fix issues with perl paths that andy is experiencing
2013-10-04 22:35:16 +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
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
79b45bec68
Avoid trouble with whitespaces in current directory path
2013-10-03 15:37:46 +03:00
883e676e29
Fixed path issues when creating packages (rpms and such)
2013-10-03 15:35:10 +03:00
489e832cf6
Fixed typo in the last commit
2013-10-03 15:15:59 +03:00
f043c6e955
Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements
2013-10-03 15:08:09 +03:00
5fce4c516b
Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5
2013-10-01 17:38:51 +03:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
ab4c091693
change eq's to le's so that it runs scripts for upgrading from 1.26.0
2013-09-15 12:59:45 -04:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
e21a08c4b6
new code to look for update scripts instead of having distinct lines for each
2013-09-12 14:40:02 -04:00
0bf9aacab2
Update zmupdate.pl.in for 1.26.3 release
2013-09-10 12:46:33 -05:00
caa73f608b
Merge remote-tracking branch 'origin/develop'
2013-09-09 16:44:58 +03:00
6c134f9b4b
Merge pull request #116 from knnniggett/zmupdate_newrelease
...
Add 1.26.1 and 1.26.2 releases to zmupdate
2013-09-07 19:07:37 -07:00
8f3d95fd38
modify zmupdate.pl.in
2013-09-07 15:11:57 -05:00
9c7f02e8c0
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
...
Conflicts:
scripts/zmupdate.pl
2013-09-06 14:44:21 -04:00
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -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
d6440ca70e
Change repo to ZoneMinder for pull request
2013-09-05 23:50:51 +12:00
e792c8eb44
Move version check from zoneminder.com to repository
2013-09-05 23:40:03 +12:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
52116f9642
Merge pull request #84 from knnniggett/patch-5
...
Update zmupdate.pl.in to give option to convert to InnoDB tables
2013-08-30 18:47:34 -07:00
69f31d9e90
Merge pull request #85 from knnniggett/addptzcameras
...
Add PTZ control files and presets for FOSCAM FI8608W PT, FI8620 PTZ, 9821W PTZ and Loftek Sentinel IP
2013-08-26 09:48:37 -07:00
2f456967f4
edit zmupdate function in init script
...
Noticed the init script was looking for a zm_update, which doesn't exist. My best guess is that this should be changed to zmupdate.pl. This causes zoneminder to reload its configuration from the database prior to startup. Thoughts?
2013-08-22 14:13:22 -05:00
8608250b06
This adds PTZ control files and camera presets for specific ptz cameras.
2013-08-22 13:20:38 -05:00
594a44cbbb
Update zmupdate.pl.in to give option to convert to InnoDB tables
...
When upgrading the zoneminder database to 1.26, this proposed change will ask the user to convert existing MyISAM tables over InnoDB. It first scans for existing MyISAM tables and will skip over any tables that are already converted to InnoDB.
I've tested this on (a copy of) a production database server and have verified it doesn't alter existing tables from a different schema.
And I'm done messing with the zmupdate script. I promise.
I understand if this change is considered outside the scope of a current bug fix release.
2013-08-20 19:49:02 -05:00
3afad1a0a8
have to override ZoneMinder::Database::ZM_DB_USER, etc instead of just ZM_DB_USER.
2013-08-20 15:13:50 -04:00
34bfcb5e7e
add lines to change the ZM_DB_USER and ZM_DB_PASS when the user and password are supplied on the command line.
...
This is neccessary when the regular zm user does not have alter privileges.
2013-08-19 11:19:34 -04:00
0a79e4a975
1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38
2013-08-15 09:08:51 -04:00
940f7a191e
add code to add Colours and Deinterlacing to Monitors table. These were added by mastertheknife's perfpatch.
2013-08-13 11:05:20 -04: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
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
ca4e6b455e
look for script in installed bath, not build location
2013-04-29 13:46:37 -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
4996dd0a51
Recreated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00: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
2fd6e99ec5
1) Rebased to 1.24.4
...
2) Reverted to stock zmdc.pl.in and zmwatch.pl.in because the bugs are fixed
3) Updated configure and Makefile files
2012-02-01 07:33:20 +02:00
Isaac Connor
Kyle Johnson
Kyle Johnson
Andrew Bauer
Dmitry Katsubo
Isaac Connor
Kfir Itzhak
Bartek Zdanowski
Patrick McGuire
Andy Bauer
Isaac Connor
Isaac Connor
Chris Wiggins
nextime
stan