Commit Graph

6446 Commits

Author SHA1 Message Date
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
Jon Burgess 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
Jon Burgess ed7e3e47b7 Add more checking around xaddr parsing 2016-03-19 14:15:51 +00:00
Jon Burgess 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
Jon Burgess 06e04127d6 Fix spelling in other README files as well 2016-03-18 23:27:43 +00:00
Jon Burgess 94057a94ff Fix spelling of 'environment' 2016-03-18 22:42:34 +00:00
Kyle Johnson 897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -04:00
Kyle Johnson 87932002cf Push the options page down a bit to make tab look better 2016-03-15 14:45:40 -04:00
Kyle Johnson 183f58ad17 Restyle options view with horizontal form layout 2016-03-15 14:43:22 -04:00
Kyle Johnson 694ad0b539 Add styling to delete / save / add buttons in options.php 2016-03-15 14:08:01 -04:00
Kyle Johnson bd30d40522 Remove cancel button from options as it no longer makes sense. 2016-03-15 14:03:17 -04:00
Kyle Johnson 0004a1180e Update options.php to use bootstrap container 2016-03-15 13:56:54 -04:00
Kyle Johnson 26748c2de5 Oops. Move Console view outside of canView(system) restriction 2016-03-15 13:52:36 -04:00
Kyle Johnson f05c1548ce Add a link back to console in header 2016-03-15 13:49:14 -04:00
Kyle Johnson 299c61c1ec Make the Options link a standard href (not a popup). 2016-03-15 13:47:31 -04:00
Kyle Johnson 8070bf8700 Move console php code to header as that code is now needed in additional views. 2016-03-15 13:46:03 -04:00
Kyle Johnson 49f46ac927 Move the header into its own file, and include it in options view. 2016-03-15 13:43:49 -04:00
Andrew Bauer fe46785e94 Update redhat.rst 2016-03-15 07:33:40 -05:00
Andrew Bauer 68a5e78efc Update redhat.rst 2016-03-15 07:30:31 -05:00
Andrew Bauer dcdb879637 Update redhat.rst 2016-03-15 07:24:15 -05:00
Andrew Bauer 4581379d45 Update redhat.rst
minor edits
2016-03-15 07:21:34 -05:00
Andrew Bauer 8f3cdef44c Merge pull request #1312 from knnniggett/readthedocs
add redhat instructions to readthedocs
2016-03-15 07:08:43 -05:00
Andrew Bauer 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
Matt N 0af83ed7f3 Change README documentation link to readthedocs
The wiki just ends up linking there
2016-03-13 15:19:04 -07:00
Jan M. Hochstein 2c0c014535 Added Proxies for WSNotification and ONVIF-Analytics 2016-03-13 10:16:20 +01:00
Kyle Johnson 8acfe1b0d8 Update options styling 2016-03-12 22:44:11 -05:00
Kyle Johnson 2378c9a359 Fix state link to do popup like before 2016-03-12 20:44:42 -05:00
Kyle Johnson d202760d82 Additional footer padding 2016-03-12 20:37:07 -05:00
Kyle Johnson f5ba52824a Add styles to additional console buttons 2016-03-12 20:36:39 -05:00
Kyle Johnson a2c2101c48 Remove extra #footer styling 2016-03-12 20:28:16 -05:00
Kyle Johnson f80cbf52df Bump up the default font size 2016-03-12 20:27:51 -05:00
Kyle Johnson bebb1017fd Wrap footer in container-fluid 2016-03-12 20:27:22 -05:00
Kyle Johnson 5e2d4bc325 Restyle of Login page. 2016-03-12 20:11:32 -05:00
Kyle Johnson a403c1db8c Move recaptcha javascript to actual <head> tag
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-03-12 19:14:07 -05:00
Andrew Bauer f55c03e9ea Merge pull request #1336 from pliablepixels/1335-api-states-security
api security enhancements issue #1335
2016-03-12 09:09:38 -06:00
arjunrc 8a47241e18 address issue #1335 2016-03-12 08:07:25 -05:00
Kyle Johnson 71c35e712b Initial major restyle of classic skin. 2016-03-12 03:28:02 -05:00
Kyle Johnson c9441ec8c0 Local copy of bootstrap 3.3.6, included in classic skin. 2016-03-12 01:16:19 -05:00
Kyle Johnson 5b2d194af2 Merge pull request #1330 from knnniggett/freebsd
add freeBSD cmake target distro
2016-03-11 14:58:43 -07:00
Andrew Bauer 16992a44cb add ZM_PERL_MM_PARMS 2016-03-11 15:56:29 -06:00
Andrew Bauer 2cae5d6e7f Merge pull request #1333 from ZoneMinder/quick-fix-perl-path
Quick fix perl path
2016-03-11 15:43:48 -06:00
Kyle Johnson 4e1af516d7 Don't output sudo test cmd to /dev/null. Other tests aren't, and info us useful. 2016-03-11 14:29:48 -07: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 b1d3be2cfc add freeBSD cmake target distro 2016-03-11 07:38:29 -06:00
Kyle Johnson 8cd7731c4a Merge pull request #1329 from knnniggett/execinfo
change linker flag to "-lexecinfo"
2016-03-10 14:16:25 -07:00