Commit Graph

15178 Commits

Author SHA1 Message Date
Isaac Connor 3c2e26ac32 Merge branch 'release-1.34' 2020-05-15 16:02:29 -04:00
Isaac Connor 4dc693022e Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize 2020-05-15 16:02:19 -04:00
Isaac Connor ce9e2c8b27 Merge branch 'release-1.34' 2020-05-15 11:53:09 -04:00
Isaac Connor 9ea1c637f9 Remove debug Exiting message 2020-05-15 11:48:41 -04:00
Isaac Connor 6bb2c09a72 Merge branch 'release-1.34' 2020-05-15 11:41:34 -04:00
Isaac Connor f79a17f302 Bump version to 1.34.14 for release 2020-05-15 11:35:59 -04:00
Isaac Connor c4c4c5bcbf fix Crud submodule version 2020-05-15 11:34:34 -04:00
Isaac Connor 424a4ed0b1 add onclick to div.zoom 2020-05-15 11:34:23 -04:00
Isaac Connor 0dd426d64c handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click 2020-05-15 11:33:10 -04:00
Isaac Connor 94b29c6c7a replace inline javascript in timeline zoom 2020-05-15 10:44:48 -04:00
Isaac Connor 7a85be59be Remove errant closing db debug output 2020-05-15 10:22:58 -04:00
Isaac Connor 4fed2d6d26 bump version to 1.34.13 for release 2020-05-14 12:20:14 -04:00
Isaac Connor 19e6f6d6d3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-05-14 12:03:01 -04:00
Isaac Connor d92772343a Merge branch 'release-1.34' 2020-05-14 12:02:50 -04:00
Isaac Connor 25a772c5eb reorder logic a bit to make it easier to read. Make exit_zmu not return a value. 2020-05-14 12:02:02 -04:00
Isaac Connor 16e7ca5a51 failure opening a monitor should not be fatal. 2020-05-14 12:01:24 -04:00
Isaac Connor 402c0c6a1b Fix build on older ffmpeg 2020-05-14 12:01:03 -04:00
Isaac Connor efbab4e2bc Dont' call mysql_library_end as it segfaults and hangs. 2020-05-14 12:00:36 -04:00
Isaac Connor 5f5cede104 Fix log file containing - or _ 2020-05-13 16:06:26 -04:00
Isaac Connor 992ac144a9 Fix ONVIF_User => ONVIF_Username 2020-05-13 16:04:26 -04:00
Isaac Connor 880b456d93 Rrename MetaConfig to ONVIF 2020-05-13 15:30:56 -04:00
Isaac Connor 437a96915f sketchy fix for soap 1.1 2020-05-13 15:24:58 -04:00
Isaac Connor fc12b61750 Fix probing 2020-05-13 15:09:31 -04:00
Isaac Connor 88a910793c Spacing 2020-05-13 08:06:55 -04:00
Isaac Connor e24b6214b1 test logFile before doing regexps on it 2020-05-13 08:05:58 -04:00
Isaac Connor bbf64de40e If there is a failure when decoding due to lack of support for the codec profile, re-init without hwaccel 2020-05-13 08:04:53 -04:00
Isaac Connor edd718afd2 xtell and ytell are data-xtell and data-ytell fixes #2932 2020-05-13 08:02:49 -04:00
Isaac Connor f72ad1023c As params are passed in command, they should not be fatal to the control process 2020-05-13 08:02:40 -04:00
Isaac Connor 807efde523 xtell and ytell are data-xtell and data-ytell fixes #2932 2020-05-13 08:01:04 -04:00
Isaac Connor a6b804bb62 As params are passed in command, they should not be fatal to the control process 2020-05-13 07:58:53 -04:00
Isaac Connor c75cd1ecc9 bump version to pick up new ONVIF fields 2020-05-12 18:45:14 -04:00
Isaac Connor 24cbbddc5c Merge branch 'onvif_updated' 2020-05-12 18:44:48 -04:00
Isaac Connor a1217db117 hardcode log id 2020-05-12 18:20:05 -04:00
Isaac Connor 011ea1098c Rename COnfig* to ONVIF_* 2020-05-12 15:49:54 -04:00
Isaac Connor 045ea77bf3 Pass verbose to client. Add stream type to profiles. Add passing generic commands to the media element so that we can query anything we want easier 2020-05-12 15:49:42 -04:00
Isaac Connor 43b776bc80 Remove duplicated code byusing a foreach. Add streamtype to returned profiles 2020-05-12 15:49:01 -04:00
Isaac Connor 9aa297f7cd spacing 2020-05-12 15:48:14 -04:00
Isaac Connor 8f3a8ee877 spacing 2020-05-12 15:47:44 -04:00
Isaac Connor f8249251bd Add a verbose var to ONVIF::CLient and allow it to be set during build. 2020-05-12 15:47:27 -04:00
Isaac Connor 69e5feb28b Add ONVIF* to Monitor object 2020-05-12 15:47:00 -04:00
Isaac Connor c83621822f Rename Config* to ONVIF_* 2020-05-12 15:46:07 -04:00
Isaac Connor 7e80b33ee0 If there is a failure when decoding due to lack of support for the codec profile, re-init without hwaccel 2020-05-12 15:10:08 -04:00
Isaac Connor 1f3cf266a2 Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-12 11:20:49 -04:00
Isaac Connor 89939efc9b Fixup my updates to the MetaConfig tab of monitor view 2020-05-12 11:15:29 -04:00
Isaac Connor bbcb7f2c60 Better debug output on errors. Use libXML to pretty-print the returned XML 2020-05-12 11:14:56 -04:00
Isaac Connor 5676e825c6 remove autogenerated files 2020-05-12 11:13:17 -04:00
Isaac Connor aca642d3db remove autogenerated files 2020-05-12 11:13:09 -04:00
Isaac Connor e40c3d8487 Print out the returned profiles like profiles() used to do 2020-05-12 10:49:47 -04:00
Isaac Connor e950f3c843 Return profiles instead of doing nothing with them 2020-05-12 10:49:29 -04:00
Isaac Connor 3f50277e1c Revert effort to escape column names. Not smart enough. 2020-05-12 09:21:05 -04:00