ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,661 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

393 Commits

Author SHA1 Message Date
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
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 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 ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
mastertheknife caa73f608b Merge remote-tracking branch 'origin/develop' 2013-09-09 16:44:58 +03: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
Knniggett 8608250b06 This adds PTZ control files and camera presets for specific ptz cameras. 2013-08-22 13:20:38 -05: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 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 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -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
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
Kfir Itzhak 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
Kfir Itzhak 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
Kfir Itzhak 4a59761bcc Getting closer and closer everyday. 
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
 2012-02-01 07:33:20 +02:00
stan 13e46d8595 Improved makePath and tweaks to createEvent 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3522 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-11-11 10:08:49 +00:00
stan dacb1f2a27 Added event creation functions for scripted events, not entirely complete. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3521 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-11-10 22:56:21 +00:00
stan 1e80d72ddd Fixed line endings. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3507 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-26 09:10:22 +00:00
stan b64c506659 Added SFTP upload option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 14:10:20 +00:00
stan a3ba83aca4 Typo 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3498 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-23 08:46:59 +00:00
stan 6df4a71336 Fixed event paths when using absolute paths. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3490 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 11:31:29 +00:00
stan 65b0213960 Minor typo. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3475 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-30 21:18:46 +00:00
stan 0d2a635689 Set up auto commit and auto reconnect on Logger database connection. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3473 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-28 11:06:02 +00:00
stan c3510148a6 Detaint JSON before decoding. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3466 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-24 09:04:54 +00:00
stan 60cd56569e Fixed default initialisations 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3464 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-24 08:31:47 +00:00
stan 8082f491db Fixed problem with environment variable parsing and detainting. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3461 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-23 21:12:47 +00:00
stan 241cb5f84a Fixed undefined variable issues with debug 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3460 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-06-23 21:12:18 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan e9865320e7 Prevent memory handles from leaking when polling monitors 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3360 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-25 08:27:46 +00:00
stan c4af20ecc2 Added comment about PHP graphics needing to be installed for resampling to work. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3354 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 16:03:14 +00:00
stan 7d3844f39a Trap errors in JSON encoding and decoding 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3352 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 15:16:26 +00:00
stan 60b66b909a Added basic JSON encoding and decoding functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3349 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-23 13:15:42 +00:00
stan ee5d8db0cd Moved the runCommand function into the library plus shell detection. Should have been there anyway. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3343 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-05-16 22:54:37 +00:00
stan e0633998f9 Changed extra debug log location to the temporary directory. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3329 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-04-26 15:50:02 +00:00
jaidhar e3f8bdb6cd XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-19 20:25:54 +00:00
stan 88e5abaa6e Amended comment on FAST_IMAGE_BLENDS config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3300 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-15 11:18:10 +00:00
stan e91795a619 Removed netpbm options 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3295 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-02-11 14:50:04 +00:00
stan 26882df7e3 Made deep storage the default. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3271 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-31 09:02:19 +00:00
stan 4178ac9731 Replaced missing :all tags 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3269 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-31 08:54:25 +00:00
stan 20785810f0 Removebosus dependencies. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3250 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-24 10:57:38 +00:00
stan d67d19dc4f Removed dependency on DB existing for config generation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3245 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-21 23:53:36 +00:00
stan df0d6919c9 Added v4l2 interlacing control 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3230 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-20 18:49:42 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-07 11:10:18 +00:00
stan eb0952d9a4 Fixed some issues with triggering and Unix sockets in particular 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3220 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-01-05 17:33:45 +00:00
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:09:18 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML 
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-18 19:08:33 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-12 04:26:31 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 05:25:43 +00:00
stan e35dbae526 Removed USE_STREAMS config and moved CAN_STREAM and STREAM_METHOD to be bandwidth specific. Added further bandwidth config into phone bandwidth. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3163 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-03 16:03:42 +00:00
stan f0e7aaf6db Made mapped memory files not hidden 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2999 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-12-02 18:37:24 +00:00
stan 32c3bd6c98 Added return of status to executeShellCommand function 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2968 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-10-08 20:20:54 +00:00
stan 034f37cf4b Applied contributed patch. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-25 18:03:46 +00:00
stan a02eba25ff Minor mpeg format and config changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2868 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-05-08 15:24:39 +00:00
stan 61089eeeb1 Added authentication hashed logins. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-19 14:06:39 +00:00
stan 3a86651627 Reworked multi-buffering etc for V4L multi-sources. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2775 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-17 21:23:27 +00:00
stan cde8ea20bb Detainted mmap paths so delete works. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2772 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-17 12:37:32 +00:00
stan e64312e48c Corrected so mapped memory files are removed by package script. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2771 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-17 12:32:03 +00:00
stan d6de709ba3 Additional debug when getting shared memory conflicts. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2760 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-12 22:47:04 +00:00
stan d421fd5c50 Typo 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2752 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-09 20:28:43 +00:00
stan 25a25922bc Added mjpegStreamer control library 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2751 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-09 15:02:36 +00:00
stan 5137b829c2 Typo 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2749 e3e1d417-86f3-4887-817a-d78f3d33393f
 2009-02-09 14:43:13 +00:00
stan 73900f933b Tersified some of the config hints. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2702 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-12-05 23:11:36 +00:00
stan 86f562ffe4 Added swf into allowed video formats list 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2666 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-14 13:49:44 +00:00
stan b9e39cbede Added auto check for ffmpeg and netpbm tools 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2665 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-10-14 13:49:18 +00:00
stan 435c469d4b Added DUMP_CORES option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2639 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-29 11:43:43 +00:00
stan c207e7720f Changed force close events to more general setting allowing long events to be closed after alarm. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2630 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-09-25 11:18:55 +00:00
stan 106882c161 Updated copyright notices 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 09:48:16 +00:00
stan 80a16065da Fixed incorrect package names in memory packages. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2606 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-25 08:39:14 +00:00
stan 14a05cac4a Added event migration (to deep storage) function. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2586 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 15:56:59 +00:00
stan 31e342b608 Bug 484 - Added method of checking last analysis time plus belatedly added modules to SVN 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2579 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-21 14:45:48 +00:00
stan e722c6a5a4 Slight hack to get PTZ Protocol instead of remote cam protocol 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2548 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 13:04:35 +00:00
stan 29f38274e4 Added Axis MPEG config and deprecated some old config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2547 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-16 08:45:50 +00:00
stan c58b322a6e Merged in mpeg_encode removal 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2520 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-14 15:56:52 +00:00
stan b2f616ff21 Merged in mmap changes. Revision 2323:2515 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2516 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-07-14 15:21:16 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00
stan 6acbc11296 Added POSIX lib call for strftime 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2313 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-16 18:39:59 +00:00
stan 6078e93c09 Updated for version 1.23.2 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2312 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 23:57:00 +00:00
stan b6fc0b2628 Bug 447 - Added getEventPath function and changed scripts to use it. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2302 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 22:41:17 +00:00
stan 8b59c84270 Bug 450 - Added version to config var for zmupdate to work out old version. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2300 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-13 22:38:58 +00:00
stan 61b4ad669e Bug 447 - Fixed problems with deep storage file system deleting too many files. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2296 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-10 22:17:32 +00:00
stan abab524930 Bug 449 - Made Ajax request timeouts configurable. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2289 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-02-10 21:52:44 +00:00
stan a41e39f431 Updated to 1.23.1 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2279 e3e1d417-86f3-4887-817a-d78f3d33393f
 2008-01-03 20:31:05 +00:00
stan 97dd987315 Bug 427 - Allow aspect ratio to be preserved in monitor size changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2271 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-29 18:48:16 +00:00
stan 860e6026ad Updated version number. Not sure if this file should be in CVS. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2249 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-12-08 18:37:34 +00:00
stan 4b1716062e Fixed PTZ control for non-Pelco protocols. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2229 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-11-04 17:30:29 +00:00
stan 401b4f73ef Fixed issue swith db dis/connect 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2225 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-20 09:56:24 +00:00
stan 215184e4cb Bug 345 - Added alarm jpeg file quality setting. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2209 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-18 10:58:03 +00:00
stan 3427dfddd2 Bug 42 - Users can now change their own passwords. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2204 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-17 15:49:08 +00:00
stan b4032959e0 Bug 406 - Added ability to indicate mysql connection port in host. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2198 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-07 15:39:44 +00:00
stan 8d905aac99 Bug 400 - Made signal check colour monitor specific. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2193 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-05 15:05:28 +00:00
stan d3977dde5b Fixed glob issues. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2191 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-05 09:07:31 +00:00
stan 07a9f1fa1c Bug 228 - Added deep storage option. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2190 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-09-04 16:08:55 +00:00
stan e6392ba2ce Further work on control protocol modules, removed scripts. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2181 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-30 12:07:42 +00:00
stan bd558af08f Bug 414 - Changed PTZ control functions to use libraries and sockets 
rather than scripts.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2180 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-30 10:43:06 +00:00
stan 50cc4d980f Bug 411 - Merged in DVR functionality. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2175 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-08-29 18:11:09 +00:00
stan 2811d6fb51 Added sql finish statement when loading config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2103 e3e1d417-86f3-4887-817a-d78f3d33393f
 2007-04-03 10:25:08 +00:00
stan ecaf3ac879 Build file changes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2077 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 20:54:54 +00:00
stan 247b94f17b Rmeoved zminit 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2076 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 20:48:57 +00:00
stan cc072e55a6 Removed META.yml 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2065 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 13:29:04 +00:00
stan fd0a44e816 Merged in changes for enhanced triggers and showtext. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2061 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-11-16 11:32:56 +00:00
stan bee6536883 Bug 361 - Added proxy for update checks 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2024 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-10-20 09:41:57 +00:00
stan b01847c332 Bug 354 - Added facility to reopen logs to allow logrotates to work properly. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2003 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-07-04 10:21:53 +00:00
stan 241e98207a Bug 356 - Make default bandwidth rates a dropdown selection as per scales. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2002 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-07-04 10:21:18 +00:00
stan 6adeba6640 Bug 323 - Allowed config file entries to have spaces in 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1972 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-08 13:19:29 +00:00
stan 3db5b4538a Bug 327 - Invalidated shared memory id on any errors. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1964 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-05-08 12:42:39 +00:00
stan 3d4bd1a81f Changed default message text to use new tokens. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1942 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-24 13:24:47 +00:00
stan cbe11fb17c Hid/revealed mail subject body config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1933 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-12 15:17:31 +00:00
stan 3ebdae4c5b Added exports 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1931 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-12 15:15:57 +00:00
stan 08037eb79c Changed default debug id to 'zmundef' 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1930 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-12 15:15:37 +00:00
stan f05de80254 Set to not ignore hdiden config, also commented out core and include config 
as not used any more.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1922 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-04-07 13:55:55 +00:00
stan 12dec07d7f Bug 305 - Changed to use print instead of printf to avoid interpreting formatting chars 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1908 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-31 14:42:53 +00:00
stan 7465244fa7 Bug 301 - Alarm maximum FPS now specified on per monitor basis. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1902 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-31 12:48:37 +00:00
stan dd118888a0 Bug 302 - Added control state scratch area to shared memory. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1899 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-30 13:52:51 +00:00
stan 408a2f0c6d Created preparatory config for mail subject and body. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1885 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-03-23 18:29:18 +00:00
stan d917b96bf3 Bug 276 - Fixed formatting errors on email contents. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1877 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-02-08 15:46:26 +00:00
stan 2875009c3b Bug 282 - Fixed option category to reinstate lost 'images' options. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1875 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-02-08 12:25:35 +00:00
stan 71b4538292 Fixed typo in config override warning. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1858 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-23 16:25:53 +00:00
stan b6f9ed3427 Bug 262 - Warn if using local zm.conf 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1845 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-20 15:18:06 +00:00
stan 096072b3dc Bug 230 - Rationalised thumbnails and put them in temporary cache dir. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1836 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-17 17:07:13 +00:00
stan d732e2ed38 Updated copyright. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1833 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-17 11:32:47 +00:00
stan a9c1066913 Bug 13 - Added support for loss of signal detection. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1814 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 22:48:06 +00:00
stan 93eae6a309 Reorganised config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1812 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 20:56:17 +00:00
stan 3abae3671e Changed die calls to croak. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1810 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 14:12:42 +00:00
stan ba8dd7e374 Added documentation, simplified write spec. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1809 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 14:11:50 +00:00
stan d63ed02b37 Fixed typo in pod. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1807 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 13:42:13 +00:00
stan 365d49734e Bug 245 - Added progress bar options. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1799 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-14 13:34:24 +00:00
stan 26fedbe62a Added pod documentation. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1794 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-13 12:59:29 +00:00
stan 90d8f5f3ef Edited comments and help for config. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1786 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-12 15:32:36 +00:00
stan 2fa83301f7 Failure to open debug log only a warning. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1782 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-12 00:21:18 +00:00
stan 5992087d72 Fixed error message. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1780 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-12 00:08:37 +00:00
stan 1b080c5686 Minor rename. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1774 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-12 00:01:30 +00:00
stan a38532eaa2 Fixed for 64 systems and enhanced. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1766 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-11 23:51:45 +00:00
stan 382cdee867 Bug 248 - Moved log control to module, enhanced interface and documented. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1765 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-11 23:51:20 +00:00
stan bf88773ab7 Bug 247 - Added new zmudit configuration. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1764 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-11 23:50:06 +00:00
stan 600fdb4766 Added pod documentation. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1763 e3e1d417-86f3-4887-817a-d78f3d33393f
 2006-01-11 23:46:57 +00:00
stan 10c3718bcc Made donate reminder time dynamically settable. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1751 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-31 19:13:41 +00:00
stan 0352b65a3e Bug 207 - Changed defaults for some config parms 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1746 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-31 17:13:19 +00:00
stan 0409cad90f Moved trigger classes out to own modules. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1740 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-26 23:11:27 +00:00
stan abdfaaed80 Additional shared memory functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1736 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-23 11:33:55 +00:00
stan 537b9f891e Corrected typos in exports. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1735 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-23 11:33:35 +00:00
stan 52870d6670 Bug 238 - Added max_suspend_time config 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1721 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-22 16:46:45 +00:00
stan 3aff14ed63 Sorted out exports and added new shared memory functions. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1716 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-22 14:37:14 +00:00
stan c49d7191a1 Bug 237 - Added zm.pid in /var/run/zm 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1715 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-21 15:19:57 +00:00
stan 3a1668bc19 Added new function. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1713 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-21 10:29:16 +00:00
stan cd5ae52788 Changed to use double rather than single quotes. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1709 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-21 00:11:51 +00:00
stan 948528bb44 Changed debug to not use constants. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1704 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-20 17:03:33 +00:00
stan c807203df3 Mods to gen zmconfgen.pl to work. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1701 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-20 16:54:59 +00:00
stan 6f60afc936 Removed zmconfig and make config actions part of module. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1700 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-20 16:09:21 +00:00
stan cadaef69e7 Modified perl module structure. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1699 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-20 13:47:26 +00:00
stan 4542cfb305 Updates 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1698 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-20 12:58:35 +00:00
stan 13656a3c50 Added new methods and improved partitioning 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1696 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-20 10:23:16 +00:00
stan 460d69084b Debug refinements. Added Fatal 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1690 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-16 13:36:36 +00:00
stan 7b5cc99c93 Bug 233 - Further debug enhancements 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1688 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-16 13:16:37 +00:00
stan d8e0ce1f74 Added code to export config constants 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1683 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-16 12:16:39 +00:00
stan 36b481d2e6 Bug 232 - Change DB_SERVER to DB_HOST 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1682 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-16 10:37:13 +00:00
stan 821763e2bd Bug 231 - Created ZoneMinder perl module to abstract out common code. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1673 e3e1d417-86f3-4887-817a-d78f3d33393f
 2005-12-16 10:05:29 +00:00