732bb5416f
Merge branch 'master' into onvif_updated
2020-05-09 16:26:29 -04:00
408da1be27
Merge branch 'release-1.34'
2020-05-08 18:46:19 -04:00
24c09a8207
Accept 0 as a value for scale meaning scale to fit
2020-05-08 17:55:12 -04:00
8195223a86
merge some php
2020-05-08 17:54:51 -04:00
f1d794c11b
spacing and escape sql fields
2020-05-07 13:57:37 -04:00
d71de221ae
If auth is turned on, add a UserId dropdown to filters
2020-05-07 11:00:50 -04:00
e01538419f
Add FilterUser to language
2020-05-07 10:59:50 -04:00
a9a490126a
Add UserId to Filter object
2020-05-07 10:59:32 -04:00
5a15701873
remove annoying ()
2020-05-05 18:07:28 -04:00
dadcea4884
remove recursive from index
2020-05-05 16:35:14 -04:00
0817ea3bfb
added association method to GroupsController to get Monitor Id/Name of monitors that belong to the group
2020-05-05 16:32:54 -04:00
28a3691b9c
Merge branch 'release-1.34'
2020-05-01 19:46:38 -04:00
c99db3a03f
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
2020-05-01 18:47:10 -04:00
0085e3d34f
Don't warn about image for WebSite Monitors
2020-05-01 18:15:19 -04:00
683bf3f982
Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors
2020-05-01 15:32:54 -04:00
9dbeaa2c7b
Add default for Orientation. Fixes saving WebSite type monitors
2020-05-01 15:32:26 -04:00
1bd340d602
spacing in watch.php
2020-05-01 13:30:00 -04:00
6dbc917215
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-05-01 13:24:47 -04:00
82188c266e
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-05-01 13:23:39 -04:00
45a445ac48
sync up index.php to master, where is a global
2020-05-01 13:21:02 -04:00
ad373a5549
add Zone.php from master
2020-05-01 13:20:42 -04:00
ebfae1f855
turn off debug
2020-05-01 13:17:39 -04:00
e960e638b3
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 13:07:29 -04:00
bd7475a450
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-05-01 13:06:15 -04:00
e29c426f04
Pass event object to data-on-click events
2020-05-01 13:04:55 -04:00
89245e0d46
Add auth relay information when auth_relay is something other than hashed.
2020-05-01 13:04:37 -04:00
2da88be307
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-05-01 13:04:16 -04:00
4c9f67eb5a
Fix no redirect on login with palemoon browser
2020-05-01 13:03:56 -04:00
289045500b
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-05-01 13:03:35 -04:00
daa08e8740
Always just default to scale from monitor
2020-05-01 13:03:17 -04:00
62ddc02d52
quotes to match master
2020-05-01 13:01:34 -04:00
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
0ed6cb7875
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 10:06:41 -04:00
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
1d618136c0
Merge branch 'master' into camera_control_preset_correction
2020-04-30 22:10:54 -06:00
a952984e1c
Removed value causing preset not to work
...
The first value field would not permit the presetGoto
command to be added as a value. The value would then use
the number as the command. Removing it allows the presets to
call the correct command.
2020-04-30 22:05:48 -06:00
4466bd9b16
Always just default to scale from monitor
2020-04-29 16:35:20 -04:00
74ab2e2e12
Don't use event as a variable name unless we are talking about window evnt. Change controlCmd to take the event and get the button from event.target
2020-04-29 16:35:04 -04:00
eebd0a274d
Fix no redirect on login with palemoon browser
2020-04-29 16:34:27 -04:00
8b0f88a707
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
2020-04-29 16:34:07 -04:00
9ec89f20d3
Add auth relay information when auth_relay is something other than hashed.
2020-04-29 16:33:41 -04:00
5e88181380
Pass event object to data-on-click events
2020-04-29 16:32:55 -04:00
e78b718168
use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working
2020-04-29 16:32:26 -04:00
cb44f2c5de
Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol.
2020-04-29 16:30:59 -04:00
83b4b6b4db
Corrected zoom out button call
...
The zoom out button wasn't calling the correct function
of "data-on-click-this" causing the request to be ignored.
2020-04-27 21:14:58 -06:00
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
496fd6b15a
reorganize to reduce code depth
2020-04-23 18:17:20 -04:00
775b0d1ccd
fix XSS in monitor Name
2020-04-23 18:16:38 -04:00
bc9137bd93
defend against XSS in Monitor Name
2020-04-23 17:56:05 -04:00
0f91797d85
defend against XSS in Monitor Name
2020-04-23 17:53:54 -04:00
189d4a6f02
add Emailed status to events list
2020-04-23 17:52:18 -04:00
8be08d942a
Scale must be an integer value so use '0' instead of auto
2020-04-23 17:40:42 -04:00
9d42d0e2f0
silence warning when no language is set
2020-04-23 17:38:15 -04:00
b3a8ac0b2a
tidy up, be more efficient and warn when language files are not found.
2020-04-23 17:37:46 -04:00
d90177fb74
handle a 0 value for scale
2020-04-23 16:41:00 -04:00
56a43741c5
Handle a zero value for scale
2020-04-23 16:37:26 -04:00
bf99daf494
Merge branch 'rate_dropdown'
2020-04-23 16:36:34 -04:00
5503458874
correct label_size array and add translations
2020-04-23 16:32:19 -04:00
010b230804
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-04-23 16:30:39 -04:00
8ef70f9080
defend against XSS in Monitor Name
2020-04-23 16:28:19 -04:00
25cd13f8ad
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-04-23 16:25:35 -04:00
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
908e892d48
Merge branch 'fix_auth_timeouts'
2020-04-23 16:15:30 -04:00
81d329af2f
spacing, eslint
2020-04-23 16:12:04 -04:00
5bf068791b
Merge branch 'rate_dropdown' into release-1.34
2020-04-23 16:11:59 -04:00
91e78410a9
Stop the montagereview update while we reload the page
2020-04-23 16:08:36 -04:00
9a3f699644
Use a little less ram by passing by reference
2020-04-23 16:07:59 -04:00
d3f2dd4d6a
fix
2020-04-23 16:07:23 -04:00
7d0421a02c
defend against XSS in Monitor Name
2020-04-23 16:06:44 -04:00
93a37671c2
Merge branch 'release-1.34'
2020-04-23 16:01:52 -04:00
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
63aaf76f0d
handle a 0 value for scale as the scale to fit value
2020-04-23 15:57:42 -04:00
6a9a8f1d5f
check length of returned tr array to prevent errors in js log
2020-04-23 15:55:46 -04:00
12252f1f37
defend against XSS in Monitor Name
2020-04-23 15:54:12 -04:00
7347ef4030
Handle a zero value for scale
2020-04-23 15:52:47 -04:00
b7fd4e26a5
defend against XSS in Monitor Name
2020-04-23 15:51:29 -04:00
bab609426d
spacing in views/event.php
2020-04-23 15:47:10 -04:00
4e9f0b3463
defend against XSS in Monitor Name
2020-04-23 15:46:05 -04:00
b6c1a328a8
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-23 15:45:02 -04:00
8d2ce34149
include id in monitors dropdown so that it is searchable
2020-04-23 15:44:27 -04:00
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
a6f5ae2601
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-04-23 15:42:30 -04:00
ced36a5333
remove debug and spacing
2020-04-23 15:40:35 -04:00
96774bd038
fix inline javascript in ptz buttons
2020-04-23 15:39:31 -04:00
042086b565
Extend width of ControlDevice and Address to full width
2020-04-23 15:38:40 -04:00
617b74b8bb
fix botched merge
2020-04-23 15:28:38 -04:00
a7e49bd62a
update chinese translation (～￣▽￣)～
2020-04-23 15:27:06 -04:00
c0b7aad2c8
add passive to addEventListener
2020-04-23 15:23:53 -04:00
17896b656a
cleanup and revert adding Event stack trace
2020-04-23 15:23:11 -04:00
54995ab0d1
handle sort_asc not being set. Handle term['val'] not being set.
2020-04-23 15:18:05 -04:00
f06dc3f171
Update group save action, using Group object methods. Fixes errors on new MariaDB
2020-04-23 15:16:22 -04:00
b05916fc50
Use === when testing for empty value and setting defaults
2020-04-23 15:08:01 -04:00
eb26c5f798
Fix use of array_key_exists instead of property_exists
2020-04-23 15:07:28 -04:00
f5bf474ba6
filter bad characters out of Monitor Name
2020-04-23 14:59:21 -04:00
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
daff14df9b
Allow users without System::View to read servers.json
2020-04-23 11:10:30 -04:00
9b77f77ac3
better logs
2020-04-23 11:09:39 -04:00
c3a80e7e40
Add MonitorId to event data returned for status request
2020-04-23 11:07:07 -04:00
59f9f37fff
cleanup. Don't output errors that break json response
2020-04-23 11:06:41 -04:00
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
055c20c3cc
fix eslint
2020-04-23 10:23:46 -04:00
eab08783e9
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-04-23 10:10:08 -04:00
264ba6525b
Remove debug
2020-04-21 12:19:18 -04:00
b384d233ae
add async and defer to recaptcha load
2020-04-21 09:20:33 -04:00
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
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
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
ac017a5c72
Add support for strftimes' %r when converting to moment.js formatting
2020-04-18 17:51:34 -04:00
3700b9fcbe
fix eslint
2020-04-17 11:04:07 -04:00
2194ed8b59
spacing in views/event.php
2020-04-17 09:46:10 -04:00
7d4e1fe895
Test for opening file before getting it's size. Remove some debug in view_video
2020-04-17 09:45:40 -04:00
b74d8d7487
Add support for strftimes' %r when converting to moment.js formatting
2020-04-17 09:44:07 -04:00
74e5cc3066
eslint
2020-04-10 14:22:44 -04:00
6d4d925f1e
Fix XSS from monitor Name, group Name, storage Name, server Name
2020-04-10 12:42:41 -04:00
d99ec696b4
reorganize to reduce code depth
2020-04-10 12:21:53 -04:00
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
81ed022d5a
Add a filter_regexp to Monitor Name
2020-04-10 12:16:32 -04:00
fb70acdf6c
fix XSS in monitor Name
2020-04-10 11:32:01 -04:00
365f0240ad
fix inline javascript in ptz buttons
2020-04-10 11:30:30 -04:00
4f8016cc74
spacing in watch.php
2020-04-10 11:16:11 -04:00
fe96ba0a2a
cleanup and revert adding Event stack trace
2020-04-10 11:14:46 -04:00
da94985508
add back global servers
2020-04-10 11:14:09 -04:00
2d748091a2
handle sort_asc not being set. Handle term['val'] not being set.
2020-04-10 11:13:30 -04:00
a25c3dfb5c
Add MonitorId to event data returned for status request
2020-04-10 11:11:24 -04:00
45c13176dc
cleanup. Don't output errors that break json response
2020-04-10 11:10:57 -04:00
85d779a624
defend against XSS in Monitor Name
2020-04-10 11:10:13 -04:00
4fe649c776
defend against XSS in Monitor Name
2020-04-10 11:10:09 -04:00
105be40ce3
fix
2020-04-10 11:09:46 -04:00
c8128de673
defend against XSS in Monitor Name
2020-04-10 11:06:39 -04:00
e9430d48a7
defend against XSS in Monitor Name
2020-04-10 11:06:20 -04:00
aad0b9362c
defend against XSS in Monitor Name
2020-04-10 11:05:48 -04:00
7473b0572a
defend against XSS in Monitor Name
2020-04-10 11:05:19 -04:00
4f4e6a85f9
defend against XSS in Monitor Name
2020-04-10 11:05:12 -04:00
dca12d8efa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-04-09 20:41:44 -04:00
40d386fe6c
Handle Zones without monitor
2020-04-09 20:41:34 -04:00
c3ab03d3c8
update chinese translation (～￣▽￣)～
2020-04-09 15:30:43 +08:00
da8c265945
Update with updatelangs.php
2020-04-09 12:35:02 +08:00
ea8fe7b9a9
check length of returned tr array to prevent errors in js log
2020-04-06 11:59:27 -04:00
d0fe1b60df
Merge branch 'release-1.34'
2020-04-04 16:58:53 -04:00
210d380029
CSP must include all Servers.
2020-04-04 16:57:52 -04:00
024431808e
fix onchange to data-on-change-this in width,height,scale, layout dropdowns
2020-04-04 16:57:24 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
e2cb8a656d
change exportEvent to expertEvents
2020-04-04 11:53:07 -04:00
402c38725b
Limit version check popups to once per hour
2020-04-04 11:52:40 -04:00
6feffe2aa9
whitespace
2020-04-04 11:51:39 -04:00
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
f81cfc0513
add 1 month as an option to the version popup dropdown
2020-04-04 11:46:31 -04:00
2441ae2924
Improve event export a little bit. Add links to eventFrames and eventDetail html.
2020-04-03 15:34:20 -04:00
5d72e3b1b5
ensure no output buffering when downloading an archive.
2020-04-03 15:33:28 -04:00
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
Isaac Connor
Pliable Pixels
Dvanderploeg
David van der Ploeg
out
outline
Isaac Connor