Isaac Connor
|
cf3785aebf
|
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
|
2020-04-24 12:23:48 -04:00 |
|
Isaac Connor
|
e770be2e13
|
Merge branch 'release-1.34'
|
2020-04-23 10:26:16 -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
|
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 |
|
Isaac Connor
|
ac017a5c72
|
Add support for strftimes' %r when converting to moment.js formatting
|
2020-04-18 17:51:34 -04:00 |
|
Isaac Connor
|
3700b9fcbe
|
fix eslint
|
2020-04-17 11:04:07 -04:00 |
|
Isaac Connor
|
2194ed8b59
|
spacing in views/event.php
|
2020-04-17 09:46:10 -04:00 |
|
Isaac Connor
|
7d4e1fe895
|
Test for opening file before getting it's size. Remove some debug in view_video
|
2020-04-17 09:45:40 -04:00 |
|
Isaac Connor
|
b74d8d7487
|
Add support for strftimes' %r when converting to moment.js formatting
|
2020-04-17 09:44:07 -04:00 |
|
Isaac Connor
|
74e5cc3066
|
eslint
|
2020-04-10 14:22:44 -04:00 |
|
Isaac Connor
|
6d4d925f1e
|
Fix XSS from monitor Name, group Name, storage Name, server Name
|
2020-04-10 12:42:41 -04:00 |
|
Isaac Connor
|
d99ec696b4
|
reorganize to reduce code depth
|
2020-04-10 12:21:53 -04:00 |
|
Isaac Connor
|
bdfdc2a20c
|
add ability to set a filter_regexp in the defaults for an object to have new values be altered before saving
|
2020-04-10 12:17:09 -04:00 |
|
Isaac Connor
|
81ed022d5a
|
Add a filter_regexp to Monitor Name
|
2020-04-10 12:16:32 -04:00 |
|
Isaac Connor
|
fb70acdf6c
|
fix XSS in monitor Name
|
2020-04-10 11:32:01 -04:00 |
|
Isaac Connor
|
365f0240ad
|
fix inline javascript in ptz buttons
|
2020-04-10 11:30:30 -04:00 |
|
Isaac Connor
|
4f8016cc74
|
spacing in watch.php
|
2020-04-10 11:16:11 -04:00 |
|
Isaac Connor
|
fe96ba0a2a
|
cleanup and revert adding Event stack trace
|
2020-04-10 11:14:46 -04:00 |
|
Isaac Connor
|
da94985508
|
add back global servers
|
2020-04-10 11:14:09 -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
|
a25c3dfb5c
|
Add MonitorId to event data returned for status request
|
2020-04-10 11:11:24 -04:00 |
|
Isaac Connor
|
45c13176dc
|
cleanup. Don't output errors that break json response
|
2020-04-10 11:10:57 -04:00 |
|
Isaac Connor
|
85d779a624
|
defend against XSS in Monitor Name
|
2020-04-10 11:10:13 -04:00 |
|
Isaac Connor
|
4fe649c776
|
defend against XSS in Monitor Name
|
2020-04-10 11:10:09 -04:00 |
|
Isaac Connor
|
105be40ce3
|
fix
|
2020-04-10 11:09:46 -04:00 |
|
Isaac Connor
|
c8128de673
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:39 -04:00 |
|
Isaac Connor
|
e9430d48a7
|
defend against XSS in Monitor Name
|
2020-04-10 11:06:20 -04:00 |
|
Isaac Connor
|
aad0b9362c
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:48 -04:00 |
|
Isaac Connor
|
7473b0572a
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:19 -04:00 |
|
Isaac Connor
|
4f4e6a85f9
|
defend against XSS in Monitor Name
|
2020-04-10 11:05:12 -04:00 |
|
Isaac Connor
|
dca12d8efa
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-04-09 20:41:44 -04:00 |
|
Isaac Connor
|
40d386fe6c
|
Handle Zones without monitor
|
2020-04-09 20:41:34 -04:00 |
out
|
c3ab03d3c8
|
update chinese translation (～￣▽￣)～
|
2020-04-09 15:30:43 +08:00 |
outline
|
da8c265945
|
Update with updatelangs.php
|
2020-04-09 12:35:02 +08:00 |
|
Isaac Connor
|
ea8fe7b9a9
|
check length of returned tr array to prevent errors in js log
|
2020-04-06 11:59:27 -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
|
024431808e
|
fix onchange to data-on-change-this in width,height,scale, layout dropdowns
|
2020-04-04 16:57:24 -04:00 |
|
Isaac Connor
|
571ff260cc
|
Merge branch 'release-1.34'
|
2020-04-04 16:35:09 -04:00 |
|
Isaac Connor
|
e2cb8a656d
|
change exportEvent to expertEvents
|
2020-04-04 11:53:07 -04:00 |
|
Isaac Connor
|
402c38725b
|
Limit version check popups to once per hour
|
2020-04-04 11:52:40 -04:00 |
|
Isaac Connor
|
6feffe2aa9
|
whitespace
|
2020-04-04 11:51:39 -04:00 |
|
Isaac Connor
|
61e6627fce
|
fix fail to update version reminder due to submit button both submitting and formSubmitting as well as view not being set to version
|
2020-04-04 11:48:42 -04:00 |
Isaac Connor
|
f81cfc0513
|
add 1 month as an option to the version popup dropdown
|
2020-04-04 11:46:31 -04:00 |
|
Isaac Connor
|
2441ae2924
|
Improve event export a little bit. Add links to eventFrames and eventDetail html.
|
2020-04-03 15:34:20 -04:00 |