Commit Graph

36 Commits

Author SHA1 Message Date
Isaac Connor 65f7350313 remove debug stautement 2017-01-12 12:55:27 -05:00
Isaac Connor 42484f7680 switch quotes, load monitors at the beginnign 2017-01-12 12:54:40 -05:00
Isaac Connor 04f66917ae Merge branch 'fix_mmap_leak' into storageareas 2017-01-10 15:29:54 -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 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 b3c5f4622f revert knnniggett's zmMemDetach changes 2017-01-10 12:56:19 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor c27d0270dc Merge branch 'knnniggett-zmMemDetach' into storageareas 2016-12-20 15:40:14 -05:00
Andy Bauer c6368c4a1a replace zmMemInvalidate with zmMemDetach 2016-12-20 13:49:07 -06:00
Isaac Connor f0a307e082 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
	distros/ubuntu1504_cmake/control
2016-03-29 11:53:17 -04:00
Kyle Johnson b9085cea64 Fix issue where programs are installed in unexpected paths.
For example, on freebsd, sudo is in /usr/local/bin, and as things
were pre-this commit, sudo wasn't being found.
2016-03-11 14:28:16 -07:00
Andrew Bauer 4606d2fbca Update zmtrigger.pl.in
mention the %Q placholder when using showtext
2016-03-10 10:13:38 -06:00
Andrew Bauer 0fce33b2d3 one too many curly brackets 2016-02-22 06:59:14 -06:00
Andy Bauer a2e06ed70c Prevent zmtrigger from crashing when memory handles change 2016-02-21 17:55:04 -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
Andy Bauer 66c66106f5 Process off+time delay condition 2016-01-15 20:31:31 -06:00
Isaac Connor 5a363273a2 Merge branch 'master' into multi-server
Conflicts:
	distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
Andrew Bauer 10adae3696 Merge pull request #941 from ZoneMinder/trigger_on_space
add space instead of + to handle old Axis cameras
2015-07-16 13:09:36 -05:00
Isaac Connor ad23969982 add space instead of + to handle old Axis cameras 2015-07-16 13:06:15 -04:00
Dmitry Smirnov c788d70b93 zmtrigger: POD documentation
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
Isaac Connor b8888b9d55 Only load triggers for our Server if ZM_SERVER_ID is set 2015-07-15 16:22:43 -04:00
Dmitry Smirnov b0909a4c57 autouse Data::Dumper 2015-04-16 15:48:51 +10:00
Dmitry Smirnov fcdd9b6fb5 zmtrigger.pl: comments to POD + readability 2015-04-16 15:48:47 +10:00
Martin Hagelin a148e04ea2 Update zmtrigger.pl.in
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder. 

Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.

This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
2014-04-30 15:07:29 +02:00
Isaac Connor d185f05006 robustness/code style changes 2014-01-03 12:55:30 -05:00
Isaac Connor 3d55dde548 COnfig fixes 2014-01-03 09:33:49 -05:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan e9865320e7 Prevent memory handles from leaking when polling monitors
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3360 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 08:27:46 +00:00
stan 215884ecc5 Added properly constructed path to Unix domain socket
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3221 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-05 17:35:25 +00:00
stan b944c07f66 Added after bogus delete
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2911 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:22:28 +00:00
stan b696f637e5 Removed temporarily.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2909 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:18:38 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00