Commit Graph

15188 Commits

Author SHA1 Message Date
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
Isaac Connor eadff23465 Fix missing ) 2020-05-12 09:16:37 -04:00
Isaac Connor c5f082e7ac fix escaping column names 2020-05-12 09:06:57 -04:00
Isaac Connor 323c171a27 test logFile before doing regexps on it 2020-05-11 18:35:31 -04:00
Isaac Connor 77b4dd6b35 add POD and fixups to zmonvif-trigger.pl 2020-05-11 18:34:38 -04:00
Isaac Connor 92ba017328 Spacing 2020-05-11 09:19:33 -04:00
Isaac Connor 582102c2c6 Fix use of backticks for newer mysql 2020-05-11 09:19:16 -04:00
Isaac Connor 81cd338545 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-05-11 08:34:19 -04:00
Isaac Connor d23258cb23 Allow for backticks in sort column 2020-05-11 08:34:07 -04:00
Isaac Connor 415ffbd771 remove weird comments 2020-05-09 18:30:21 -04:00
Isaac Connor 9beb1973df move the db update script to a modern version so it gets executed
move zmonvif-trigger.pl to /scripts
2020-05-09 18:04:27 -04:00
Isaac Connor 8c133fc973 use perl executable replacement 2020-05-09 17:36:51 -04:00
Isaac Connor 183fe1febd remove +x and move zmtrigger.pl to /scripts 2020-05-09 17:36:20 -04:00
Isaac Connor 80ed0b219a Add zmonvif-trigger.pl and split into multiple lines 2020-05-09 17:35:27 -04:00
Isaac Connor 8ed80f320d Remove SOAP::List stuff 2020-05-09 17:35:03 -04:00
Isaac Connor dd25cb3b4e We always build onvif 2020-05-09 17:34:15 -04:00
Isaac Connor 98a112d3c0 code style 2020-05-09 17:21:57 -04:00
Isaac Connor 1026a22e97 delete old Makefiles 2020-05-09 16:46:55 -04:00
Isaac Connor 81fe14c80f remove cruft 2020-05-09 16:45:04 -04:00
Isaac Connor 75082064fd Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-09 16:40:17 -04:00
Isaac Connor 732bb5416f Merge branch 'master' into onvif_updated 2020-05-09 16:26:29 -04:00
Isaac Connor 7938952a90 Fix botched merge in ONVIF.PM 2020-05-09 12:22:11 -04:00
Isaac Connor 8bebb2b890 fix use of printMsg 2020-05-09 11:49:02 -04:00
Isaac Connor 3d278eddf8 erge branch 'master' into batch_frame_records 2020-05-08 20:16:36 -04:00
Isaac Connor 408da1be27 Merge branch 'release-1.34' 2020-05-08 18:46:19 -04:00
Isaac Connor f2ec6b13e6 Add focal builds 2020-05-08 18:45:21 -04:00
Isaac Connor 8d74a973fc Bump version to 1.34.12 for release 2020-05-08 18:00:49 -04:00
Isaac Connor 24c09a8207 Accept 0 as a value for scale meaning scale to fit 2020-05-08 17:55:12 -04:00
Isaac Connor 8195223a86 merge some php 2020-05-08 17:54:51 -04:00
Isaac Connor 1f6e68c129 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-05-08 17:26:02 -04:00
Isaac Connor 0412f04592 Merge branch 'release-1.34' 2020-05-08 17:25:14 -04:00
Isaac Connor f101e58480 Split db user creation and permission granting into two commands, as needed by newer mysql. Also auto-install apache rewrite module for api. 2020-05-08 17:20:41 -04:00
Isaac Connor 00c9624868 Update postinst for mysql8. Can't set permissions and create user in one line. 2020-05-08 17:17:36 -04:00
Isaac Connor 05ccdb9bed libswresample is at version 3. libavresample is 4. 2020-05-08 10:36:07 -04:00
Isaac Connor f1d794c11b spacing and escape sql fields 2020-05-07 13:57:37 -04:00
Isaac Connor 50095b3147 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-05-07 13:44:44 -04:00
Isaac Connor a798e874fe Spacing 2020-05-07 13:44:32 -04:00
Isaac Connor fcf6eb2631 Add setting the codecpar->codec_type as well. Fixes detecting stream type 2020-05-07 13:44:02 -04:00
Isaac Connor 40633830d0 Code style/spacing 2020-05-07 13:43:35 -04:00
Isaac Connor b1b258ab9b Code Style and use backtick escapes on sql column names, specifically Function 2020-05-07 13:43:05 -04:00
Isaac Connor 6939f9953a code style, merge Debug lines and consult zm_terminate in the main while loop 2020-05-07 13:41:39 -04:00