Isaac Connor
edd718afd2
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:02:49 -04:00
Isaac Connor
807efde523
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:01:04 -04:00
Isaac Connor
c83621822f
Rename Config* to ONVIF_*
2020-05-12 15:46:07 -04:00
Isaac Connor
89939efc9b
Fixup my updates to the MetaConfig tab of monitor view
2020-05-12 11:15:29 -04:00
Isaac Connor
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
Isaac Connor
732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
Isaac Connor
408da1be27
Merge branch 'release-1.34'
2020-05-08 18:46:19 -04:00
Isaac Connor
8195223a86
merge some php
2020-05-08 17:54:51 -04:00
Isaac Connor
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
Isaac Connor
d71de221ae
If auth is turned on, add a UserId dropdown to filters
2020-05-07 11:00:50 -04:00
Isaac Connor
28a3691b9c
Merge branch 'release-1.34'
2020-05-01 19:46:38 -04:00
Isaac Connor
c99db3a03f
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-05-01 18:47:10 -04:00
Isaac Connor
0085e3d34f
Don't warn about image for WebSite Monitors
2020-05-01 18:15:19 -04:00
Isaac Connor
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
Isaac Connor
6dbc917215
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-05-01 13:24:47 -04:00
Isaac Connor
e960e638b3
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 13:07:29 -04:00
Isaac Connor
bd7475a450
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-05-01 13:06:15 -04:00
Isaac Connor
e29c426f04
Pass event object to data-on-click events
2020-05-01 13:04:55 -04:00
Isaac Connor
89245e0d46
Add auth relay information when auth_relay is something other than hashed.
2020-05-01 13:04:37 -04:00
Isaac Connor
2da88be307
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-05-01 13:04:16 -04:00
Isaac Connor
4c9f67eb5a
Fix no redirect on login with palemoon browser
2020-05-01 13:03:56 -04:00
Isaac Connor
289045500b
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-05-01 13:03:35 -04:00
Isaac Connor
daa08e8740
Always just default to scale from monitor
2020-05-01 13:03:17 -04:00
Isaac Connor
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
Isaac Connor
0ed6cb7875
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 10:06:41 -04:00
Isaac Connor
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
Dvanderploeg
1d618136c0
Merge branch 'master' into camera_control_preset_correction
2020-04-30 22:10:54 -06:00
David van der Ploeg
a952984e1c
Removed value causing preset not to work
...
The first value field would not permit the presetGoto
command to be added as a value. The value would then use
the number as the command. Removing it allows the presets to
call the correct command.
2020-04-30 22:05:48 -06:00
Isaac Connor
4466bd9b16
Always just default to scale from monitor
2020-04-29 16:35:20 -04:00
Isaac Connor
74ab2e2e12
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-04-29 16:35:04 -04:00
Isaac Connor
eebd0a274d
Fix no redirect on login with palemoon browser
2020-04-29 16:34:27 -04:00
Isaac Connor
8b0f88a707
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-04-29 16:34:07 -04:00
Isaac Connor
9ec89f20d3
Add auth relay information when auth_relay is something other than hashed.
2020-04-29 16:33:41 -04:00
Isaac Connor
5e88181380
Pass event object to data-on-click events
2020-04-29 16:32:55 -04:00
Isaac Connor
e78b718168
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-04-29 16:32:26 -04:00
David van der Ploeg
83b4b6b4db
Corrected zoom out button call
...
The zoom out button wasn't calling the correct function
of "data-on-click-this" causing the request to be ignored.
2020-04-27 21:14:58 -06:00
Isaac Connor
cf3785aebf
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-04-24 12:23:48 -04:00
Isaac Connor
775b0d1ccd
fix XSS in monitor Name
2020-04-23 18:16:38 -04:00
Isaac Connor
bc9137bd93
defend against XSS in Monitor Name
2020-04-23 17:56:05 -04:00
Isaac Connor
0f91797d85
defend against XSS in Monitor Name
2020-04-23 17:53:54 -04:00
Isaac Connor
189d4a6f02
add Emailed status to events list
2020-04-23 17:52:18 -04:00
Isaac Connor
8be08d942a
Scale must be an integer value so use '0' instead of auto
2020-04-23 17:40:42 -04:00
Isaac Connor
d90177fb74
handle a 0 value for scale
2020-04-23 16:41:00 -04:00
Isaac Connor
56a43741c5
Handle a zero value for scale
2020-04-23 16:37:26 -04:00
Isaac Connor
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
Isaac Connor
5503458874
correct label_size array and add translations
2020-04-23 16:32:19 -04:00
Isaac Connor
010b230804
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-04-23 16:30:39 -04:00
Isaac Connor
8ef70f9080
defend against XSS in Monitor Name
2020-04-23 16:28:19 -04:00
Isaac Connor
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
Isaac Connor
da79f761ad
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-04-23 16:17:27 -04:00
Isaac Connor
908e892d48
Merge branch 'fix_auth_timeouts'
2020-04-23 16:15:30 -04:00
Isaac Connor
81d329af2f
spacing, eslint
2020-04-23 16:12:04 -04:00
Isaac Connor
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
Isaac Connor
91e78410a9
Stop the montagereview update while we reload the page
2020-04-23 16:08:36 -04:00
Isaac Connor
9a3f699644
Use a little less ram by passing by reference
2020-04-23 16:07:59 -04:00
Isaac Connor
d3f2dd4d6a
fix
2020-04-23 16:07:23 -04:00
Isaac Connor
7d0421a02c
defend against XSS in Monitor Name
2020-04-23 16:06:44 -04:00
Isaac Connor
93a37671c2
Merge branch 'release-1.34'
2020-04-23 16:01:52 -04:00
Isaac Connor
8e2c76df61
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
2020-04-23 15:59:12 -04:00
Isaac Connor
63aaf76f0d
handle a 0 value for scale as the scale to fit value
2020-04-23 15:57:42 -04:00
Isaac Connor
6a9a8f1d5f
check length of returned tr array to prevent errors in js log
2020-04-23 15:55:46 -04:00
Isaac Connor
12252f1f37
defend against XSS in Monitor Name
2020-04-23 15:54:12 -04:00
Isaac Connor
7347ef4030
Handle a zero value for scale
2020-04-23 15:52:47 -04:00
Isaac Connor
b7fd4e26a5
defend against XSS in Monitor Name
2020-04-23 15:51:29 -04:00
Isaac Connor
bab609426d
spacing in views/event.php
2020-04-23 15:47:10 -04:00
Isaac Connor
4e9f0b3463
defend against XSS in Monitor Name
2020-04-23 15:46:05 -04:00
Isaac Connor
b6c1a328a8
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-23 15:45:02 -04:00
Isaac Connor
8d2ce34149
include id in monitors dropdown so that it is searchable
2020-04-23 15:44:27 -04:00
Isaac Connor
91b1d7bbeb
alter setButtonState to take either an id or an element so that we can log the missing element
2020-04-23 15:43:36 -04:00
Isaac Connor
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
Isaac Connor
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
Isaac Connor
042086b565
Extend width of ControlDevice and Address to full width
2020-04-23 15:38:40 -04:00
Isaac Connor
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
Isaac Connor
055c20c3cc
fix eslint
2020-04-23 10:23:46 -04:00
Isaac Connor
eab08783e9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-04-23 10:10:08 -04:00
Isaac Connor
264ba6525b
Remove debug
2020-04-21 12:19:18 -04:00
Isaac Connor
b384d233ae
add async and defer to recaptcha load
2020-04-21 09:20:33 -04:00
Isaac Connor
543628d0ee
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
2020-04-21 09:20:04 -04:00
Isaac Connor
3e8de7dd6c
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
2020-04-21 08:30:42 -04:00
Isaac Connor
ac017a5c72
Add support for strftimes' %r when converting to moment.js formatting
2020-04-18 17:51:34 -04:00
Isaac Connor
3700b9fcbe
fix eslint
2020-04-17 11:04:07 -04:00
Isaac Connor
2194ed8b59
spacing in views/event.php
2020-04-17 09:46:10 -04:00
Isaac Connor
b74d8d7487
Add support for strftimes' %r when converting to moment.js formatting
2020-04-17 09:44:07 -04:00
Isaac Connor
74e5cc3066
eslint
2020-04-10 14:22:44 -04:00
Isaac Connor
6d4d925f1e
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-10 12:42:41 -04:00
Isaac Connor
fb70acdf6c
fix XSS in monitor Name
2020-04-10 11:32:01 -04:00
Isaac Connor
365f0240ad
fix inline javascript in ptz buttons
2020-04-10 11:30:30 -04:00
Isaac Connor
4f8016cc74
spacing in watch.php
2020-04-10 11:16:11 -04:00
Isaac Connor
85d779a624
defend against XSS in Monitor Name
2020-04-10 11:10:13 -04:00
Isaac Connor
4fe649c776
defend against XSS in Monitor Name
2020-04-10 11:10:09 -04:00
Isaac Connor
105be40ce3
fix
2020-04-10 11:09:46 -04:00
Isaac Connor
c8128de673
defend against XSS in Monitor Name
2020-04-10 11:06:39 -04:00
Isaac Connor
e9430d48a7
defend against XSS in Monitor Name
2020-04-10 11:06:20 -04:00
Isaac Connor
aad0b9362c
defend against XSS in Monitor Name
2020-04-10 11:05:48 -04:00
Isaac Connor
7473b0572a
defend against XSS in Monitor Name
2020-04-10 11:05:19 -04:00
Isaac Connor
4f4e6a85f9
defend against XSS in Monitor Name
2020-04-10 11:05:12 -04:00
Isaac Connor
40d386fe6c
Handle Zones without monitor
2020-04-09 20:41:34 -04:00
Isaac Connor
ea8fe7b9a9
check length of returned tr array to prevent errors in js log
2020-04-06 11:59:27 -04:00
Isaac Connor
d0fe1b60df
Merge branch 'release-1.34'
2020-04-04 16:58:53 -04:00
Isaac Connor
024431808e
fix onchange to data-on-change-this in width,height,scale, layout dropdowns
2020-04-04 16:57:24 -04:00
Isaac Connor
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
Isaac Connor
e2cb8a656d
change exportEvent to expertEvents
2020-04-04 11:53:07 -04:00
Isaac Connor
402c38725b
Limit version check popups to once per hour
2020-04-04 11:52:40 -04:00
Isaac Connor
6feffe2aa9
whitespace
2020-04-04 11:51:39 -04:00
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
ebac665d4d
Must use namespace ZM
2020-03-31 08:54:47 -04:00
Isaac Connor
4dcba55ab6
Include Storage.php and Server.php
2020-03-31 08:53:32 -04:00
Isaac Connor
2fe0096b21
correct label_size array and add translations
2020-03-30 18:34:43 -04:00
Isaac Connor
ff061bd48e
Fixup VNC input options. Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-03-30 10:09:53 -04:00
hax0kartik
a781cc2c87
WIP scaling
2020-03-27 14:32:50 -04:00
hax0kartik
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
Isaac Connor
4eed0a9c29
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 14:30:41 -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
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
Isaac Connor
b354641df3
fix syntax errors in triggers in monitor view
2020-03-26 13:57:19 -04:00
Isaac Connor
2bd805c1f1
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
2020-03-24 16:16:32 -04:00
Isaac Connor
5a20ef959f
Merge branch 'release-1.34'
2020-03-20 11:07:46 -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
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
Isaac Connor
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
Isaac Connor
59bd658a96
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
2020-03-10 18:46:20 -04:00
Isaac Connor
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -04:00
Isaac Connor
e8553babfa
remove extra spaces, fix eslint
2020-03-09 14:43:54 -04:00
Isaac Connor
3d993eef80
Fix triggers code
2020-03-09 14:39:57 -04:00
Isaac Connor
f056f787c5
Merge branch 'release-1.34'
2020-03-08 17:24:06 -04:00
Isaac Connor
e56976c800
Triggers cannot be null, it is '' instead
2020-03-08 17:23:48 -04:00
Isaac Connor
b482993d33
Merge branch 'release-1.34'
2020-03-06 15:04:48 -05:00
Isaac Connor
f003daa791
Merge branch 'add_enabled_to_storage'
2020-03-05 15:48:43 -05:00
Isaac Connor
55f63e8e9d
Merge branch 'fix_auth_timeouts'
2020-03-04 11:22:08 -05:00
Isaac Connor
a9e3d0691f
quotes, fix status ajax call using old auth_hash
2020-03-04 11:17:48 -05:00
Isaac Connor
9f696186a8
Increase height of storage popup for Enabled
2020-03-04 10:48:02 -05:00
Isaac Connor
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
Isaac Connor
077b8888f9
Use Storage object and add Enabled
2020-03-04 10:46:32 -05:00
Isaac Connor
3a24f27a7a
include id in monitors dropdown so that it is searchable
2020-03-03 16:59:38 -05: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
c1e13221f7
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 14:59:36 -05:00
Isaac Connor
a2dd24ae1f
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-03-02 14:38:36 -05:00
Isaac Connor
00de49a5c1
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-03-02 12:43:07 -05:00
Isaac Connor
967e5ad30f
alter setButtonState to take either an id or an element so that we can log the missing element
2020-03-02 11:52:32 -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
b9acf42929
spacing, eslint
2020-02-29 09:28:04 -05:00
Isaac Connor
bf9ba39aa2
Merge branch 'release-1.34'
2020-02-25 18:22:55 -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
e82ed3a098
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:13:42 -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
23e4b43aa0
Stop the montagereview update while we reload the page
2020-02-25 16:53:08 -05:00
Isaac Connor
3adc20b04e
Use a little less ram by passing by reference
2020-02-25 16:52:45 -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
5c3b7f109e
fix cyclePlay button not working.
2020-02-25 13:17:45 -05:00
Isaac Connor
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
Isaac Connor
a7c28be365
change scale to fit value from auto to 0
2020-02-25 12:14:34 -05:00
Isaac Connor
8c7d2c5e1a
handle a 0 value for scale
2020-02-25 12:14:07 -05:00
Isaac Connor
e2ff241017
handle a 0 value for scale as the scale to fit value
2020-02-25 12:13:05 -05:00
Isaac Connor
71dd292a8d
Revert "Handle a zero value for scale"
...
This reverts commit a5da6d12f3
.
2020-02-25 11:19:09 -05:00
Isaac Connor
a5da6d12f3
Handle a zero value for scale
2020-02-25 11:18:28 -05:00
Isaac Connor
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
Isaac Connor
2f89bd28b7
Handle a zero value for scale
2020-02-25 11:18:02 -05:00
Isaac Connor
37abd41e78
Handle a zero value for scale
2020-02-25 11:17:46 -05:00
Isaac Connor
429000c13b
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-02-25 11:14:12 -05:00
Isaac Connor
638e333702
Scale must be an integer value so use '0' instead of auto
2020-02-25 11:13:20 -05:00
Isaac Connor
cc7de97b6a
Merge branch 'release-1.34'
2020-02-24 14:39:50 -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
b389f9660d
Merge branch 'fix_class_PTZ_presets_almost_invisible'
2020-02-24 13:17:09 -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
e640fc0c26
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-22 10:50:07 -05:00
Isaac Connor
63a3f2e453
Fix zoneminder.com url getting undefined being added to it
2020-02-22 10:50:00 -05:00
Andrew Bauer
c29f2cb8cf
fix our friend, eslint
2020-02-21 14:22:53 -06:00
Isaac Connor
ce8c8a755c
fix eslint
2020-02-21 10:29:27 -05:00
Isaac Connor
d51fdafbc0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-21 09:37:45 -05:00
Isaac Connor
7645196bdc
Extend width of ControlDevice and Address to full width
2020-02-21 09:30:31 -05:00
Isaac Connor
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
Isaac Connor
3b1458bb88
add Emailed status to events list
2020-02-19 14:17:44 -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
52dfbc92e9
put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr
2020-01-24 11:10:02 -05:00
Isaac Connor
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
Isaac Connor
948b3d7e43
Impleent click_AutoEmail to hide/show the Email options
2020-01-22 17:02:16 -05:00
Isaac Connor
d95857d419
Add EmailTo,EmailSubject,EmailBody fields to filter view
2020-01-22 14:05:08 -05:00
Isaac Connor
f4b5f5f399
style the new Email content fields
2020-01-22 14:04:23 -05:00
Isaac Connor
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -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
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -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
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -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
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
0a495395b0
Restore Gain tab
2020-01-03 16:34:46 -05:00
Isaac Connor
f572c4092a
add checks for Zoom, Focus, White, Iris movement types
2020-01-03 15:58:57 -05:00
Isaac Connor
158e26bb25
split long lines
2020-01-03 15:58:02 -05:00
Isaac Connor
c4aaa33bea
add widths for number inputs on controlcap view
2020-01-03 15:57:51 -05:00
Isaac Connor
0b3776dbf0
change text inputs to number inputs, cleanups
2020-01-03 15:57:29 -05:00
Isaac Connor
3cfc1a0a6d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-02 16:45:39 -05:00
Isaac Connor
60d45d967f
test for existence of selected checkboxes in post data because if none are selected, the array won't exist
2020-01-02 10:17:07 -05:00
Andrew Bauer
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
Isaac Connor
6a39893c1d
include i elements in data-on-click
2019-12-31 19:11:14 -05:00
Isaac Connor
714d304528
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
2019-12-31 19:10:29 -05:00
Isaac Connor
2c76c12664
Fix export to include files when using DEEP scheme. Also make it more efficient
2019-12-30 22:18:55 -05:00
Isaac Connor
845f35fe00
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
2019-12-26 15:57:25 -05:00
Isaac Connor
1977e48ddd
DefaultScale is a member of the Monitor, not the event
2019-12-26 15:21:27 -05:00
Isaac Connor
42a724891b
spacing
2019-12-20 16:11:38 -05:00
Isaac Connor
63d20a1514
Move hidden inputs to top of form
2019-12-20 16:11:24 -05:00
Isaac Connor
5a45835006
break up long lines
2019-12-20 16:11:10 -05:00
Isaac Connor
23dde04725
remove timeout on changing runstate.
2019-12-20 16:10:30 -05:00
Isaac Connor
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
Isaac Connor
3c59be9616
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-19 09:24:44 -05:00
Isaac Connor
958a6b8218
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-18 19:06:19 -05:00
Isaac Connor
e39a95d761
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
2019-12-18 19:06:10 -05:00
Isaac Connor
67cc9faa8c
remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else.
2019-12-18 19:05:06 -05:00
Isaac Connor
34354f5871
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
2019-12-18 12:13:00 -05:00
Isaac Connor
3b12b67b4a
fix eslint
2019-12-18 10:40:51 -05:00
Isaac Connor
689956bba7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-13 17:49:00 -05:00
Isaac Connor
5b7efb2b33
fix mouseover streaming in chrome when adblocker disabled
2019-12-13 17:48:22 -05:00
Isaac Connor
18ed90d147
remove second hit to db to load storage areas with no serverid
2019-12-13 17:47:51 -05:00
Isaac Connor
0dbc1ef15c
Use multiport when talking monitor stream on montage
2019-12-13 11:51:55 -05:00
Isaac Connor
0bbbbb302e
add default for Units in new zone
2019-12-13 11:51:07 -05:00
Isaac Connor
ed417a49b4
increase logspopup width to eliminate scrollbars
2019-12-08 11:21:38 -05:00
Isaac Connor
3af6358314
fix & to &
2019-12-02 15:49:49 -05:00