Commit Graph

5877 Commits

Author SHA1 Message Date
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
Alex Porosanu 28a4bef6ba fix tar invocation for *BSD platforms
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
2020-01-09 22:03:02 +02:00
Andrew Bauer f13a7199e1
fix eslint 2020-01-07 21:53:55 -06:00
Isaac Connor c64de372a7 when auth_hash changes, update various CmdParms 2020-01-07 17:08:57 -05:00
Isaac Connor 0571909d05 add remote_IP to log entries on php side 2020-01-07 17:08:29 -05:00
Isaac Connor 1865df3fe0 remove some debug, add some parenthesis to ensure logic works as intended 2020-01-07 17:08:07 -05:00
Isaac Connor 61bc0ddd0a add missing t and merge some lines 2020-01-07 11:01:53 -05:00
Isaac Connor 2f1b725ee4 quote SQL for mysql8 2020-01-07 11:01:02 -05:00
Isaac Connor 7535769e4b controlcap needs to be larger 2020-01-05 17:34:40 -05:00
Isaac Connor 71581831b5 fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons 2020-01-05 17:34:27 -05:00
Isaac Connor 6ac26ec1aa quotes 2020-01-05 17:33:53 -05:00
Isaac Connor c3641df531 spaces 2020-01-05 17:30:06 -05:00
Isaac Connor 00f8a450de spaces and quotes 2020-01-05 14:59:25 -05:00
Isaac Connor 7fdf6165d5 Fix case in var name 2020-01-03 17:08:11 -05:00
Isaac Connor c8e39e2418 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-01-03 16:35:15 -05:00
Isaac Connor e951b0af1c add code to set default value for checkboxes 2020-01-03 16:35:04 -05:00
Isaac Connor 0a495395b0 Restore Gain tab 2020-01-03 16:34:46 -05:00