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

315 Commits

Author SHA1 Message Date
Isaac Connor 66e76e4c2e Merge branch 'zm_trigger_improvements' into storageareas 2016-02-19 11:09:41 -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 b7256a6891 Merge branch 'master' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
 2016-02-10 09:17:40 -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 1837cc89ea Merge branch 'schrorg-vivotek-ePTZ' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2016-02-04 12:24:07 -05:00
Isaac Connor 89cff287cd Merge branch 'master' into storageareas 2016-02-04 12:14:16 -05:00
Isaac Connor d65c9d797b fix merge, update to 1.30.1 2016-02-04 12:13:48 -05: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 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
Isaac Connor 11b206e281 fix getPath -> Path 2016-02-01 12:52:14 -05:00
Isaac Connor ff46344175 Use Storage Areas in geteventPath 2016-02-01 12:51:43 -05: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
Isaac Connor 7700623b16 Move SQL debug to Execute 2016-01-13 09:02:37 -05:00
Isaac Connor 270c737f40 Merge branch 'master' into storageareas 2016-01-05 09:36:36 -05:00
Isaac Connor f0486e5b5e fix dumb mistake, undefing ZM_SERVBER_ID after setting it. 2016-01-04 22:07:07 -05:00
Isaac Connor 17adc2b4e5 Rough in a Monitor class 2016-01-04 15:27:42 -05:00
Simpler1 1432c6ae1f Added profiles for Wanscam-HW0025 and IPCC-7210W 2016-01-04 12:30:46 -05:00
Isaac Connor bf2195828f Merge branch 'multi-server' into storageareas 
Conflicts:
	docs/installationguide/index.rst
 2016-01-02 14:42:47 -05:00
Isaac Connor 54bff42fa0 Remove warnings when no server set 2016-01-01 21:27:30 -05: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
Isaac Connor d943488475 add sub Storage 2015-12-24 15:32:30 -05:00
Isaac Connor 177ed076a7 Make zmaudit only look at storage areas that are local 2015-12-24 15:25:56 -05:00
Isaac Connor dfa9a5a390 Add AUTOLOAD 2015-12-23 14:31:56 -05:00
Isaac Connor 1328492c64 fixes 2015-12-23 14:16:09 -05:00
Isaac Connor 33a3661958 cleanup, revent to openprint style objects 2015-12-23 14:03:40 -05:00
Isaac Connor 9c6041d55b require Object 2015-12-22 13:13:45 -05:00
Isaac Connor 3932ce692c remove Exporter stuff 2015-12-22 12:55:36 -05:00
Isaac Connor 171fcf0dca Use Object 2015-12-22 12:40:15 -05:00
Isaac Connor 26a92e5fed require Object 2015-12-22 12:23:24 -05:00
Isaac Connor 7663955dc8 Merge branch 'storageareas' into newpointone 
Conflicts:
	scripts/zmaudit.pl.in
 2015-12-22 12:14:29 -05:00
Isaac Connor e2f8b1adc3 rough in generic object, using some similar syntax to dbix 2015-12-22 12:13:57 -05:00
Isaac Connor c9dc53b237 add in find and find_one 2015-12-22 11:50:08 -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 12d87c252f Don't do Videod = 0, since zmvideo might need them to concatting and they won't regenerated if they exist anyways. Or maybe we want to encode them at a higher framerate or something 2015-12-21 16:04:31 -05:00
Isaac Connor 239b494db8 Add M.Id as MonitorID 2015-12-21 15:31:33 -05:00
Isaac Connor 07260adb2a append ZoneMinder::General to executeShellCommand 2015-12-21 15:30:05 -05:00
Isaac Connor a4024ffebc Must do E.*, not * 2015-12-21 15:29:27 -05:00
Isaac Connor 9d454bdc41 Add test for empty storage path 2015-12-21 15:29:18 -05:00
Isaac Connor 3e29aa56a3 Return default event path when no Id in Storage 2015-12-21 15:27:53 -05:00
Isaac Connor 16a1768511 fixes 2015-12-21 15:19:57 -05:00
Isaac Connor ad038edab4 chdir 2015-12-21 14:49:00 -05:00
Isaac Connor 99f9145cdd Fix SQL for loading events 2015-12-21 14:43:55 -05:00
Isaac Connor 892623ce63 Use * to grab all Event columns 2015-12-21 14:14:00 -05:00
Isaac Connor 0cb2d141a5 Fix dbh's 2015-12-21 13:16:07 -05:00