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
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
dd06db0bf0
remove duplication
2016-03-23 15:54:20 -04: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
a66e97de09
Merge & fix new console & options
2016-03-23 09:48:57 -04:00
0d0bb9a9c3
Update README.md
2016-03-23 21:58:50 +11: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
3a8352eb6b
Merge branch 'master' into storageareas
2016-03-21 10:25:03 -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
897a0a995c
Convert options layout to side-tabs, and improve readability
2016-03-15 15:21:28 -04:00
87932002cf
Push the options page down a bit to make tab look better
2016-03-15 14:45:40 -04:00
183f58ad17
Restyle options view with horizontal form layout
2016-03-15 14:43:22 -04:00
694ad0b539
Add styling to delete / save / add buttons in options.php
2016-03-15 14:08:01 -04:00
bd30d40522
Remove cancel button from options as it no longer makes sense.
2016-03-15 14:03:17 -04:00
0004a1180e
Update options.php to use bootstrap container
2016-03-15 13:56:54 -04:00
26748c2de5
Oops. Move Console view outside of canView(system) restriction
2016-03-15 13:52:36 -04:00
f05c1548ce
Add a link back to console in header
2016-03-15 13:49:14 -04:00
299c61c1ec
Make the Options link a standard href (not a popup).
2016-03-15 13:47:31 -04:00
8070bf8700
Move console php code to header as that code is now needed in additional views.
2016-03-15 13:46:03 -04:00
49f46ac927
Move the header into its own file, and include it in options view.
2016-03-15 13:43:49 -04: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
dcdb879637
Update redhat.rst
2016-03-15 07:24:15 -05:00
4581379d45
Update redhat.rst
...
minor edits
2016-03-15 07:21:34 -05:00
8f3cdef44c
Merge pull request #1312 from knnniggett/readthedocs
...
add redhat instructions to readthedocs
2016-03-15 07:08:43 -05:00
51a16b73c4
Merge pull request #1338 from altaroca/onvif-proxies-1320
...
Added Proxies for WSNotification and ONVIF-Analytics
2016-03-13 17:28:53 -05:00
0af83ed7f3
Change README documentation link to readthedocs
...
The wiki just ends up linking there
2016-03-13 15:19:04 -07:00
2c0c014535
Added Proxies for WSNotification and ONVIF-Analytics
2016-03-13 10:16:20 +01:00
8acfe1b0d8
Update options styling
2016-03-12 22:44:11 -05:00
Isaac Connor
Robin Daermann
Andrew Bauer
Steve Gilvarry
Luke Cousins
Isaac Connor
Jon Burgess
Jan M. Hochstein
Kyle Johnson
Matt N