Commit Graph

14828 Commits

Author SHA1 Message Date
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 ced36a5333 remove debug and spacing 2020-04-23 15:40:35 -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 617b74b8bb fix botched merge 2020-04-23 15:28:38 -04:00
out a7e49bd62a update chinese translation (~ ̄▽ ̄)~ 2020-04-23 15:27:06 -04:00
Isaac Connor c0b7aad2c8 add passive to addEventListener 2020-04-23 15:23:53 -04:00
Isaac Connor 17896b656a cleanup and revert adding Event stack trace 2020-04-23 15:23:11 -04:00
Isaac Connor 54995ab0d1 handle sort_asc not being set. Handle term['val'] not being set. 2020-04-23 15:18:05 -04:00
Isaac Connor f06dc3f171 Update group save action, using Group object methods. Fixes errors on new MariaDB 2020-04-23 15:16:22 -04:00
Isaac Connor b05916fc50 Use === when testing for empty value and setting defaults 2020-04-23 15:08:01 -04:00
Isaac Connor eb26c5f798 Fix use of array_key_exists instead of property_exists 2020-04-23 15:07:28 -04:00
Isaac Connor f5bf474ba6 filter bad characters out of Monitor Name 2020-04-23 14:59:21 -04:00
Isaac Connor 6f08322f7f add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving 2020-04-23 11:12:47 -04:00
Isaac Connor daff14df9b Allow users without System::View to read servers.json 2020-04-23 11:10:30 -04:00
Pliable Pixels 9b77f77ac3 better logs 2020-04-23 11:09:39 -04:00
Isaac Connor c3a80e7e40 Add MonitorId to event data returned for status request 2020-04-23 11:07:07 -04:00
Isaac Connor 59f9f37fff cleanup. Don't output errors that break json response 2020-04-23 11:06:41 -04:00
Isaac Connor 3ac6dc267b out an error if name contains invalid characters 2020-04-23 11:01:34 -04:00
Isaac Connor 57141fddeb handle additional atributes on the html tag in html detection 2020-04-23 10:46:18 -04:00
Isaac Connor 576e3149d6 escape table columns for mysql8 2020-04-23 10:43:01 -04:00
Isaac Connor 7046612b65 Code style updates. Quote the word Function in SQL for newer mysql 2020-04-23 10:41:59 -04:00
Isaac Connor 67b35967d4 MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once. 2020-04-23 10:39:50 -04:00
Isaac Connor a7b553cdbe code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-04-23 10:37:42 -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 10d89ed82e Spacing, quotes, improve debug messages. 2020-04-23 10:00:11 -04:00