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

14667 Commits

Author SHA1 Message Date
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
Isaac Connor c465fa55d8 Use ZM_PATH_FFMPEG instead of ffmpeg 2020-02-06 13:22:22 -05:00
Isaac Connor 1cbc75813c improve the output of the ajaxError to say what the action was and who the user was 2020-02-06 13:21:57 -05:00
Isaac Connor dd0ce50c17 quotes and improve the output of the ajaxError to say what the action was and who the user was 2020-02-06 13:21:30 -05:00
Isaac Connor e8a0ed9208 quotes and improve the output of the ajaxError to say what the action was and who the user was 2020-02-06 13:20:35 -05:00
Isaac Connor 0e098df972 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-04 16:53:50 -05:00
Isaac Connor 87c4227f8d
Merge pull request #2823 from connortechnology/fix_recaptcha 
Fix recaptcha
 2020-02-04 16:48:11 -05:00
Isaac Connor b7ad7ab1fc release 1.34.2 2020-02-04 16:47:39 -05:00
Isaac Connor af6b51f0d3 release 1.34.2 2020-02-04 16:47:33 -05:00
Isaac Connor 1c2f2657d2 We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha 2020-02-04 16:41:19 -05:00
Isaac Connor 42b3bb6a53 increase width of google sitekey and secret key inputs to 100% 2020-02-04 16:40:52 -05:00
Andrew Bauer 9a71ca9a2f
update specfile changelog 2020-01-31 19:25:35 -06:00
Isaac Connor 482577f8e4 Merge branch 'release-1.34' 2020-01-31 08:14:20 -05:00
Andrew Bauer ac5a7e7717
Merge pull request #2818 from firefly2442/firefly2442-patch-1 
fix spelling
 2020-01-29 07:03:22 -06:00
Patrick c5b419976f
fix spelling 2020-01-28 20:22:18 -07:00
Isaac Connor fb5111ffe4 bump version to 1.34.1 for release 2020-01-24 17:01:47 -05:00
Isaac Connor 6345ecc479 remove debug 2020-01-23 17:04:33 -05:00
Isaac Connor 8e604afb58 actually copy *.buildinfo when deploying 2020-01-21 17:21:43 -05:00
Isaac Connor daa2f1bab6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-21 16:53:53 -05:00
Isaac Connor a9ed5c1158 escape column names for mysql8. Fixes #2814 2020-01-21 16:53:43 -05:00
Isaac Connor 5f4dd319d1
Merge pull request #2813 from connortechnology/redirect_after_Login 
Instead of passing query string in form post variables, store it in s…
 2020-01-20 11:35:09 -05:00
Isaac Connor dbdb13efd7 Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811 2020-01-20 11:02:43 -05:00
Isaac Connor e53ec9c8b9
Merge pull request #2812 from ggscott/montage_mpvar_fix 
Bug fix Montage page: Allows for proper functionality if MultiPort isn't configured
 2020-01-20 10:26:16 -05:00
Garrett Scott ead52f30b1 Bug fix: Allows for inital/base install without the option MultiPort config value assigned 2020-01-20 00:44:20 -08:00
Isaac Connor 75fa1d693d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-18 16:09:44 -05:00
Isaac Connor a3754709e4 allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it. 2020-01-18 16:09:33 -05:00
Isaac Connor 6c7f003198 revert bogus change not including skin.js 2020-01-18 16:08:55 -05:00
Andrew Bauer 0992928089 merge rpm changelog from RPMFusion 2020-01-18 11:00:00 -06:00
Andrew Bauer de5bf21d8a
fix eslint 2020-01-17 15:06:46 -06:00
Isaac Connor 5b8e5eb349 don't output duplicated js when css=base 2020-01-17 14:51:02 -05:00
Isaac Connor d0003215b1 Merge branch 'master' into rate_dropdown 2020-01-17 12:30:35 -05:00
Isaac Connor 86a2523498 break up a long line, add some parenthesis to clarify logic 2020-01-17 12:30:26 -05:00