2233747fcb
add a missing t
2016-04-04 11:38:16 -04:00
9276eea491
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-04-04 09:38:06 -04:00
46ac2301a7
Merge pull request #1376 from laerciomotta/patch-1
...
Improve test multiserver restart cam.
2016-04-04 09:29:36 -04:00
ad912a6c6b
Improve test multiserver restart camera. (FIX)
...
Check if the server is correctly before restart cam and multiserver is activate.
2016-03-31 09:45:13 -03:00
2f27818e5b
Improve test multiserver restart cam.
...
Test if correct server from camera edit settings.
2016-03-31 09:23:01 -03:00
e9ed046361
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-03-30 10:56:32 -04:00
b81395843c
fix spacing in control file
2016-03-30 10:56:10 -04:00
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
c8c0586c66
Trim monitor names
2016-03-29 11:40:14 +02:00
9a8a08bd83
Merge pull request #1368 from knnniggett/onvifresult
...
remove $result from onvif error message
2016-03-28 14:06:40 -04:00
2365c2156f
remove $result from onvif error message
2016-03-28 09:53:57 -05:00
ab05d52a0a
Update en_gb.php
...
typo
2016-03-28 08:35:34 -05:00
ffc0ebaf22
Merge pull request #1361 from ZoneMinder/fix_coverity_issues
...
Fix coverity issues
2016-03-26 21:11:28 -05:00
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
6eda3eff72
do not set maxfps fields during onvif probe
2016-03-26 08:38:28 -05:00
a3e79e5119
Merge pull request #1362 from czettnersandor/master
...
Minor grammar fixes
2016-03-25 08:38:06 -05:00
38e3c92546
Minor grammar fixes
2016-03-25 13:18:43 +00:00
d412e8dc5c
Update redhat.rst
2016-03-25 07:54:37 -05:00
664e0be6f9
Merge pull request #1356 from violuke/patch-1
...
Minor improvements to ubuntu documentation
2016-03-24 09:22:57 -06:00
0e54831072
Swapping back to vi as default editor
2016-03-24 15:15:58 +00:00
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
af68fd20a8
Some Translations for Monitor names with spaces
2016-03-24 14:51:24 +01:00
1e52a8ad2c
remove unused class member
2016-03-24 09:44:34 -04:00
b6ee4e4228
move return up into #ifdef.
2016-03-24 09:43:15 -04:00
0c32ae61ef
Merge branch 'master' into fix_coverity_issues
2016-03-24 09:42:01 -04:00
71db9b84e6
Allow spaces in monitor names
2016-03-24 14:37:24 +01:00
2deeb6bebf
Merge pull request #1339 from mnoorenberghe/readme-rtd
...
Change README documentation link to readthedocs
2016-03-23 16:46:43 -05:00
56301b77e9
Add an example rules file for logcheck
2016-03-23 09:51:28 -04:00
6d4d05184c
fix typo
2016-03-23 09:49:38 -04:00
2ede18a614
Minor improvements to documentation
2016-03-21 22:47:45 +00:00
671326f686
Merge pull request #1347 from jburgess777/tenvis
...
ONVIF: Tenvis TH661 support
2016-03-21 12:47:13 -05:00
d3558c5688
Merge pull request #1323 from knnniggett/zmfilter
...
fix missing Net::SFTP::Foreign::debug warning
2016-03-21 10:47:50 -04:00
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
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
cf35da07b5
Merge pull request #1349 from altaroca/onvif-discovery-1346
...
Improved Onvif discovery #1346
2016-03-21 08:47:23 -05:00
bfd846bbff
Add more logging to diagnose problems with applying ffmpeg options
2016-03-20 21:44:58 +00:00
9c98ccbb75
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
2016-03-20 16:13:53 +00:00
020731a89e
Fix typo in ffmpeg options help: s/passwd/passed/
2016-03-20 16:10:49 +00:00
ecb8c48b3b
Merge pull request #1344 from jburgess777/spelling
...
Fix spelling of 'environment' in README.Centos7
2016-03-20 09:05:47 +11:00
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
39053f9325
WSDiscovery version changed from 1.1 to 1.0
2016-03-19 18:36:12 +01:00
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
b11f3bce53
Assume this was meant to be Asterisk, not Astericks.
2016-03-19 15:25:17 +00:00
909c23c38b
ONVIF: Make GetStreamUri try both RTP_unicast and RTP-Unicast
...
The specification gives conflicting values for the unicast stream
type in different parts of the document:
http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri
Description has: StreamType = "RTP_unicast"
Input has: enum { 'RTP-Unicast', 'RTP-Multicast' }
The Tenvis TH661 only accepts RTP-Unicast but the original code was
using RTP_unicast. Try both and take the result of the first one
which works.
2016-03-19 14:50:44 +00:00
ed7e3e47b7
Add more checking around xaddr parsing
2016-03-19 14:15:51 +00:00
16cf1b6245
Detect IP address in URLs like http://ip:port/
...
This if for devices like the Tenvis TH661 which responds with:
http://192.168.1.246:8080/onvif/devices
2016-03-19 13:31:33 +00:00
06e04127d6
Fix spelling in other README files as well
2016-03-18 23:27:43 +00:00
94057a94ff
Fix spelling of 'environment'
2016-03-18 22:42:34 +00:00
fe46785e94
Update redhat.rst
2016-03-15 07:33:40 -05:00
68a5e78efc
Update redhat.rst
2016-03-15 07:30:31 -05:00
Isaac Connor
Isaac Connor
Laercio Motta
Robin Daermann
Andrew Bauer
Andrew Bauer
Sándor Czettner
Kyle Johnson
Luke Cousins
Jon Burgess
Steve Gilvarry
Jan M. Hochstein