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

1087 Commits

Author SHA1 Message Date
Andrew Bauer a43adc241f fix incorrect gpl license mailing address 2017-03-22 07:03:53 -05:00
Andrew Bauer 7bb0d12a4f Merge pull request #1819 from ZoneMinder/Copyright_patch1 
Fix failure to attribute previous work
 2017-03-20 09:17:03 -05:00
Andrew Bauer 2dcd95bc7f Merge pull request #1504 from ZoneMinder/improve_filter 
Improve filter
 2017-03-18 21:12:58 -05:00
Steve Gilvarry 3a69238381 Fix failure to attribute previous work 
Just fixing this up as there is a issue logged from Debian for it.
 2017-03-18 23:05:32 +11:00
Manojav Sridhar f0b2910647 fix typo for correct checking if a command has excuted for an event, prevents execution on every filter run 2017-02-15 08:10:50 -05:00
Isaac Connor ac32b001e9 use a real variable for the file handle so that it sticks around. 2017-01-12 13:05:39 -05:00
Isaac Connor c97ecc2a38 remove debug line 2017-01-12 13:04:44 -05:00
Isaac Connor a5cdfd2932 call loadMonitors at the beginning. Otherwise we may not know about a monitor while handling a message from it. 2017-01-12 13:03:53 -05:00
Isaac Connor 513cd68c20 remove the verified caching. It makes calling zmMemVerify useless. 2017-01-12 13:02:16 -05:00
Isaac Connor 7502b81064 zmMemVerify now checks valid, so don't need to do it again. 2017-01-10 15:32:38 -05:00
Isaac Connor 7ddd5359d0 zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good 2017-01-10 15:09:30 -05:00
Isaac Connor a146d7bee1 add a test for valid in the shared data. zmc sets this to false when it closes properly 2017-01-10 15:08:49 -05:00
Isaac Connor faeb785961 zmMemVerify attaches, so we need to zmMemInvalidate even if the shared data is no good 2017-01-10 15:08:23 -05:00
Isaac Connor 4d84387807 Merge branch 'fix_mmap_leak' into work 2017-01-10 14:22:58 -05:00
Isaac Connor a66e9e45a2 merge a fix from storageareas that adds a test for the shared data being valid and reloads the monitors if it can't reconnect 2017-01-10 14:22:42 -05:00
Isaac Connor d2ff6701f4 test 2017-01-10 13:53:02 -05:00
Isaac Connor 66cdcd95fa Merge branch 'master' into fix_mmap_leak 2017-01-10 08:47:46 -05:00
Isaac Connor 2a1ec2beb1 Merge pull request #1719 from knnniggett/hikvisionptz 
Add HikVision ptz control sciprt
 2017-01-03 08:59:56 -05:00
Isaac Connor b4bddee337 Merge branch 'master' into improve_filter 2017-01-03 08:49:56 -05:00
Isaac Connor ac88490338 When use warnings is on and there is a null value in the monitor data it causes warnings. So add skip if __git_main is not defined. 2017-01-02 12:49:37 -05:00
Andy Bauer 25ab1bee18 more fixed to gpl license text 2016-12-26 10:40:09 -06:00
Andy Bauer 0f15b3ae62 update gpl 2 mailing address 2016-12-26 10:33:03 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor ed46a6b6ac must call zmMemInvalidate before next 2016-12-23 09:27:54 -05:00
Isaac Connor 752f0eb40b Merge branch 'master' into improve_filter 2016-12-20 11:43:02 -05:00
Andrew Bauer 02e534dcff Merge pull request #1694 from connortechnology/disk_space_in_events 
Disk space in events
 2016-12-20 09:19:21 -06:00
Isaac Connor a9548d3f6b Add a config entry to turn event disk space on/off 2016-12-13 13:34:56 -05:00
Isaac Connor 8009bce3d9 quote the link name so that spaces don't break it 2016-12-13 13:23:20 -05:00
Isaac Connor 2c0a868eea fix typo 2016-12-08 11:02:59 -05:00
Isaac Connor 857b4e8345 Merge branch 'master' into improve_filter 2016-12-06 11:58:41 -05:00
Andrew Bauer ecbaaef59a Merge pull request #1670 from connortechnology/fix_braces 
Fix braces
 2016-12-06 08:39:43 -06:00
Kyle Johnson 49620d51b9 Merge pull request #1692 from ZoneMinder/small_fixes 
Small fixes
 2016-11-24 20:42:45 -07:00
Isaac Connor 9e8404516b add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files 2016-11-22 11:02:38 -05:00
Isaac Connor 02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00
Isaac Connor bb6b0c2d49 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter 2016-11-17 12:16:49 -05:00
Isaac Connor 27b5b60eae Merge branch 'master' into fix_braces 2016-11-14 21:46:25 -05:00
Isaac Connor 1be6c57aee fix extra semi colon 2016-11-08 13:11:10 -05:00
Isaac Connor 5f0c1c0e26 fix layout in a complex map 2016-11-08 12:55:07 -05:00
Andrew Bauer 29e48da3b9 fix sftp xfers in zmfilter (#1677) 2016-11-07 16:08:43 -05:00
Andy Bauer 4be668f838 Add HikVision ptz control sciprt 2016-11-06 08:03:43 -06:00
Isaac Connor 0dbde8e290 correct a lot of braces 2016-11-04 15:53:14 -04:00
Isaac Connor 1e233c0ce5 Merge branch 'master' into improve_filter 2016-11-04 15:20:43 -04:00
Isaac Connor 93725b3f4b fixup spacing in ConfigData 2016-11-04 14:05:51 -04:00
Isaac Connor 3d17067276 change tabs to spaces 2016-11-03 14:30:23 -04:00
Isaac Connor 68c8178648 remove some extra spaces 2016-11-03 14:21:07 -04:00
Isaac Connor bb371612c3 tabs to spaces 2016-11-03 14:18:03 -04:00
Andrew Bauer 191efed8e3 change fast_delete to off - fixes #1597 2016-10-19 14:10:28 -05:00
Isaac Connor b385ba7bf4 Merge branch 'master' into improve_filter 2016-10-18 09:59:45 -04:00
Isaac Connor a77de33997 add a test for lib existence 2016-09-27 12:51:04 -04:00
mdrush 69a71b1a37 cleaned up logic 2016-08-27 16:16:01 -07:00