Commit Graph

14672 Commits

Author SHA1 Message Date
hax0kartik 46d77ee849 Add libjwt as a optional library 2020-02-20 07:55:59 -08:00
hax0kartik 1959b2e070 Add optional library jwt 2020-02-20 07:45:33 -08:00
Isaac Connor 6d5fcd15ff Merge branch 'connortechnology-fix_user_self_edit_2841' into release-1.34 2020-02-19 16:57:57 -05:00
Isaac Connor 5aaf58fe27 Merge branch 'fix_user_self_edit_2841' of https://github.com/connortechnology/ZoneMinder into connortechnology-fix_user_self_edit_2841 2020-02-19 16:57:35 -05:00
Isaac Connor 1a87eb40bd Fixes #2841 and maintains login through password change 2020-02-19 16:55:38 -05:00
Isaac Connor e772a3d606 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-02-19 14:53:47 -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 17eca9f495 bump version to 1.35.0 for db upgrade 2020-02-19 14:50:16 -05:00
Isaac Connor 0d91f5965d
Merge pull request #2840 from connortechnology/onvif_multicast_route
Onvif multicast route
2020-02-19 14:48:50 -05:00
Isaac Connor 300402013c Merge branch 'master' into improve_filter_emails 2020-02-19 14:44:37 -05:00
Isaac Connor c488756eb8 Merge branch 'master' into fix_remote_http 2020-02-19 14:42:24 -05:00
Isaac Connor 5d494329db Merge branch 'master' into onvif_multicast_route 2020-02-19 14:29:22 -05:00
Isaac Connor 25c77f57e0 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-02-19 14:29:04 -05:00
Isaac Connor ec4d565f07 set the net interface used in TransportUDP when specified 2020-02-19 14:28:53 -05:00
Isaac Connor b8d0192bcd Add optional net_interface after soap version to discover command 2020-02-19 14:28:23 -05:00
Isaac Connor 2315bed56d Add set_net_interface function and use the when setting up the multicast socket 2020-02-19 14:27:36 -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
Isaac Connor 3b1458bb88 add Emailed status to events list 2020-02-19 14:17:44 -05:00
Isaac Connor 58fe753bee
Merge pull request #2838 from ZoneMinder/release-1.34
bump version to 1.34.3
2020-02-19 14:03:24 -05:00
Isaac Connor ea2eba4110 bump version to 1.34.3 2020-02-19 13:50:27 -05:00
Isaac Connor 258ae23fb9 out an error if name contains invalid characters 2020-02-19 09:42:54 -05:00
Isaac Connor 292f0ea077
Merge pull request #2837 from zlodag/master
#2833 Added monitor presets and controls for D-Link DCS-5020L, and minor bug fix in zmcamtool
2020-02-19 09:24:21 -05:00
zlodag 0c97bff645 monitor presets and controls for D-Link DCS-5020L 2020-02-19 22:50:09 +13:00
zlodag 1168db9df0 Fixed regexp in zmcamtool to accept names for currently existing MonitorPresets 2020-02-19 22:47:40 +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 789db4e5a6 Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817 2020-02-18 13:29:06 -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 179da58bc8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-17 16:32:52 -05:00
Isaac Connor c337fb921d Don't die if no MetaDataConfigurations 2020-02-17 16:32:37 -05:00
Isaac Connor 290c3f2bfc
Merge pull request #2835 from zlodag/master
simple bug fixes
2020-02-15 20:20:09 -05:00
Isaac Connor ad9d12f0c6
Merge pull request #2834 from firefly2442/api-spelling
fix spelling
2020-02-15 20:17:54 -05:00
zlodag a8615c1c85 fixed bug in control functions where left arrow panStep was inverted 2020-02-16 11:41:14 +13:00
zlodag 2c51b1436c cleaned input for "zmcamtool.pl --export <control_or_preset_name>" to fix error when running in taint mode 2020-02-16 11:41:06 +13:00
Patrick 6abc91c11d
fix spelling 2020-02-15 13:52:35 -07: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 65ea0e5076 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2020-02-11 17:10:12 -05:00
Isaac Connor e6785fca90 fix repo when doing a release 2020-02-11 17:10:08 -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 4758b2304a Do not alter the start time of an event 2020-02-11 15:02:12 -05:00
Isaac Connor 289bde869d use a better language for unset value 2020-02-11 14:31:48 -05:00
Isaac Connor 9f9a97f596 fix dropdown with unset option 2020-02-11 14:29:21 -05:00
Isaac Connor 844ff529e1 add an unset value to ZM_TIMEZONE in Options->System 2020-02-11 13:24:26 -05:00
Isaac Connor 600dbba8c5 We don't need to set date_default_timezone_get 2020-02-11 13:23:53 -05:00