Commit Graph

2885 Commits

Author SHA1 Message Date
Isaac Connor 61e6627fce fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version 2020-04-04 11:48:42 -04:00
Isaac Connor 2441ae2924 Improve event export a little bit. Add links to eventFrames and eventDetail html. 2020-04-03 15:34:20 -04:00
Isaac Connor 4547332fad Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated. 2020-04-03 15:32:22 -04:00
Isaac Connor ef9fbac90c Add Noscript warnings. Whitespace, improve some logic 2020-04-02 18:14:14 -04:00
Isaac Connor 1cc60f0857 fix action on cycle play button 2020-04-02 16:06:27 -04:00
Isaac Connor 87069b99b6 Fix inline-script errors on groups page referenced in #2890 2020-04-02 14:13:28 -04:00
Isaac Connor 1ab294e291 Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto. 2020-03-27 12:43:21 -04:00
Isaac Connor b354641df3 fix syntax errors in triggers in monitor view 2020-03-26 13:57:19 -04:00
Isaac Connor ecaaae90f3 fix streamImg loading when using applet. Also don't alter actParms as it is not a global. 2020-03-20 11:06:01 -04:00
Isaac Connor e8553babfa remove extra spaces, fix eslint 2020-03-09 14:43:54 -04:00
Isaac Connor e56976c800 Triggers cannot be null, it is '' instead 2020-03-08 17:23:48 -04:00
Isaac Connor bd59ae8856 Move the Basic Auth login code from skin.php to includes/auth.php 2020-03-02 15:00:31 -05:00
Isaac Connor 76131d1887 Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style. 2020-03-01 11:07:31 -05:00
Isaac Connor 1b70ed2076 Merge branch 'fix_generate_video_page' into release-1.34 2020-02-25 18:22:24 -05:00
Isaac Connor 0c70c5c2a4 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:14:27 -05:00
Isaac Connor c08ec996f7 Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843 2020-02-25 18:12:25 -05:00
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 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
Isaac Connor d7f8f201be Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:51:26 -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 137bdb1f24 Make shm have error or warning class if full 2020-02-10 14:20:46 -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 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 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 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 09f2298838 return empty array instead of nothing in probeNetwork 2020-01-15 19:02:40 -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
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
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 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