Commit Graph

52 Commits

Author SHA1 Message Date
Kfir Itzhak ff9a26273c cURL is now working! 2013-12-27 18:02:32 +02:00
Kfir Itzhak 89cfb96855 Merge pull request #277 from ebarnard/libvlc
Add libVLC source type
2013-12-22 13:01:19 -08:00
Kfir Itzhak e9bb632a78 Remove zmfix 2013-12-22 16:08:17 +02:00
Edward Barnard aa6380c4bd Might now build with autotools. 2013-12-19 23:15:16 +00: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 36f25c7ffb add -fno-inline from ubuntu package 2013-04-29 15:31:55 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
stan f9022778f7 Fixed template instantiation
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3661 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:45:54 +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 e11a5700c7 Removed -frepo line
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3244 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:07 +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
jaidhar 733eef46bd XML Plugin: Adding zmstreamer to application source
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3183 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-09 20:48:34 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan 23d82a7e03 Added FFMPEG camera type
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
stan f7ebe7a05e Updates for changed SDP parsing method.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2713 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-16 12:18:50 +00:00
stan 9c1f2e22df Fixed file list, wrong extensions and threadata.cpp not in extr dist
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2602 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-24 17:08:24 +00:00
stan 4c2c4199ca Fixed to compile with recent ffmpeg
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2601 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-24 16:57:39 +00:00
stan aa26ab7b18 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:35:59 +00:00
stan 799ee78675 Bug 471 - Compiler warnings, sorted out types and general format tidying
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2357 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-13 13:36:12 +00:00
stan 97d259bed1 Cosmetic changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2282 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-01-13 17:48:01 +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 a0b3e2a5a3 Bug 308 - Added improved signal handling and backtracing.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1916 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-05 12:22:27 +00:00
stan 601f021e27 Changed references to .z files in distribution to correct one.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1691 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-19 16:51:55 +00:00
stan 65f7cf09b5 Bug 216 - Zone polygons
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1630 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-29 17:51:06 +00:00
stan 848630b2a7 Added uninstall hook to complete uninstall.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1590 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-11-16 10:24:03 +00:00
stan ab2d99160e Bug 104 - Monitors can now read images from disk files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1522 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-17 21:55:02 +00:00
stan 209f65e10f Bug 76 - Now supports CVS ffmpeg.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1497 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-10-03 20:38:40 +00:00
stan e56123b8c0 Totally revamped authentication for zms and zmu
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1226 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-01-19 01:50:24 +00:00
stan 72da78e98a Added zm.conf feature.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1170 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-12-28 16:46:48 +00:00
stan a38d4e5bfc Now also fixes serial ports.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1082 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-08-11 15:18:01 +00:00
stan 9e5d19bf8a Now installs a nph version of zms.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@952 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-14 18:26:09 +00:00
stan 84dd33ade1 Added regular expression and memory buffer files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@944 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-13 14:06:53 +00:00
stan 3d245e1ab0 Merged in MPEG streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@916 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-03-04 15:05:54 +00:00
stan b5500a20c1 Reformatted file lists.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@871 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-02-19 13:14:09 +00:00
stan 0aafd9d30b Applied Ian@zestysoft changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@744 e3e1d417-86f3-4887-817a-d78f3d33393f
2004-01-14 21:26:47 +00:00
stan cd3900bb14 Added _defines header to Makfile.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@613 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-07-08 09:23:13 +00:00
stan 9c3bf369c0 Changes to support dynamic config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@589 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-07-03 22:07:31 +00:00
stan 39bf5870d9 Added zmf to Makefile.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@507 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-04-22 14:14:03 +00:00
stan 9ced990925 Changed install-data-local to install-data-hook
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@427 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-26 22:12:03 +00:00
stan aa9f571b56 Updated to reflect new web naming conventions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@420 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-26 12:42:17 +00:00
stan 5d1961ba7b Fixed zmcfg -> zm_config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@418 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-26 12:18:53 +00:00
stan e0f7d80844 Updated to support file reorganisation and remote cameras.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@413 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-26 12:02:41 +00:00
stan 990dc4e990 Updated with latest autoconf and automake.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@397 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-03-20 22:37:59 +00:00
stan be1d4b9814 Removed zmcfg.h from the distribution.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@339 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-01-15 15:40:06 +00:00
stan 976213db77 Updated for different generated files and extra distribution files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@336 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-01-15 15:12:40 +00:00
stan c0e681f413 Added zmwatch and zmfix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@244 e3e1d417-86f3-4887-817a-d78f3d33393f
2003-01-07 10:44:25 +00:00
stan 1fa7019113 Fixed problem with cgi programs, bit of a hack.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@176 e3e1d417-86f3-4887-817a-d78f3d33393f
2002-12-11 00:21:52 +00:00
stan e8732da7aa Added further options to configure script.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@173 e3e1d417-86f3-4887-817a-d78f3d33393f
2002-12-10 23:02:35 +00:00
stan d933452e1a Updated custom installs.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@172 e3e1d417-86f3-4887-817a-d78f3d33393f
2002-12-10 21:27:29 +00:00