Commit Graph

499 Commits

Author SHA1 Message Date
Isaac Connor 3cf31435a7 fix next/prev buttons by correcting the sort_field when it is StartTime or EndTime 2020-11-13 09:51:54 -05:00
Isaac Connor 8029f59eac Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:52:50 -05:00
Isaac Connor 2178da387d pass desired object name into querystring() 2020-10-23 17:56:38 -04:00
Isaac Connor 946a59ce8b add special case for sort_field being StartDateTime. This is not an event column and must be corrected to StartTime 2020-10-21 10:37:39 -04:00
Andrew Bauer 442fadb585 link bstable locale to zoneminder's 2020-10-17 07:28:14 -05:00
Isaac Connor 12b75e93b8 Merge branch 'release-1.34' 2020-10-15 17:19:56 -04:00
Isaac Connor 3c5dc8e8b3 Add line breaks in select options 2020-10-15 17:16:14 -04:00
Isaac Connor 10c0a6617c Return Debug to a regular function to match other logging functions. Since we switched to using namespaces we no longer clash with cake_php. 2020-10-14 10:39:25 -04:00
Isaac Connor cd2e96eaec Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-10-13 08:42:28 -04:00
Isaac Connor 908c20e959 add ZM prefix to Warning 2020-10-13 08:42:22 -04:00
Andrew Bauer 1db31ba574 remove makePopupLink function. Use makeLink instead 2020-10-12 12:20:21 -05:00
Isaac Connor b683d5326a Test for empty array in htmlOPtions when notifying about not selecting a value 2020-10-07 11:22:42 -04:00
Andrew Bauer 87fd316e5b makePopupButton removed, use makeButton instead 2020-10-05 16:40:14 -05:00
Andrew Bauer 2852d14ca6 use data-on-change-this instead of inline js 2020-10-04 08:04:11 -05:00
Andrew Bauer b8d95dfa05 fix array to string php warning 2020-10-01 09:13:50 -05:00
Andrew Bauer ae9139b00c unpopup zone view 2020-09-25 10:52:13 -05:00
Isaac Connor 8bd958e91c pass querySep to querystring 2020-09-24 12:12:06 -04:00
Isaac Connor 29880cdab3 handle width options['width'] and options['height'] aren't set 2020-09-17 20:57:14 -04:00
Andrew Bauer aa6bf31cbd pass OLANG as a function parm 2020-09-11 07:51:00 -05:00
Isaac Connor 3b7bde755e
Merge pull request #3041 from mnoorenberghe/unsafe_inline_backcompat
Drop support for CSP 1 browsers (with no nonce-* support)
2020-09-10 18:09:44 -04:00
Andrew Bauer 46d4f55b80 add makeHelpLink helper function 2020-09-10 17:06:27 -05:00
Matthew Noorenberghe f031ce9934 Drop support for CSP 1 browsers (with no nonce-* support)
This gets rid of console spew in modern browsers.
2020-09-10 16:25:43 -04:00
Isaac Connor c5e4a964cd quotes, spacing fix some functions that clearly no one uses 2020-09-05 12:49:14 -04:00
Isaac Connor 240f4ceabd Fix code warning if no value is selected in htmlSelect 2020-09-03 18:21:38 -04:00
Isaac Connor 94c7708df5 Warn when the specified selected value isn't in the passed options. Don't default to adding id in htmlSelect. Shouldbe passed in behaviours 2020-09-03 10:42:33 -04:00
Isaac Connor 31e8270470 Do not set width and height of stream based on monitor size 2020-09-02 14:37:28 -04:00
Isaac Connor 9fef228636 remove debug Warning 2020-08-27 13:38:13 -04:00
Isaac Connor b451c323e9 remove debug code at Warning level 2020-08-26 18:40:31 -04:00
Isaac Connor 0a3ad719cd Merge branch 'master' into filter_pre_post 2020-08-17 18:30:44 -04:00
Isaac Connor 72cad5f6d6 Move more code from parseFilter to Filter object. 2020-08-17 16:57:14 -04:00
Isaac Connor d1126b3007 Move term logic from parseFilter to FilterTerm class 2020-08-16 13:02:34 -04:00
Isaac Connor 4fee59208d Use str_replace and ltrim instead of preg_replace for efficiency 2020-08-13 12:14:18 -04:00
Isaac Connor d42424d6d8 Merge branch 'release-1.34' 2020-08-11 11:41:11 -04:00
Isaac Connor b4a3ccdfed only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport. 2020-08-09 22:18:07 -04:00
Isaac Connor 3df58fc9db handle array args in daemonStatus 2020-07-30 19:36:05 -04:00
Isaac Connor c4d4a73c2a json decoding errors shouldnt' be fatal 2020-07-29 16:41:37 -04:00
Isaac Connor 4c5a88a822 json decoding errors shouldnt' be fatal 2020-07-29 16:40:31 -04:00
Isaac Connor e90efa7a7e spacing 2020-07-25 14:28:08 -04:00
Isaac Connor a70b329ce3 Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-07-20 18:40:59 -04:00
Isaac Connor 2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor c47a348fea Handle empty string version of scale 2020-06-30 19:18:45 -04:00
Isaac Connor b060e0835c Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2020-06-25 16:07:22 -04:00
Isaac Connor 13130a844e handle array args in daemonStatus 2020-06-25 16:07:16 -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 0644358d0a in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954 2020-06-03 17:41:03 -04:00
Isaac Connor 24c09a8207 Accept 0 as a value for scale meaning scale to fit 2020-05-08 17:55:12 -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 2d748091a2 handle sort_asc not being set. Handle term['val'] not being set. 2020-04-10 11:13:30 -04:00
Isaac Connor d0fe1b60df Merge branch 'release-1.34' 2020-04-04 16:58:53 -04:00
Isaac Connor 210d380029 CSP must include all Servers. 2020-04-04 16:57:52 -04:00