Commit Graph

828 Commits

Author SHA1 Message Date
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 9ce7da4147 Don't 'use Data::Dumper'; it was only there for debug 2014-10-20 16:47:03 -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
Isaac Connor 9eb88d3f15 add a check for db connection to handle the db going away and coming back 2014-10-15 09:43:00 -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 1a5844afef auto-recreate missing folders during startup 2014-10-05 11:25:41 -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
Kyle Johnson 4d579e239a Merge pull request #502 from knnniggett/systemd-2
Initial systemd support.
2014-09-03 15:59:42 -04:00
Isaac Connor 980a7a83bf Add some text referencing the settings on the monitor settings page 2014-08-21 10:04:08 -04:00
Andrew Bauer ad364d090a rename and process zmsystemctl.pl.in 2014-08-19 17:19:44 -05:00
Andrew Bauer 411d77dc7f remove obsoleted code 2014-08-13 19:02:59 -05:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05: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
Isaac Connor d5a7a1849a make zmupdate re-run the most recent update. 2014-07-29 09:47:22 -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
Isaac Connor 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
Martin Hagelin 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
barjac fd9e808fe1 Update zmupdate.pl.in
Fix typo 'from' version replaced with 'to' version.
2014-03-24 13:35:53 +00: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 189d9938cc Add zmcamtool to autotools file manifest 2014-03-16 07:32:18 -05: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
Andrew Bauer 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
Andrew Bauer f5ce597609 final cleanup and changes before 1.27 release 2014-02-01 12:17:46 -06:00
Andrew Bauer e707e72fe3 Perl::Critic recommended a couple minor changes 2014-01-25 12:42:33 -06:00
Andrew Bauer dbe6fc539c Additional error checking 2014-01-25 11:26:29 -06:00
Andrew Bauer ae1731477b further refinements 2014-01-25 10:39:38 -06:00
Andrew Bauer 2037afb3ca new subroutine runQuery 2014-01-23 08:41:47 -06:00
Andrew Bauer 869a139809 create rmName subroutine 2014-01-22 19:18:08 -06:00
Andy Bauer 91b0676343 Call checkName for certain reptitive tasks 2014-01-22 09:20:56 -06:00
Andrew Bauer f00e72be1e Initial commit for new zmcamtool.pl script 2014-01-21 16:22:30 -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
Kyle Johnson faaf237731 Revert "Broke zmfilter.pl.in in order to test travis"
This reverts commit acc158f3cb.
2014-01-04 15:10:15 -05:00
Kyle Johnson acc158f3cb Broke zmfilter.pl.in in order to test travis 2014-01-04 15:04:14 -05:00
Isaac Connor d185f05006 robustness/code style changes 2014-01-03 12:55:30 -05:00
Isaac Connor 3d55dde548 COnfig fixes 2014-01-03 09:33:49 -05:00
Kyle Johnson c5afecc2b4 Revert "Introducing a bug in zmfilter.pl.in to test travis"
This reverts commit 337750430b.
2014-01-02 12:15:06 -05:00
Kyle Johnson 337750430b Introducing a bug in zmfilter.pl.in to test travis 2014-01-02 12:02:07 -05:00
Kyle Johnson 07b4d83d74 Have Usage() in zmcontrol.pl exit 0 instead of -1 2014-01-02 11:50:39 -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
Isaac Connor 7b26636bcd Merge pull request #280 from ZoneMinder/zmfixremoval
Remove zmfix
2013-12-22 11:22:18 -08:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02: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 7251a8e1ae fixes to $Config changes, also exit if no EVENT_PATH 2013-12-19 13:41:55 -05:00
Isaac Connor 4d9234089c fix ZM_URL to $Config{ZM_URL} 2013-12-19 13:01:52 -05:00
Isaac Connor 462108583b fix ZM_EVENT_PATH 2013-12-19 12:55:14 -05:00
Isaac Connor 42642937e4 fix ZM_VERSION 2013-12-17 13:05:58 -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
Andrew Bauer b0b471eb5b Update zm.in 2013-12-14 09:13:49 -06:00
Andrew Bauer 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
Kyle Johnson 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
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
Isaac Connor 2775752a41 use proper DBI parameter passing to improve security
remark out call to zmupdate.pl -f
2013-12-06 16:46:21 -05:00
Isaac Connor 150b3a0e7a document interactive command line option
only do innoDB upgrade if interactive
2013-12-06 13:47:39 -05:00
Bartek Zdanowski f6dca0f575 Fixing bug that stops installation/upgrade if DB is already at current version 2013-11-20 10:39:51 +01:00
Isaac Connor 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
Isaac Connor 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
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 9d5ac7ae8c Fix cmake installing wrong files in an out-of-source build 2013-11-04 09:56:40 +02: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
Isaac Connor 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
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
Andrew Bauer 54a22e7fe8 We need a toggle for x10 support 2013-10-19 09:22:59 -05: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
Kyle Johnson 03d12ef3e4 Point zmupdate to the github pages site (non-https) for version numbers 2013-10-07 10:11:09 -04: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
Andy Bauer 6b11db11ca Update CMakeLists.txt
Need the zm.in file to be processed by CMake
2013-10-06 17:43:59 -05:00
Knniggett 32ee0a8976 create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db 2013-10-05 18:40:54 -05:00
Knniggett d0cbb3f498 remove ${CMAKE_CURRENT_SOURCE_DIR} from add_custom_target 2013-10-05 14:29:12 -05:00
mastertheknife 3dbef94b04 Removed INSTALLDIRS from the cmake perl modules CMakeLists.txt 2013-10-04 22:50:50 +03:00
mastertheknife 5607f2823f Fixed missing perl5 in path in the last commit 2013-10-04 22:40:09 +03:00
mastertheknife 9c3540a952 Attempt to fix issues with perl paths that andy is experiencing 2013-10-04 22:35:16 +03:00
Isaac Connor 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
Isaac Connor 34f84a4097 Merge branch 'v1.26.4-beta' 2013-10-03 10:14:09 -04:00
mastertheknife 79b45bec68 Avoid trouble with whitespaces in current directory path 2013-10-03 15:37:46 +03:00
mastertheknife 883e676e29 Fixed path issues when creating packages (rpms and such) 2013-10-03 15:35:10 +03:00
mastertheknife 489e832cf6 Fixed typo in the last commit 2013-10-03 15:15:59 +03:00
mastertheknife f043c6e955 Changed perl paths again, this time to <prefix>/<libdir>/perl5 and few improvements 2013-10-03 15:08:09 +03:00
mastertheknife 5fce4c516b Perl modules will be now be installed in <prefix>/<datadir>/zoneminder/perl5 2013-10-01 17:38:51 +03:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Isaac Connor 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
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Isaac Connor e21a08c4b6 new code to look for update scripts instead of having distinct lines for each 2013-09-12 14:40:02 -04:00
Andy Bauer 0bf9aacab2 Update zmupdate.pl.in for 1.26.3 release 2013-09-10 12:46:33 -05:00
mastertheknife caa73f608b Merge remote-tracking branch 'origin/develop' 2013-09-09 16:44:58 +03:00
Kyle Johnson 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
Knniggett 8f3d95fd38 modify zmupdate.pl.in 2013-09-07 15:11:57 -05:00
Isaac Connor 9c7f02e8c0 Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
Conflicts:
	scripts/zmupdate.pl
2013-09-06 14:44:21 -04:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -04:00
Kyle Johnson 4cc878e930 Merge branch 'release-1.26' into develop
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
Chris Wiggins d6440ca70e Change repo to ZoneMinder for pull request 2013-09-05 23:50:51 +12:00
Chris Wiggins e792c8eb44 Move version check from zoneminder.com to repository 2013-09-05 23:40:03 +12:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Kyle Johnson 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
Kyle Johnson 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
Andy 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
Knniggett 8608250b06 This adds PTZ control files and camera presets for specific ptz cameras. 2013-08-22 13:20:38 -05:00
Andy 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
Isaac Connor 3afad1a0a8 have to override ZoneMinder::Database::ZM_DB_USER, etc instead of just ZM_DB_USER. 2013-08-20 15:13:50 -04:00
Isaac Connor 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
Kyle Johnson 0a79e4a975 1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38 2013-08-15 09:08:51 -04:00
Isaac Connor 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
Isaac Connor c014f3faaa delete generated files 2013-08-13 10:06:37 -04:00
Kyle Johnson 1888bec092 Doing my best to manually remove nextime's plugin architecture while keeping his other changes. 2013-08-13 09:43:23 -04:00
Isaac Connor 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
Isaac Connor 3a8481a591 cleanup 2013-05-10 14:02:22 -04:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor 7cf5475542 Merge ../ZoneMinder-kfir into kfir-proper
Conflicts:
	configure
	src/Makefile.am
	src/Makefile.in
2013-05-02 21:28:51 -04:00
Isaac Connor ca4e6b455e look for script in installed bath, not build location 2013-04-29 13:46:37 -04:00
Isaac Connor d458c145a3 Add Brian Rudy's script to control SkyIPCam cameras. 2013-04-29 12:04:12 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 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
stan 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
Kfir Itzhak 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
Kfir Itzhak 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
Kfir Itzhak 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