mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-19 22:37:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,624 Commits 80 Branches 104 Tags
5da8df45a7f10fd78c8f98fc4a48a404a266eaeb
Commit Graph

982 Commits

Author SHA1 Message Date
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
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
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
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
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
Simpler1
1432c6ae1f Added profiles for Wanscam-HW0025 and IPCC-7210W 2016-01-04 12:30:46 -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
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
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