Commit Graph

864 Commits

Author SHA1 Message Date
Isaac Connor 8d8d37c648 fix eslint 2020-05-01 09:57:46 -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 e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00
Isaac Connor 264ba6525b Remove debug 2020-04-21 12:19:18 -04:00
Isaac Connor 74e5cc3066 eslint 2020-04-10 14:22:44 -04:00
Isaac Connor 365f0240ad fix inline javascript in ptz buttons 2020-04-10 11:30:30 -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 ea8fe7b9a9 check length of returned tr array to prevent errors in js log 2020-04-06 11:59:27 -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 87069b99b6 Fix inline-script errors on groups page referenced in #2890 2020-04-02 14:13:28 -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 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 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 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 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 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 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 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
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 dab5c520fe Merge branch 'master' into add_alarmed_zone_to_filters 2020-02-19 14:20:08 -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
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