ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,067 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

981 Commits

Author SHA1 Message Date
Isaac Connor e950f3c843 Return profiles instead of doing nothing with them 2020-05-12 10:49: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 ac31abd30c Make onvif handle no resolution graceully 2020-05-05 18:07:12 -04:00
Isaac Connor e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00
Isaac Connor 10d89ed82e Spacing, quotes, improve debug messages. 2020-04-23 10:00:11 -04:00
Isaac Connor 3117f29f71 code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-03-30 10:32:26 -04:00
Isaac Connor d51fdafbc0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-21 09:37:45 -05:00
Isaac Connor 869713826a mine code cleanup 2020-02-21 09:29:35 -05:00
Isaac Connor ade95283d9
Merge pull request #2839 from connortechnology/add_alarmed_zone_to_filters 
Add alarmed zone to filters
 2020-02-19 14:52:19 -05:00
Isaac Connor be75be9bc4
Merge pull request #2815 from connortechnology/improve_filter_emails 
Improve filter emails
 2020-02-19 14:50:48 -05:00
Isaac Connor 300402013c Merge branch 'master' into improve_filter_emails 2020-02-19 14:44:37 -05:00
Isaac Connor ec4d565f07 set the net interface used in TransportUDP when specified 2020-02-19 14:28:53 -05:00
Isaac Connor dab5c520fe Merge branch 'master' into add_alarmed_zone_to_filters 2020-02-19 14:20:08 -05:00
Isaac Connor a599028de4 If Filter attr is AlarmedZoneId we can only support the EXISTS operator 2020-02-19 14:18:28 -05:00
zlodag 0c97bff645 monitor presets and controls for D-Link DCS-5020L 2020-02-19 22:50:09 +13:00
Isaac Connor cac7ddd89d Discover that authority also contains port. Remove redundant stuff. 2020-02-18 16:48:08 -05:00
Isaac Connor 9a21ebf696 Remove unneeded test for :80 2020-02-18 15:10:44 -05:00
Isaac Connor 568c42cfa9 Use URI to better handle ControlAddress parsing. 2020-02-18 13:05:45 -05:00
Isaac Connor 223b618f74 quotes 2020-02-18 11:08:05 -05:00
Isaac Connor fc8f94c315 Merge branch 'master' into improve_filter_emails 2020-02-17 16:42:44 -05:00
Isaac Connor c337fb921d Don't die if no MetaDataConfigurations 2020-02-17 16:32:37 -05:00
Isaac Connor 9c65a8b293 handle Amcrest cameras giving a 401 Unauthorized on the first attempt to send a command. Just send another. 2020-02-12 12:34:43 -05:00
Isaac Connor eb5ef5203a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-11 17:40:46 -05:00
Isaac Connor cc9add9310 fall back to ControlAddress if first ptz get fails 2020-02-11 17:40:33 -05:00
Isaac Connor 050d02f1fa
Merge pull request #2832 from connortechnology/fix_2831 
Fix 2831
 2020-02-11 17:09:07 -05:00
Isaac Connor ac8c7a9347 default ZM_TIMEZONE value to empty in which case we don't set the value 2020-02-11 13:21:02 -05:00
Isaac Connor 3b30d0a8db code restructure, return all valid profiles instead of just the first one. Also add multicase stream types. This incorporates ideas from patch from remi-crypto. Fixes #2825 2020-02-09 13:51:36 -05:00
Isaac Connor 8f2aeca0d7 Hide EMAIL_TO, EMAIL_BODY, EMAIL_SUBJECT config entries as they are in the Filter object now 2020-01-22 13:55:49 -05:00
Isaac Connor f6d10e84f2 Fix basic auth. TUrn ControlAddress into a URI if it isn't one 2020-01-12 18:07:20 -05:00
Isaac Connor 9b2a5b2261 Add table column definitions so we can use perl code to actually create or update monitors 2020-01-10 19:06:34 -05:00
Isaac Connor 80c95d5afe Merge branch 'master' into wip_axisv2 2020-01-10 17:20:32 -05:00
Isaac Connor f8e54ba6e3 spacing, quotes 2020-01-10 16:41:22 -05:00
Isaac Connor 1d24e022bb Add realm detection 2020-01-02 16:45:27 -05:00
Isaac Connor 9d57be4c9e google code style, remove redundant code matching parent. Don't re-instantiate UA. 2020-01-02 16:24:43 -05:00
Isaac Connor 66ff602941 change default for file logging to be debug, which results in INF unless debug messages are turned on. Also clear LOG_DEBUG_FILE because it is designed to be a temporary debugging tool, and isn't all that useful at that. 2019-12-31 12:50:03 -05:00
Isaac Connor 8913341140 Bump default for WATCH_MAX_DELAY to 45 seconds. Many cameras take even over 30 seconds to obtain the first image. I find 45 to be a reasonable default 2019-12-31 12:44:41 -05:00
Isaac Connor c6813fecd5 handle new values for Orientation enum. Spacing, quotes. Handle uppercase HTTP in ControlAddress. 2019-12-10 10:14:32 -05:00
Isaac Connor 22b61cd5b2 wip cleanup of AxisV2 2019-12-02 15:51:40 -05:00
Isaac Connor e096e0a7fe improve error logging when running as root as can't chown log file 2019-11-30 15:35:09 -05:00
Isaac Connor ce44fd52d8 must reset do_log_rotate! 2019-11-22 10:04:55 -05:00
Isaac Connor c6d5198984 Fix the log Hup handler. It is too heavy. Signals can happen at any time and rotating the logs can pull the dbh connection out from under a running dbi operation. So just set a flag and move the re-init to logPrint 2019-11-22 10:02:50 -05:00
Isaac Connor 1c51c695d9 Remove printMsg, it will be inherited 2019-11-21 10:49:04 -05:00
Isaac Connor e215a6661d Google code style updates, better quotes 2019-11-21 10:45:18 -05:00
Isaac Connor 1c54f22627 Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to. 2019-11-08 15:18:08 -05:00
Isaac Connor 24cc45b3e8 Cleanup, handle warnings when output of command is undef 2019-11-06 17:20:24 -05:00
Isaac Connor 15d30b45c3 spacing and quotes 2019-10-30 09:25:55 -04:00
Isaac Connor 5c715ec96b fix use of printMsg in Netcat 2019-10-21 13:18:50 -04:00
Isaac Connor a486aafa48 spacing 2019-10-21 13:18:30 -04:00
Isaac Connor 4261550678 Change default css theme to base 2019-10-21 09:39:34 -04:00