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 |
Isaac Connor
|
a735f2cd1b
|
Merge pull request #2919 from connortechnology/fix_recaptcha
Fix recaptcha
|
2020-04-22 17:54:15 -04:00 |
|
Isaac Connor
|
264ba6525b
|
Remove debug
|
2020-04-21 12:19:18 -04:00 |
|
Isaac Connor
|
b384d233ae
|
add async and defer to recaptcha load
|
2020-04-21 09:20:33 -04:00 |
|
Isaac Connor
|
543628d0ee
|
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
|
2020-04-21 09:20:04 -04:00 |
|
Isaac Connor
|
d0e83fcfcb
|
handle case where g-recaptcha-response is not in the request, due to failure to render the recaptcha
|
2020-04-21 09:19:29 -04:00 |
|
Isaac Connor
|
3e8de7dd6c
|
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
|
2020-04-21 08:30:42 -04:00 |
Patrick
|
8fd32b8f1d
|
add area definition to zone creation via API
|
2020-04-18 17:52:42 -04:00 |
|
Isaac Connor
|
ac017a5c72
|
Add support for strftimes' %r when converting to moment.js formatting
|
2020-04-18 17:51:34 -04:00 |
|
Isaac Connor
|
924841ae71
|
Merge pull request #2913 from connortechnology/fix_monitor_loading
Fix monitor loading
|
2020-04-18 17:49:34 -04:00 |
|
Isaac Connor
|
006c0d0029
|
reference ppa for 1.34 instead of ppa for 1.32
|
2020-04-14 17:54:10 -04:00 |
|
Isaac Connor
|
2d5d87839f
|
Fix warnings about hashed authentication not being available when using gnutls. Also set cmake_policy(SET CMP0054 NEW) to quiet warnings
|
2020-04-05 13:35:21 -04:00 |
|
Isaac Connor
|
210d380029
|
CSP must include all Servers.
|
2020-04-04 16:57:52 -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 |