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

965 Commits

Author SHA1 Message Date
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
Isaac Connor 7700623b16 Move SQL debug to Execute 2016-01-13 09:02:37 -05:00
Isaac Connor f1831383da add a check for valid event link. Ignore anything that doesn't look right 2016-01-08 10:36:38 -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 455f6d5b7b have to use ->Path() as {Path} might not be filled in 2016-01-04 15:57:35 -05:00
Isaac Connor 88f902ea20 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-01-04 15:29:10 -05:00
Isaac Connor 17adc2b4e5 Rough in a Monitor class 2016-01-04 15:27:42 -05:00
Isaac Connor 196339b48b Add new object classes to autoconf 2016-01-04 15:19:46 -05:00
Isaac Connor 6e685ec8c8 add Monitor object class and use it in zmaudit.pl to print out path where monitor should have been 2016-01-04 15:13:01 -05:00
Isaac Connor f04ba9c87e linefeed when saying that a db monitor doesn't exist in fs 2016-01-04 15:05:49 -05:00
Isaac Connor fb7b171d6e fix merge 2016-01-04 14:37:23 -05:00
Isaac Connor b1205bcaa9 Merge branch 'multi-server' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	scripts/zmaudit.pl.in
	version
 2016-01-02 14:45:24 -05:00
Isaac Connor bf2195828f Merge branch 'multi-server' into storageareas 
Conflicts:
	docs/installationguide/index.rst
 2016-01-02 14:42:47 -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
Isaac Connor 6537b61c36 put Storage Path in prompt when filesystem monitor doesn't exist in db 2015-12-30 08:08:01 -05:00
Isaac Connor 07af49511c Load Storage Object so that we can print it's path 2015-12-24 15:33:46 -05:00
Isaac Connor d943488475 add sub Storage 2015-12-24 15:32:30 -05:00
Isaac Connor 92ddd57942 include storage path when saying an event is too young to delete 2015-12-24 15:28:36 -05:00
Isaac Connor ec0d6359a0 Merge branch 'newpointone' of isaac.internal.point-one.com:ZoneMinder.p1 into newpointone 2015-12-24 15:26:24 -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 492550b5ef Merge branch 'storageareas' into newpointone 
Conflicts:
	scripts/zmaudit.pl.in
 2015-12-24 12:36:40 -05:00
Isaac Connor c174d74987 Set MOnitorId and StorageID because the Event does not exist in the db 2015-12-24 12:36:16 -05:00
Isaac Connor 45987e92a9 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2015-12-24 12:34:55 -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 f32344c647 Add output options to the concat cmd line 2015-12-23 09:33:33 -05:00
Isaac Connor ac0425d14b sort events before testing and deleting. Makes the output easier to grok 2015-12-22 15:08:38 -05:00
Isaac Connor 12a5621fb8 remove deleted event from fs_events hash so that we don't do it more than once 2015-12-22 14:31:24 -05:00
Isaac Connor 9c6041d55b require Object 2015-12-22 13:13:45 -05:00
Isaac Connor 39bcb20dac Skip directories that have non-digits in them 2015-12-22 12:59:37 -05:00
Isaac Connor 9ad22d9ee5 have to set the MonitorId on events that don't exist in db 2015-12-22 12:55:55 -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 bc4ce4f009 add Event require and document lgob behaviour and skip monitor dirs that have anything other than digits in them 2015-12-22 12:35:25 -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 06a5a6d879 rough in Storage area support 2015-12-22 11:50:29 -05:00
Isaac Connor c9dc53b237 add in find and find_one 2015-12-22 11:50:08 -05:00
Isaac Connor d4a7258766 rough in Storage Area support 2015-12-22 11:10:17 -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