Commit Graph

845 Commits

Author SHA1 Message Date
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
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 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
Andrew Bauer de5bf21d8a
fix eslint 2020-01-17 15:06:46 -06: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 6a43c2deb5 fix zoom_range to zoomout_range 2020-01-16 14:17:40 -05: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 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 f572c4092a add checks for Zoom, Focus, White, Iris movement types 2020-01-03 15:58:57 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06: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 42a724891b spacing 2019-12-20 16:11:38 -05:00