Commit Graph

15429 Commits

Author SHA1 Message Date
Isaac Connor 2f57ccc9b9 Merge branch 'release-1.34' 2020-07-29 16:27:01 -04:00
Isaac Connor 4ed0ad26a7 bail early if fwrite fails 2020-07-29 14:01:52 -04:00
Isaac Connor b1054a7db6 bail earlier if writing content-length fails. Dropped connections aren't really errors, make them Info. Fixes #2996 2020-07-29 13:39:00 -04:00
Isaac Connor 5bea68c93d add comment and improve logging of figuring out event starttime from youngest file 2020-07-28 10:35:28 -04:00
Isaac Connor 767f5ebb03 navbar closes the form, and doesn't need to be in the form. 2020-07-27 12:40:46 -04:00
Isaac Connor 5d883d696b give a better error message when submitThisForm fails 2020-07-27 12:40:25 -04:00
Isaac Connor ca07602414 fix html structure when not logged in. Move version class down to where we use it. add parenthesis to quiet php deprecation errors 2020-07-27 12:15:37 -04:00
Andrew Bauer cec5d7ea06 w-100 class not needed 2020-07-27 10:22:23 -05:00
Andrew Bauer ffa3415318 when collapsed, force the menu button to the right 2020-07-27 10:13:02 -05:00
Andrew Bauer bc19ae604a fix alignment of top navbar 2020-07-27 09:18:02 -05:00
Isaac Connor 1e76679820 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-26 22:33:34 -04:00
Isaac Connor 5f9c62f266 spacing and slightly improve nav item code in options 2020-07-26 22:33:29 -04:00
Isaac Connor 31cbfc35b1 fix use of is_callable so that we fix filter saving 2020-07-26 22:32:55 -04:00
Isaac Connor 003abfea29 Update class so that Submit button is hidden under new bootstrap 2020-07-26 22:32:36 -04:00
Andrew Bauer 941c074a8e add carriage returns to generated html for readability 2020-07-26 10:50:32 -05:00
Andrew Bauer 6486f59383 fix colorization of navbar widgets 2020-07-26 10:41:05 -05:00
Andrew Bauer eaed5abcd3 add missing bootstrap.bundle.js.map 2020-07-25 16:56:17 -05:00
Isaac Connor 3ec7952c31 apply cache_busting to bootstrap, overlay anda reset 2020-07-25 15:05:12 -04:00
Isaac Connor c81e4a3bca fix 2020-07-25 14:32:30 -04:00
Isaac Connor 99d7aa0da0 fix 2020-07-25 14:31:57 -04:00
Isaac Connor 4af343e833 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-25 14:28:32 -04:00
Isaac Connor e3b339e72e add missing globals 2020-07-25 14:28:26 -04:00
Isaac Connor e90efa7a7e spacing 2020-07-25 14:28:08 -04:00
Isaac Connor 4c8f96b786 Update saving action to use our ORM methods 2020-07-25 14:28:01 -04:00
Isaac Connor dda630f522 fix filter_regexp to remove trailing / 2020-07-25 14:27:09 -04:00
Isaac Connor 522dfecebe Fix setting values by checking is_callable. Remove debug. Fix filter_regexp 2020-07-25 14:26:49 -04:00
Isaac Connor 7511b1fd7e Fix for saving jpegs 2020-07-25 14:25:45 -04:00
Andrew Bauer c48fa83c6d upgrade to bootstrap 4.5 2020-07-25 13:18:09 -05:00
Isaac Connor fe9db4cfa2 add filtering to Storage->Path() 2020-07-25 13:51:13 -04:00
Isaac Connor a819b73e18 allow filter_regexp to be an array 2020-07-25 13:50:59 -04:00
Isaac Connor 859428db51 remove debug 2020-07-24 15:42:53 -04:00
Isaac Connor f4a0f91d7f nothing 2020-07-24 15:27:05 -04:00
Isaac Connor 1f889bd086 def don't use linesize when allocating share images 2020-07-24 15:26:48 -04:00
Isaac Connor 4ecfa32601 remove uneccessary multiplications from jpeg compression. 2020-07-24 15:26:28 -04:00
Isaac Connor 0e9da28a97 Don't pass linesize to shared images. Shared images have to have a contiguous chunk of memory. 2020-07-24 12:48:38 -04:00
Isaac Connor 0a9fdb4eb3 Fix second jump by matching final WriteJpeg destination. Just use linesize instead of assigning to row_stride 2020-07-24 12:41:27 -04:00
Isaac Connor d9a9aeef1d if linesizes don't match, allocate a frame buffer and use that when sws_scaleing and then copy to the image buffer. 2020-07-24 12:37:24 -04:00
Isaac Connor 490009446d fix use of int or unsigned long instead of int for monitor id 2020-07-23 19:32:30 -04:00
Isaac Connor 559fe15e3f fix use of int or unsigned long instead of int for monitor id 2020-07-23 19:32:25 -04:00
Isaac Connor e9681fcdcf fix use of int or unsigned long instead of int for monitor id 2020-07-23 19:31:12 -04:00
Isaac Connor ee4d90d906 remove debug 2020-07-23 17:15:43 -04:00
Isaac Connor cceb010048 set linesize in WriteBuffer which also sets colours, width, etc. Fixes segfault when streaming from jpegs 2020-07-23 17:14:56 -04:00
Isaac Connor 4f3b6a063e don't cast fps to an int... values like 2.038 become 1. 2020-07-23 16:08:57 -04:00
Isaac Connor e3a2099ca8 fix crash because we weren't setting alarm status 2020-07-23 16:08:35 -04:00
Andrew Bauer bda7e1a2b7 minor cleanup of getNavBarHTML 2020-07-23 12:52:21 -05:00
Isaac Connor 038590270e Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-07-23 12:06:05 -04:00
Isaac Connor 18272b9587 add debug for prealarmcount 2020-07-23 12:05:53 -04:00
Isaac Connor 7aa46df50f Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-07-23 12:05:32 -04:00
Andrew Bauer e6cce14c77 additional cleanup of getNavBarHTML 2020-07-23 10:54:42 -05:00
Isaac Connor 89007227b6 Add reboot method to SkyIPCam7xx control script 2020-07-23 11:54:19 -04:00