Commit Graph

5893 Commits

Author SHA1 Message Date
Isaac Connor 7645196bdc Extend width of ControlDevice and Address to full width 2020-02-21 09:30:31 -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
zlodag a8615c1c85 fixed bug in control functions where left arrow panStep was inverted 2020-02-16 11:41:14 +13: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 137bdb1f24 Make shm have error or warning class if full 2020-02-10 14:20:46 -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 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
Isaac Connor 6345ecc479 remove debug 2020-01-23 17:04:33 -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
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 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 86a2523498 break up a long line, add some parenthesis to clarify logic 2020-01-17 12:30:26 -05:00
Isaac Connor a398f33e68 fix delTerm button not being enabled because it is a button now, not an input 2020-01-17 09:17:29 -05:00
Isaac Connor 4f2df830a8 fix inline js 2020-01-17 09:17:05 -05:00
Isaac Connor 74b3ad6dd9 add options help for HWACCEL options 2020-01-16 14:33:37 -05:00
Isaac Connor 6a43c2deb5 fix zoom_range to zoomout_range 2020-01-16 14:17:40 -05:00
Isaac Connor 028e7e8dde Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-15 19:03:11 -05:00
Isaac Connor 09f2298838 return empty array instead of nothing in probeNetwork 2020-01-15 19:02:40 -05:00
Javier Gonzalez 8b375de455 Avoid duplicate Monitors in API 2020-01-15 20:31:05 +01:00
Isaac Connor 02e9096d2b When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code 2020-01-13 17:32:57 -05:00
Isaac Connor e4ba1fd432 fix restarting zmcontrol on remote servers by passing object=filter as well 2020-01-13 17:16:15 -05:00
Isaac Connor d7dc7cdc47 Add ServerId to database log entries in php 2020-01-13 16:18:01 -05:00
Isaac Connor 9036b6db77 fix typo 2020-01-13 16:17:39 -05:00
Isaac Connor f3a9e608db Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-13 16:11:19 -05:00
Isaac Connor 91acb775eb Fix Eventount to EventCount 2020-01-13 13:43:14 -05:00
Isaac Connor b11815cfa9 Introduce Storage->EventCount to get the # of events per storage without actually loading all events. 2020-01-13 12:53:50 -05:00
Isaac Connor 6cd76ee2ff Clear cache after loading Events so as to free ram. 2020-01-13 12:53:05 -05:00
Isaac Connor f7e2359818 Implement a clear_cache function so that we can free up cached objects 2020-01-13 10:57:56 -05:00
Isaac Connor 398688550b fixtypo 2020-01-10 20:15:52 -05:00
Isaac Connor fabb7180d6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-10 20:13:28 -05:00
Isaac Connor 0c478c7962 fix Monitor->Server 2020-01-10 20:13:09 -05:00
PrplHaz4 6a4b66a792
add 3840x2160 4k UHD to monitor dropdown
I think this is fairly common in consumer IP cams now...
2020-01-10 19:44:06 -05:00
Isaac Connor 2f5caf2bb5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-10 17:21:10 -05:00
Isaac Connor 5ee0158735 Set defaults for vars == '' 2020-01-10 16:42:41 -05:00
Isaac Connor f61f6eaf7d remove line cutnpasted erroneously 2020-01-10 12:45:47 -05:00
Isaac Connor d433590f74 use find_one in stead of new to use Cached Server 2020-01-10 12:45:30 -05:00
Isaac Connor ef4ecd40fb Set defaults before saving Objects 2020-01-10 12:44:59 -05:00