673 Commits

Author	SHA1	Message	Date
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
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	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
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