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 |
|
Isaac Connor
|
b611e2616b
|
handle scale=auto
|
2020-03-24 16:15:24 -04:00 |
|
Isaac Connor
|
e06912a995
|
Merge branch 'release-1.34'
|
2020-03-21 15:28:27 -04:00 |
|
Isaac Connor
|
d3df0defc9
|
Support missing openssl_random_pseudo_bytes by using alternate functions
|
2020-03-21 15:28:18 -04:00 |
|
Isaac Connor
|
d24069e3d0
|
Look for global array so we don't load all Servers multiple times. Add all servers to allowed script-src in CSPHeaders
|
2020-03-04 11:03:07 -05:00 |
|
Isaac Connor
|
fa6ac399be
|
Fix code in makePopupLink. Return content-type application/json for json response
|
2020-03-02 17:21:58 -05:00 |
|
Isaac Connor
|
85e5ade07a
|
fix makePopupLink when condition is false
|
2020-03-02 16:10:56 -05:00 |
|
Isaac Connor
|
6456d52b97
|
Merge branch 'fix_user_lang'
|
2020-02-27 17:43:51 -05:00 |
|
Isaac Connor
|
bab0b2e830
|
handle a scale value of auto
|
2020-02-27 11:35:40 -05:00 |
|
Isaac Connor
|
a34af39ca7
|
Fix logging line in generate video function
|
2020-02-25 18:14:14 -05:00 |
|
Isaac Connor
|
4d044a1f14
|
Fix logging line in generate video function
|
2020-02-25 18:11:07 -05:00 |
|
Isaac Connor
|
f719514998
|
remove debug
|
2020-02-25 13:39:33 -05:00 |
|
Isaac Connor
|
4dda37a6ee
|
remove extra }
|
2020-02-25 12:13:12 -05:00 |
|
Isaac Connor
|
d68d115581
|
Handle scale==0 to do width=100%.
|
2020-02-25 11:12:49 -05:00 |
|
Isaac Connor
|
df5bf788d9
|
Filtering by Alarmed Zone now only supports a single value using EXISTS as the operator. We now also support CURDATE() and NOW() as values for Date/StartDate/EndDate
|
2020-01-24 11:09:27 -05:00 |
|
Isaac Connor
|
9d41334e8f
|
Merge branch 'master' into add_alarmed_zone_to_filters
|
2020-01-22 13:45:37 -05:00 |
|
Isaac Connor
|
a3754709e4
|
allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it.
|
2020-01-18 16:09:33 -05: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
|
9e43e06a55
|
Add empty array value for terms when there isn't any to get rid of warning when loading all events
|
2019-12-26 11:22:42 -05:00 |