Isaac Connor
|
775b0d1ccd
|
fix XSS in monitor Name
|
2020-04-23 18:16:38 -04:00 |
|
Isaac Connor
|
bc9137bd93
|
defend against XSS in Monitor Name
|
2020-04-23 17:56:05 -04:00 |
|
Isaac Connor
|
0f91797d85
|
defend against XSS in Monitor Name
|
2020-04-23 17:53:54 -04:00 |
|
Isaac Connor
|
189d4a6f02
|
add Emailed status to events list
|
2020-04-23 17:52:18 -04:00 |
|
Isaac Connor
|
8be08d942a
|
Scale must be an integer value so use '0' instead of auto
|
2020-04-23 17:40:42 -04:00 |
|
Isaac Connor
|
d90177fb74
|
handle a 0 value for scale
|
2020-04-23 16:41:00 -04:00 |
|
Isaac Connor
|
56a43741c5
|
Handle a zero value for scale
|
2020-04-23 16:37:26 -04:00 |
|
Isaac Connor
|
bf99daf494
|
Merge branch 'rate_dropdown'
|
2020-04-23 16:36:34 -04:00 |
|
Isaac Connor
|
5503458874
|
correct label_size array and add translations
|
2020-04-23 16:32:19 -04:00 |
|
Isaac Connor
|
010b230804
|
Fix value of auto in width dropdown. Allow a 0 value for scale.
|
2020-04-23 16:30:39 -04:00 |
|
Isaac Connor
|
8ef70f9080
|
defend against XSS in Monitor Name
|
2020-04-23 16:28:19 -04:00 |
|
Isaac Connor
|
25cd13f8ad
|
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
|
2020-04-23 16:25:35 -04:00 |
|
Isaac Connor
|
da79f761ad
|
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
|
2020-04-23 16:17:27 -04:00 |
|
Isaac Connor
|
908e892d48
|
Merge branch 'fix_auth_timeouts'
|
2020-04-23 16:15:30 -04:00 |
Isaac Connor
|
81d329af2f
|
spacing, eslint
|
2020-04-23 16:12:04 -04:00 |
|
Isaac Connor
|
5bf068791b
|
Merge branch 'rate_dropdown' into release-1.34
|
2020-04-23 16:11:59 -04:00 |
|
Isaac Connor
|
91e78410a9
|
Stop the montagereview update while we reload the page
|
2020-04-23 16:08:36 -04:00 |
|
Isaac Connor
|
9a3f699644
|
Use a little less ram by passing by reference
|
2020-04-23 16:07:59 -04:00 |
|
Isaac Connor
|
d3f2dd4d6a
|
fix
|
2020-04-23 16:07:23 -04:00 |
|
Isaac Connor
|
7d0421a02c
|
defend against XSS in Monitor Name
|
2020-04-23 16:06:44 -04:00 |
|
Isaac Connor
|
93a37671c2
|
Merge branch 'release-1.34'
|
2020-04-23 16:01:52 -04:00 |
|
Isaac Connor
|
8e2c76df61
|
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
|
2020-04-23 15:59:12 -04:00 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
40d386fe6c
|
Handle Zones without monitor
|
2020-04-09 20:41:34 -04: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
|
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
|
2441ae2924
|
Improve event export a little bit. Add links to eventFrames and eventDetail html.
|
2020-04-03 15:34:20 -04:00 |
|
Isaac Connor
|
4547332fad
|
Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated.
|
2020-04-03 15:32:22 -04:00 |
|
Isaac Connor
|
ef9fbac90c
|
Add Noscript warnings. Whitespace, improve some logic
|
2020-04-02 18:14:14 -04:00 |
|
Isaac Connor
|
1cc60f0857
|
fix action on cycle play button
|
2020-04-02 16:06:27 -04:00 |
|
Isaac Connor
|
87069b99b6
|
Fix inline-script errors on groups page referenced in #2890
|
2020-04-02 14:13:28 -04:00 |
|
Isaac Connor
|
ebac665d4d
|
Must use namespace ZM
|
2020-03-31 08:54:47 -04:00 |
|
Isaac Connor
|
4dcba55ab6
|
Include Storage.php and Server.php
|
2020-03-31 08:53:32 -04:00 |
|
Isaac Connor
|
2fe0096b21
|
correct label_size array and add translations
|
2020-03-30 18:34:43 -04:00 |
|
Isaac Connor
|
ff061bd48e
|
Fixup VNC input options. Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
|
2020-03-30 10:09:53 -04:00 |
hax0kartik
|
a781cc2c87
|
WIP scaling
|
2020-03-27 14:32:50 -04:00 |
|
hax0kartik
|
ae80b3b859
|
Start implementing VNC
|
2020-03-27 14:32:50 -04:00 |
|
Isaac Connor
|
4eed0a9c29
|
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
|
2020-03-27 14:30:41 -04:00 |
|
Isaac Connor
|
1ab294e291
|
Fix selecting layout after save by using value in session. When applying layout, if height is auto, set the img height to auto.
|
2020-03-27 12:43:21 -04:00 |
|
Isaac Connor
|
4ce944da23
|
Merge branch 'release-1.34'
|
2020-03-26 15:38:35 -04:00 |
|
Isaac Connor
|
b354641df3
|
fix syntax errors in triggers in monitor view
|
2020-03-26 13:57:19 -04:00 |
|
Isaac Connor
|
2bd805c1f1
|
minor code cleanup, adding monitor click event in a previous for loop instead of iterating again
|
2020-03-24 16:16:32 -04:00 |
|
Isaac Connor
|
5a20ef959f
|
Merge branch 'release-1.34'
|
2020-03-20 11:07:46 -04:00 |
|
Isaac Connor
|
ecaaae90f3
|
fix streamImg loading when using applet. Also don't alter actParms as it is not a global.
|
2020-03-20 11:06:01 -04:00 |
|
Isaac Connor
|
f8fa0340fc
|
fix eslint
|
2020-03-14 09:27:07 -04:00 |
|
Isaac Connor
|
9a3127da06
|
Merge branch 'rate_dropdown'
|
2020-03-10 18:47:19 -04:00 |
|
Isaac Connor
|
59bd658a96
|
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
|
2020-03-10 18:46:20 -04:00 |
|
Isaac Connor
|
84d719f2dd
|
Merge branch 'release-1.34' into rate_dropdown
|
2020-03-10 16:06:11 -04:00 |
|
Isaac Connor
|
e8553babfa
|
remove extra spaces, fix eslint
|
2020-03-09 14:43:54 -04:00 |
|
Isaac Connor
|
3d993eef80
|
Fix triggers code
|
2020-03-09 14:39:57 -04:00 |
|
Isaac Connor
|
f056f787c5
|
Merge branch 'release-1.34'
|
2020-03-08 17:24:06 -04:00 |
|
Isaac Connor
|
e56976c800
|
Triggers cannot be null, it is '' instead
|
2020-03-08 17:23:48 -04:00 |
|
Isaac Connor
|
b482993d33
|
Merge branch 'release-1.34'
|
2020-03-06 15:04:48 -05:00 |
|
Isaac Connor
|
f003daa791
|
Merge branch 'add_enabled_to_storage'
|
2020-03-05 15:48:43 -05:00 |
|
Isaac Connor
|
55f63e8e9d
|
Merge branch 'fix_auth_timeouts'
|
2020-03-04 11:22:08 -05:00 |
|
Isaac Connor
|
a9e3d0691f
|
quotes, fix status ajax call using old auth_hash
|
2020-03-04 11:17:48 -05:00 |
|
Isaac Connor
|
9f696186a8
|
Increase height of storage popup for Enabled
|
2020-03-04 10:48:02 -05:00 |
|
Isaac Connor
|
ac00ca0ad8
|
Only list enabled Storage Areas
|
2020-03-04 10:46:59 -05:00 |