941 Commits

Author	SHA1	Message	Date
SteveGilvarry	3ce620eb89	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-02-27 19:46:56 +11:00
Andy Bauer	7a42a8c3f9	add Netcat ONVIF compatible ptz control	2016-02-24 10:15:59 -06:00
Isaac Connor	826a22a2a8	add missing .	2016-02-19 11:07:06 -05:00
Isaac Connor	3b07b56400	Use more descriptive names for the channels	2016-02-19 11:05:55 -05:00
Isaac Connor	64c5b64068	Log error before croaking and include port# in the error message	2016-02-19 11:04:02 -05:00
Isaac Connor	327a01cb20	Log error before croaking and show path to file in the error message	2016-02-19 10:59:40 -05:00
Isaac Connor	3a512f87a5	Log the reason for croaking before croaking.	2016-02-19 10:57:52 -05:00
Isaac Connor	d1ba45c56a	include the sock path in the error message and output an error on failure to open pid file	2016-02-16 10:02:30 -05:00
Andy Bauer	b718bd298f	Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ	2016-02-09 06:56:38 -06:00
Dmitry Smirnov	5bcc414038	codespell: misc. spelling corrections ... Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>	2016-02-08 20:41:36 +11:00
Isaac Connor	9ace6c518d	Merge pull request #1225 from Simpler1/profiles ... Added profiles for Wanscam-HW0025 and IPCC-7210W	2016-02-04 11:55:48 -05:00
Isaac Connor	d3755611c5	Merge pull request #1247 from bodegard/master ... Corrected DB update version comments, fixed typos, and skin font modification	2016-02-04 11:54:02 -05:00
Isaac Connor	52e16dbdd0	Merge pull request #1249 from knnniggett/pelcop ... Fix PelcoP checksum calculation	2016-02-04 11:52:51 -05:00
Andrew Bauer	748754a213	Merge pull request #1209 from adamreiser/StrictKeyChecking ... Strict key checking	2016-02-04 10:07:19 -06:00
SteveGilvarry	7301e803ed	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h	2016-01-30 15:45:08 +11:00
Andy Bauer	fa168027b3	Fix PelcoP checksum calculation	2016-01-24 07:45:04 -06:00
Andrew Bauer	50b113cd02	Merge pull request #1189 from marcolino7/master ... PTZ - Added autostop to Down command on FI8918W	2016-01-24 07:40:30 -06:00
Brandon Odegard	9c72579c2e	Corrected typo in function info	2016-01-22 12:12:39 -06:00
Andy Bauer	66c66106f5	Process off+time delay condition	2016-01-15 20:31:31 -06:00
Isaac Connor	f0486e5b5e	fix dumb mistake, undefing ZM_SERVBER_ID after setting it.	2016-01-04 22:07:07 -05:00
Simpler1	1432c6ae1f	Added profiles for Wanscam-HW0025 and IPCC-7210W	2016-01-04 12:30:46 -05:00
Andrew Bauer	fc5de5a4f3	Merge pull request #1215 from ZoneMinder/multi-server ... Multi server	2016-01-01 21:50:31 -06:00
Isaac Connor	54bff42fa0	Remove warnings when no server set	2016-01-01 21:27:30 -05:00
Andrew Bauer	c827f55580	Merge pull request #1040 from ZoneMinder/multi-server ... Multi server	2016-01-01 09:36:04 -06:00
Adam Reiser	659b3f37f5	Stylistic fix	2015-12-29 21:08:24 -08:00
Adam Reiser	28bf4dfe7b	Add option for strict host key checking	2015-12-29 16:34:11 -08:00
SteveGilvarry	1ff2043774	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-12-23 19:24:08 +11:00
Isaac Connor	39bcb20dac	Skip directories that have non-digits in them	2015-12-22 12:59:37 -05:00
Isaac Connor	1aa79c306b	Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server	2015-12-22 09:47:45 -05:00
Isaac Connor	dfd7986c01	Merge branch 'master' into multi-server ... Conflicts: distros/debian_cmake/links distros/ubuntu1504_cmake/zoneminder.postinst	2015-12-21 12:57:45 -05:00
Isaac Connor	118dc12ad5	id => Id	2015-12-21 11:25:17 -05:00
Isaac Connor	f6d52e77b9	it is important to return the object from the constructor	2015-12-21 11:13:21 -05:00
Isaac Connor	ac88867fd2	fix namespace for dbh	2015-12-21 11:10:24 -05:00
Isaac Connor	8682b1af28	rough in a Storage class for the perl side of things	2015-12-21 11:03:53 -05:00
SteveGilvarry	e28e3c2b75	Merge branch 'master' into feature-h264-videostorage	2015-12-20 14:13:30 +11:00
arjunrc	27b1b37d5b	added opt_use_api	2015-12-19 17:43:36 -05:00
Marco	62095b30d0	Added autostop to Down command	2015-12-16 16:58:20 +01:00
Isaac Connor	39e396eb6e	Merge branch 'master' into multi-server	2015-12-09 10:36:51 -05:00
Isaac Connor	ac23efebef	Merge pull request #1184 from ZoneMinder/TV-IP862_new_firmware ... Add code to detect the change in REALM from older to newer firmware	2015-12-09 10:36:27 -05:00
Isaac Connor	7c298c58ed	Add code to detect the change in REALM from older to newer firmware	2015-12-08 16:20:38 -05:00
SteveGilvarry	5390605797	Add v to front of version string in version->parse to force conversion of decimal to dotted decimal versions, and change from ge to > to prevent reapplying current version	2015-12-03 10:23:19 +11:00
SteveGilvarry	220ee5e516	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-11-29 13:17:22 +11:00
Isaac Connor	4d6c4355db	Merge branch 'master' into multi-server	2015-11-20 16:07:50 -05:00
Isaac Connor	d231ac4533	remove comment at end of line	2015-11-10 14:46:12 -05:00
Robin Daermann	49a89b75a8	More verbose error reporting	2015-11-09 16:15:53 +01:00
Robin Daermann	a942b22541	Add camera control module for Vivotek ePTZ protocol	2015-11-04 17:12:07 +01:00
Isaac Connor	44168ce05e	Merge branch 'master' into multi-server	2015-10-30 11:29:03 -04:00
SteveGilvarry	d45cf9607b	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2015-10-28 08:12:46 +11:00
Kyle Johnson	1cce60f6ec	Update version check URL	2015-10-23 11:45:32 -06:00
SteveGilvarry	d8494aba2d	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ... Conflicts: src/zm_monitor.cpp src/zm_monitor.h src/zm_remote_camera_rtsp.h web/skins/classic/views/monitor.php	2015-10-23 22:07:22 +11:00