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

6602 Commits

Author SHA1 Message Date
Isaac Connor c309cdaad4 include Event object so it can be used elsewhere 2016-03-29 12:06:51 -04: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
Isaac Connor 1ea1852476 Do some Storage Areas support 2016-03-29 11:52:25 -04:00
Isaac Connor 58f19f14e1 print ip and hostname when can't connect 2016-03-29 11:51:58 -04:00
Isaac Connor 34c50b8cfc ipv6 support 2016-03-29 11:51:28 -04:00
Isaac Connor e3564f6a63 add zmtelemtry.pl 2016-03-29 11:51:03 -04:00
Isaac Connor e4d0f2ffda fixup depends 2016-03-29 11:50:51 -04:00
Isaac Connor 3cb7687789 add zmtelemetry.pl to autotools build 2016-03-29 11:50:25 -04:00
Isaac Connor 655116eea9 add LinkPath and delete methods 2016-03-29 11:49:15 -04:00
Isaac Connor 7f34a0df37 Remove deprecated --enable-crashtrace 2016-03-29 11:48:30 -04:00
Robin Daermann c8c0586c66 Trim monitor names 2016-03-29 11:40:14 +02:00
Isaac Connor 9a8a08bd83 Merge pull request #1368 from knnniggett/onvifresult 
remove $result from onvif error message
 2016-03-28 14:06:40 -04:00
Andrew Bauer 2365c2156f remove $result from onvif error message 2016-03-28 09:53:57 -05:00
Andrew Bauer ab05d52a0a Update en_gb.php 
typo
 2016-03-28 08:35:34 -05:00
Andrew Bauer ffc0ebaf22 Merge pull request #1361 from ZoneMinder/fix_coverity_issues 
Fix coverity issues
 2016-03-26 21:11:28 -05:00
Isaac Connor e717349116 Merge pull request #1364 from knnniggett/onvif_maxfps 
do not set maxfps fields during onvif probe
 2016-03-26 15:34:54 -04:00
Andy Bauer 6eda3eff72 do not set maxfps fields during onvif probe 2016-03-26 08:38:28 -05:00
Andrew Bauer a3e79e5119 Merge pull request #1362 from czettnersandor/master 
Minor grammar fixes
 2016-03-25 08:38:06 -05:00
Sándor Czettner 38e3c92546 Minor grammar fixes 2016-03-25 13:18:43 +00:00
Andrew Bauer d412e8dc5c Update redhat.rst 2016-03-25 07:54:37 -05:00
Kyle Johnson 664e0be6f9 Merge pull request #1356 from violuke/patch-1 
Minor improvements to ubuntu documentation
 2016-03-24 09:22:57 -06:00
Luke Cousins 0e54831072 Swapping back to vi as default editor 2016-03-24 15:15:58 +00:00
Isaac Connor a16c1746e5 separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value 2016-03-24 10:00:02 -04:00
Robin Daermann af68fd20a8 Some Translations for Monitor names with spaces 2016-03-24 14:51:24 +01:00
Isaac Connor 1e52a8ad2c remove unused class member 2016-03-24 09:44:34 -04:00
Isaac Connor b6ee4e4228 move return up into #ifdef. 2016-03-24 09:43:15 -04:00
Isaac Connor 0c32ae61ef Merge branch 'master' into fix_coverity_issues 2016-03-24 09:42:01 -04:00
Robin Daermann 71db9b84e6 Allow spaces in monitor names 2016-03-24 14:37:24 +01:00
Andrew Bauer 2deeb6bebf Merge pull request #1339 from mnoorenberghe/readme-rtd 
Change README documentation link to readthedocs
 2016-03-23 16:46:43 -05:00
Isaac Connor 757740ede5 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-03-23 16:12:51 -04:00
Isaac Connor dd06db0bf0 remove duplication 2016-03-23 15:54:20 -04:00
Isaac Connor 56301b77e9 Add an example rules file for logcheck 2016-03-23 09:51:28 -04:00
Isaac Connor 6d4d05184c fix typo 2016-03-23 09:49:38 -04:00
Isaac Connor a66e97de09 Merge & fix new console & options 2016-03-23 09:48:57 -04:00
Steve Gilvarry 0d0bb9a9c3 Update README.md 2016-03-23 21:58:50 +11:00
Luke Cousins 2ede18a614 Minor improvements to documentation 2016-03-21 22:47:45 +00:00
Andrew Bauer 671326f686 Merge pull request #1347 from jburgess777/tenvis 
ONVIF: Tenvis TH661 support
 2016-03-21 12:47:13 -05:00
Isaac Connor d3558c5688 Merge pull request #1323 from knnniggett/zmfilter 
fix missing Net::SFTP::Foreign::debug warning
 2016-03-21 10:47:50 -04:00
Isaac Connor 06943bae82 Merge pull request #1353 from jburgess777/ffmpeg-option-logging 
Add more logging to diagnose problems with applying ffmpeg options
 2016-03-21 10:44:06 -04:00
Isaac Connor 0cb2ad4b01 Merge pull request #1352 from jburgess777/ffmpeg-options-help-typos 
Fix spelling in ffmpeg options help page
 2016-03-21 10:43:16 -04:00
Isaac Connor 3a8352eb6b Merge branch 'master' into storageareas 2016-03-21 10:25:03 -04:00
Andrew Bauer cf35da07b5 Merge pull request #1349 from altaroca/onvif-discovery-1346 
Improved Onvif discovery #1346
 2016-03-21 08:47:23 -05:00
Jon Burgess bfd846bbff Add more logging to diagnose problems with applying ffmpeg options 2016-03-20 21:44:58 +00:00
Jon Burgess 9c98ccbb75 Fix spelling in ffmpeg options help: s/verbosiy/verbosity/ 2016-03-20 16:13:53 +00:00
Jon Burgess 020731a89e Fix typo in ffmpeg options help: s/passwd/passed/ 2016-03-20 16:10:49 +00:00
Steve Gilvarry ecb8c48b3b Merge pull request #1344 from jburgess777/spelling 
Fix spelling of 'environment' in README.Centos7
 2016-03-20 09:05:47 +11:00
Steve Gilvarry e85c56d005 Merge pull request #1348 from jburgess777/spelling2 
Doc reference to Astericks was presumably meant to be Asterisk.
 2016-03-20 09:05:07 +11:00
Jan M. Hochstein 39053f9325 WSDiscovery version changed from 1.1 to 1.0 2016-03-19 18:36:12 +01:00
Jon Burgess 6fd718e2e6 ONVIF: Fix hash reference mixups which broke 1.1 detection 
With these changes the script now detects my camera during the
1.1 scan and ignores the duplicate 1.2 response.

$ ~/zmonvif-probe.git.pl probe
http://192.168.1.246:8080/onvif/devices, 1.1, (Profile='Streaming', model='C6F0SeZ0N0P0L0', name='IPCAM', location/country='china')
 2016-03-19 17:28:39 +00:00
Jon Burgess b11f3bce53 Assume this was meant to be Asterisk, not Astericks. 2016-03-19 15:25:17 +00:00