Commit Graph

2311 Commits

Author SHA1 Message Date
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 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 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 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