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

14494 Commits

Author SHA1 Message Date
Isaac Connor 4c2fb6bf08 populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar. 2020-02-25 13:40:44 -05:00
Isaac Connor 173d58d8b3
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console 
Event list is not filtered when group is selected on console
 2020-02-24 14:37:42 -05:00
Isaac Connor 55c99c5ff3 Include filtered monitors for filter query on totals line of event counts. Fixes #2846 2020-02-24 14:34:21 -05:00
Isaac Connor f4521d20e0 Fix applying rotation to x264encoded video which has already been rotated. 2020-02-24 14:12:10 -05:00
Isaac Connor 2d3f72188d
Merge pull request #2851 from connortechnology/fix_class_PTZ_presets_almost_invisible 
fix_class_PTZ_presets_almost_invisible
 2020-02-24 13:16:19 -05:00
Isaac Connor d0a8d241d2 Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849 2020-02-24 13:13:54 -05:00
Pliable Pixels 7109bff6a7 mention other values for GPU 2020-02-24 12:44:36 -05:00
Isaac Connor d7f8f201be Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:51:26 -05: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 ea2eba4110 bump version to 1.34.3 2020-02-19 13:50:27 -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 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
Isaac Connor 821355c117 Only set date.timezone if we have a configured value in the Config 2020-02-11 13:21:28 -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 3717e6b702
Merge pull request #2830 from connortechnology/fix_zms_mp4_rotation 
Fix zms mp4 rotation
 2020-02-10 16:41:34 -05:00
Isaac Connor 4f25426b1f load event orientation as well and if it's an mp4 do the rotation on the image before outputting. Fixes #2829 2020-02-10 16:22:01 -05:00
Isaac Connor 137bdb1f24 Make shm have error or warning class if full 2020-02-10 14:20:46 -05:00
Isaac Connor 1add4b2ef5
Merge pull request #2828 from connortechnology/fix_2825 
Fix 2825
 2020-02-09 13:56:16 -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 466468b0fd code style cleanups and uncomment get_service_urls call in create_services so that we actually parse the ONVIF response. 2020-02-09 13:50:22 -05:00
Andrew Bauer 4d82a5485a rpm specfile 
I have to use my contact info for rpmfusion
 2020-02-08 10:46:54 -06:00
Isaac Connor 4479029e27 When doing a release, reploy to debian/release-VERSION instead of master. 2020-02-06 14:46:26 -05:00
Isaac Connor 83411cd6f2 fix zmrepo dest dir when doing a proper release 2020-02-06 14:45:38 -05:00
Isaac Connor 389a6b3ec8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-06 13:22:30 -05:00