Commit Graph

6078 Commits

Author SHA1 Message Date
Isaac Connor 366ce5b3eb Add 100% width to LabelFormat 2020-07-30 19:36:27 -04:00
Isaac Connor 3df58fc9db handle array args in daemonStatus 2020-07-30 19:36:05 -04:00
Isaac Connor 0a782814a7 Don't start filter if the command was execute 2020-07-30 17:13:30 -04:00
Isaac Connor 204086a56d spacing and quotes 2020-07-30 17:12:00 -04:00
Isaac Connor c2ac7ed4a9 spacing and escape sql fields 2020-07-30 17:07:43 -04:00
Isaac Connor 2cfa5fde98 Add missing view tempplates for zone add/edit. Fixes #2986 2020-07-30 16:54:00 -04:00
Isaac Connor d8cd4386cf rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
Use EncoderParams when setting movflags in VideoStore.

Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
Isaac Connor 6a4ce29bce eslint fixes 2020-07-30 12:15:05 -04:00
Isaac Connor 8e37efaa7a handle when [fid] = 0; Fixes #2994 2020-07-29 18:50:14 -04:00
Isaac Connor c4d4a73c2a json decoding errors shouldnt' be fatal 2020-07-29 16:41:37 -04:00
Isaac Connor 0139d06fcd Fix data-on-input-this using onchange instead of oninput 2020-07-29 16:41:27 -04:00
Isaac Connor e23c6de373 populate monitors with monitor array which will be json-encoded. Fixes failed population of monitor names dropdown 2020-07-20 17:42:25 -04:00
Isaac Connor 4e2633d22b Update code to make calls to api on remote servers 2020-07-20 16:25:29 -04:00
Isaac Connor e839919b5e Add foreign key MonitorId validation 2020-07-20 16:25:08 -04:00
Isaac Connor 955fc00b87 Fix Zone add api. Restart zmc when adding a zone. Use validation. Fixes #2983 2020-07-20 16:24:49 -04:00
Isaac Connor bbee6b4f58 Whitespace, delete dead code 2020-07-20 16:23:55 -04:00
Isaac Connor cb0e54d3be consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop 2020-07-20 10:23:26 -04:00
Isaac Connor 135bbb4190 remove unneeded config loading, just use defines. Spacing, remove commented out dead code 2020-07-19 17:51:28 -04:00
Isaac Connor 9d6e0fc3af Merge pull request #2977 from roddone/fix_events_table_responsive
make events table (events view) responsive
2020-07-16 15:49:01 -04:00
Isaac Connor dcd67a1acf Remove args with non-sensical values from cgi params as a micro-opt 2020-07-13 14:50:21 -04:00
Isaac Connor 6469300af5 fix some csp violations
y
2020-07-07 18:57:11 -04:00
Isaac Connor 89f975e646 remove code to play a sound on alarm. Not going to support that when editing a zone. 2020-07-07 16:40:33 -04:00
Isaac Connor 33d4680f02 Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal. 2020-07-07 16:35:37 -04:00
Isaac Connor 8a35ae2daf Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-07-04 09:04:38 -04:00
Isaac Connor ff265d2f17 replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs 2020-07-04 09:00:30 -04:00
Isaac Connor e2a38268a0 replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs 2020-07-04 08:59:41 -04:00
Isaac Connor fd10f545bd if width/height don't evaluate to an integer, set to auto. 2020-07-04 08:58:09 -04:00
Isaac Connor cc0624eb3f Don't allow viewing of monitor setting if monitor permissions are set to View 2020-07-03 19:19:13 -04:00
Isaac Connor 1860ad188b Don't allow viewing of zones or zone if Monitor permissions are view 2020-07-03 19:18:36 -04:00
Isaac Connor 343d8d832e handle scale values of '' and 'auto' 2020-07-03 19:18:05 -04:00
Isaac Connor 2026788e7a Turn close link into a button 2020-07-03 19:17:26 -04:00
Isaac Connor 66b155008c Fix scale defaulting to monitor default Scale 2020-07-03 19:17:11 -04:00
Isaac Connor 9f821c74f6 Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor 2020-07-03 19:16:41 -04:00
Isaac Connor 697f117ecd Make width of content 100% instead of 96%. 2020-07-02 17:22:34 -04:00
Isaac Connor 346fe63ef0 Add styles for inputs on monitor view 2020-06-30 19:19:17 -04:00
Isaac Connor c47a348fea Handle empty string version of scale 2020-06-30 19:18:45 -04:00
Isaac Connor 4d8d926c89 minor code updates. Use user_row instead of generic row variable name. 2020-06-23 22:19:46 -04:00
Isaac Connor e778ea0918 Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. 2020-06-23 22:19:04 -04:00
Isaac Connor 93b0552ed7 Update saving Users. Don't allow restrictions on admin user. Fix CSP violations. 2020-06-23 22:18:45 -04:00
Isaac Connor 910d4b51c9 Escape table names for mysql-8 2020-06-04 11:44:59 -04:00
Isaac Connor 8802447b10 Handle no DB_HOST specifed so default to localhost 2020-06-04 11:36:10 -04:00
Isaac Connor ef3fc758cb in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954 2020-06-04 11:34:48 -04:00
Isaac Connor 20870e22fa fix eslint errors 2020-05-29 13:28:33 -04:00
Isaac Connor eb41e4fb39 Fix the array for the de-interlacing options 2020-05-24 11:09:13 -04:00
Isaac Connor ce15e1c921 remove debug, don't pass element through event handler anymore on layout ddm 2020-05-20 09:42:29 -04:00
Isaac Connor cc04ced406 load zmMontageLayout ddm explicitly instead of passing event element 2020-05-20 09:42:06 -04:00
Isaac Connor 4dc693022e Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize 2020-05-15 16:02:19 -04:00
Isaac Connor c4c4c5bcbf fix Crud submodule version 2020-05-15 11:34:34 -04:00
Isaac Connor 424a4ed0b1 add onclick to div.zoom 2020-05-15 11:34:23 -04:00
Isaac Connor 0dd426d64c handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click 2020-05-15 11:33:10 -04:00