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
4e58a38317
use ini_set(display_errors,0) instead of turning off errors entirely so that we still log errors, just not output them instead of json.
2020-04-03 15:21:31 -04:00
ef9fbac90c
Add Noscript warnings. Whitespace, improve some logic
2020-04-02 18:14:14 -04:00
1cc60f0857
fix action on cycle play button
2020-04-02 16:06:27 -04:00
87069b99b6
Fix inline-script errors on groups page referenced in #2890
2020-04-02 14:13:28 -04:00
3bfcd8eb33
Check for definition of ZM_TIMEZONE before using it. Fixes #2895
2020-04-02 14:00:36 -04:00
ebac665d4d
Must use namespace ZM
2020-03-31 08:54:47 -04:00
4dcba55ab6
Include Storage.php and Server.php
2020-03-31 08:53:32 -04:00
2fe0096b21
correct label_size array and add translations
2020-03-30 18:34:43 -04:00
eec634c1b0
Add Source() support for VNC type
2020-03-30 10:10:06 -04:00
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
599960ef05
Update group save action, using Group object methods. Fixes errors on new MariaDB
2020-03-28 10:09:13 -04:00
a781cc2c87
WIP scaling
2020-03-27 14:32:50 -04:00
ae80b3b859
Start implementing VNC
2020-03-27 14:32:50 -04:00
c3bcdcff64
Use zm_session_start instead of session_start
2020-03-27 14:30:42 -04:00
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
50700031b1
Use zm_session_start instead of session_start
2020-03-27 13:05:12 -04:00
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
17fbafd7de
including the language files must come after auth in order to user the user's language setting
2020-03-27 11:41:04 -04:00
4ce944da23
Merge branch 'release-1.34'
2020-03-26 15:38:35 -04:00
3e55795cad
Handle different command line syntax for zmcontrol.pl
2020-03-26 13:57:43 -04:00
b354641df3
fix syntax errors in triggers in monitor view
2020-03-26 13:57:19 -04:00
af36cc3e52
Fix starting and stopping zmcontrol processes across servers.
2020-03-26 13:57:00 -04:00
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
b611e2616b
handle scale=auto
2020-03-24 16:15:24 -04:00
e06912a995
Merge branch 'release-1.34'
2020-03-21 15:28:27 -04:00
d3df0defc9
Support missing openssl_random_pseudo_bytes by using alternate functions
2020-03-21 15:28:18 -04:00
5a20ef959f
Merge branch 'release-1.34'
2020-03-20 11:07:46 -04:00
d7ea798c09
add modern stracktrace to log messages
2020-03-20 11:06:32 -04:00
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
d54b2e5b21
Merge pull request #2888 from pliablepixels/mp4objdetect
...
Mp4 animations for objdetect
2020-03-15 10:45:52 -04:00
921c4c5bbd
don't return mp4 if objdetect is used
2020-03-14 15:00:33 -04:00
4342506e5b
fix media type allocations
2020-03-14 14:24:39 -04:00
4d5f9f7de0
add back gif, make nomenclature consistent of objdetect_subtypes
2020-03-14 14:18:25 -04:00
f8fa0340fc
fix eslint
2020-03-14 09:27:07 -04:00
9a31d545d4
replace GIF function with MP4
2020-03-14 08:08:52 -04:00
4c984c3617
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-03-10 18:47:33 -04:00
9a3127da06
Merge branch 'rate_dropdown'
2020-03-10 18:47:19 -04:00
59bd658a96
replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc.
2020-03-10 18:46:20 -04:00
84d719f2dd
Merge branch 'release-1.34' into rate_dropdown
2020-03-10 16:06:11 -04:00
49f23cb35b
Added options to render objdetect, objdetectanim and objdetectimage
2020-03-10 13:51:55 -04:00
0f741d0e1c
Merge pull request #2880 from pliablepixels/1.34-dev
...
Add ability for image.php to render gif images
2020-03-09 16:30:15 -04:00
38b519c8a6
better error log
2020-03-09 15:58:57 -04:00
6bc8012e04
add support to render gif image that may be created by object detection
2020-03-09 15:56:34 -04:00
561479dd93
Merge branch 'release-1.34'
2020-03-09 14:45:00 -04:00
5fe1452a1a
Merge pull request #2879 from pliablepixels/1.34-dev
...
return frame IDs of snapshot and alarm frames for a specific e…
2020-03-09 14:44:41 -04:00
e8553babfa
remove extra spaces, fix eslint
2020-03-09 14:43:54 -04:00
3d993eef80
Fix triggers code
2020-03-09 14:39:57 -04:00
a0bd602339
Use === when testing for empty value and setting defaults
2020-03-09 14:39:22 -04:00
a261efe0a7
return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0
2020-03-09 12:04:40 -04:00
3611d147e6
fix score frameID to return ID not Score
2020-03-09 11:25:07 -04:00
c5e838fa33
return global frame IDs of snapshot and alarm frames for a specific event
2020-03-09 11:09:20 -04:00
f056f787c5
Merge branch 'release-1.34'
2020-03-08 17:24:06 -04:00
e56976c800
Triggers cannot be null, it is '' instead
2020-03-08 17:23:48 -04:00
b482993d33
Merge branch 'release-1.34'
2020-03-06 15:04:48 -05:00
f0791c8118
silence warning when no language is set
2020-03-05 22:13:32 -05:00
f003daa791
Merge branch 'add_enabled_to_storage'
2020-03-05 15:48:43 -05:00
d30480e31e
add passive to addEventListener
2020-03-05 14:10:35 -05:00
53f262a4cb
Merge pull request #2870 from pliablepixels/dev
...
#2866 - fixes incorrect token type comparison
2020-03-04 11:31:16 -05:00
d60e1a783f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-03-04 11:22:15 -05:00
55f63e8e9d
Merge branch 'fix_auth_timeouts'
2020-03-04 11:22:08 -05:00
4dae0c4609
Merge pull request #2870 from pliablepixels/dev
...
#2866 - fixes incorrect token type comparison
2020-03-04 11:21:48 -05:00
a9e3d0691f
quotes, fix status ajax call using old auth_hash
2020-03-04 11:17:48 -05:00
8eee5cc222
Add global array so that we only do it once.
2020-03-04 11:03:30 -05:00
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
1381cb194e
#2866 - fixes incorrect token type comparison
2020-03-04 10:50:59 -05:00
9f696186a8
Increase height of storage popup for Enabled
2020-03-04 10:48:02 -05:00
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
077b8888f9
Use Storage object and add Enabled
2020-03-04 10:46:32 -05:00
0b267fbdee
Add Enabled to Storage
2020-03-04 10:46:16 -05:00
3a24f27a7a
include id in monitors dropdown so that it is searchable
2020-03-03 16:59:38 -05:00
fa6ac399be
Fix code in makePopupLink. Return content-type application/json for json response
2020-03-02 17:21:58 -05:00
d29b93216d
Allow users without System::View to read servers.json
2020-03-02 16:39:12 -05:00
85e5ade07a
fix makePopupLink when condition is false
2020-03-02 16:10:56 -05:00
bd59ae8856
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 15:00:31 -05:00
c1e13221f7
Move the Basic Auth login code from skin.php to includes/auth.php
2020-03-02 14:59:36 -05:00
a2dd24ae1f
When sending eventCmdReq, pass eventCmdParms since it might have been updated.
2020-03-02 14:38:36 -05:00
00de49a5c1
add monitorStreamReplayBuffer to javascript vars. Use it to determine whether to update fast forward and reverse buttons
2020-03-02 12:43:07 -05:00
7c21f065bd
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 12:07:11 -05:00
d0e70fc501
Merge branch 'fix_auth_timeouts' of github.com:connortechnology/ZoneMinder into fix_auth_timeouts
2020-03-02 12:04:45 -05:00
8f113ad030
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-03-02 11:55:08 -05:00
967e5ad30f
alter setButtonState to take either an id or an element so that we can log the missing element
2020-03-02 11:52:32 -05:00
f0e7b84001
Only load user from session if other auth mechanisms aren't present.
2020-03-02 11:51:07 -05:00
5f16c10e0a
Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different
2020-03-02 11:50:40 -05:00
54c14db863
better logs
2020-03-01 14:02:44 -05:00
76131d1887
Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style.
2020-03-01 11:07:31 -05:00
b9acf42929
spacing, eslint
2020-02-29 09:28:04 -05:00
6456d52b97
Merge branch 'fix_user_lang'
2020-02-27 17:43:51 -05:00
d371da7b4f
including the language files must come after auth in order to user the user's language setting
2020-02-27 17:42:02 -05:00
e19332f36a
tidy up, be more efficient and warn when language files are not found.
2020-02-27 17:40:31 -05:00
bab0b2e830
handle a scale value of auto
2020-02-27 11:35:40 -05:00
bf9ba39aa2
Merge branch 'release-1.34'
2020-02-25 18:22:55 -05:00
1b70ed2076
Merge branch 'fix_generate_video_page' into release-1.34
2020-02-25 18:22:24 -05:00
0c70c5c2a4
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:14:27 -05:00
a34af39ca7
Fix logging line in generate video function
2020-02-25 18:14:14 -05:00
e82ed3a098
Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value
2020-02-25 18:13:42 -05:00
c08ec996f7
Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843
2020-02-25 18:12:25 -05:00
4d044a1f14
Fix logging line in generate video function
2020-02-25 18:11:07 -05:00
8fcd5b37ed
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
2020-02-25 17:15:59 -05:00
7787ba1040
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
2020-02-25 17:15:45 -05:00
54a6dfff66
API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials
2020-02-25 17:12:48 -05:00
bd097bf8ce
Fix adding auth string screwing up url to remote api in zmaControl and zmcControl
2020-02-25 17:00:16 -05:00
23e4b43aa0
Stop the montagereview update while we reload the page
2020-02-25 16:53:08 -05:00
3adc20b04e
Use a little less ram by passing by reference
2020-02-25 16:52:45 -05:00
4c2fb6bf08
populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar.
2020-02-25 13:40:44 -05:00
f719514998
remove debug
2020-02-25 13:39:33 -05:00
5c3b7f109e
fix cyclePlay button not working.
2020-02-25 13:17:45 -05:00
dce4d17b51
fix cyclePlay button not working. Move SetButtonState into skin.js
2020-02-25 13:17:02 -05:00
a2c5e4943a
Merge branch 'fix_scale'
2020-02-25 12:18:27 -05:00
a7c28be365
change scale to fit value from auto to 0
2020-02-25 12:14:34 -05:00
8c7d2c5e1a
handle a 0 value for scale
2020-02-25 12:14:07 -05:00
4dda37a6ee
remove extra }
2020-02-25 12:13:12 -05:00
e2ff241017
handle a 0 value for scale as the scale to fit value
2020-02-25 12:13:05 -05:00
71dd292a8d
Revert "Handle a zero value for scale"
...
This reverts commit a5da6d12f3
2020-02-25 11:19:09 -05:00
a5da6d12f3
Handle a zero value for scale
2020-02-25 11:18:28 -05:00
8a83449fba
Handle a zero value for scale
2020-02-25 11:18:13 -05:00
2f89bd28b7
Handle a zero value for scale
2020-02-25 11:18:02 -05:00
37abd41e78
Handle a zero value for scale
2020-02-25 11:17:46 -05:00
429000c13b
Fix value of auto in width dropdown. Allow a 0 value for scale.
2020-02-25 11:14:12 -05:00
638e333702
Scale must be an integer value so use '0' instead of auto
2020-02-25 11:13:20 -05:00
d68d115581
Handle scale==0 to do width=100%.
2020-02-25 11:12:49 -05:00
583350ef06
Fix use of array_key_exists instead of property_exists
2020-02-25 11:09:12 -05:00
6cf448c74e
remove debug and spacing
2020-02-25 11:08:23 -05:00
cc7de97b6a
Merge branch 'release-1.34'
2020-02-24 14:39:50 -05:00
173d58d8b3
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console
...
Event list is not filtered when group is selected on console
2020-02-24 14:37:42 -05:00
55c99c5ff3
Include filtered monitors for filter query on totals line of event counts. Fixes #2846
2020-02-24 14:34:21 -05:00
b389f9660d
Merge branch 'fix_class_PTZ_presets_almost_invisible'
2020-02-24 13:17:09 -05:00
d0a8d241d2
Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849
2020-02-24 13:13:54 -05:00
d7f8f201be
Fix zoneminder.com url getting undefined being added to it
2020-02-22 10:51:26 -05:00
e640fc0c26
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-22 10:50:07 -05:00
63a3f2e453
Fix zoneminder.com url getting undefined being added to it
2020-02-22 10:50:00 -05:00
c29f2cb8cf
fix our friend, eslint
2020-02-21 14:22:53 -06:00
ce8c8a755c
fix eslint
2020-02-21 10:29:27 -05:00
d51fdafbc0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-21 09:37:45 -05:00
7645196bdc
Extend width of ControlDevice and Address to full width
2020-02-21 09:30:31 -05:00
1a87eb40bd
Fixes #2841 and maintains login through password change
2020-02-19 16:55:38 -05:00
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
3b1458bb88
add Emailed status to events list
2020-02-19 14:17:44 -05:00
789db4e5a6
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
2020-02-18 13:29:06 -05:00
a8615c1c85
fixed bug in control functions where left arrow panStep was inverted
2020-02-16 11:41:14 +13:00
289bde869d
use a better language for unset value
2020-02-11 14:31:48 -05:00
9f9a97f596
fix dropdown with unset option
2020-02-11 14:29:21 -05:00
844ff529e1
add an unset value to ZM_TIMEZONE in Options->System
2020-02-11 13:24:26 -05:00
600dbba8c5
We don't need to set date_default_timezone_get
2020-02-11 13:23:53 -05:00
821355c117
Only set date.timezone if we have a configured value in the Config
2020-02-11 13:21:28 -05:00
137bdb1f24
Make shm have error or warning class if full
2020-02-10 14:20:46 -05:00
389a6b3ec8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-06 13:22:30 -05:00
c465fa55d8
Use ZM_PATH_FFMPEG instead of ffmpeg
2020-02-06 13:22:22 -05:00
1cbc75813c
improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:57 -05:00
dd0ce50c17
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:21:30 -05:00
e8a0ed9208
quotes and improve the output of the ajaxError to say what the action was and who the user was
2020-02-06 13:20:35 -05:00
1c2f2657d2
We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha
2020-02-04 16:41:19 -05:00
42b3bb6a53
increase width of google sitekey and secret key inputs to 100%
2020-02-04 16:40:52 -05:00
52dfbc92e9
put back operator filtering in parseRows. Do it for all attrs. Fix Zone name in AlarmedZoneId attr
2020-01-24 11:10:02 -05:00
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
29a04dc1b9
Merge branch 'improve_filter_emails' into add_alarmed_zone_to_filters
2020-01-24 09:50:53 -05:00
adf376e4a6
add Zone.php
2020-01-24 09:45:02 -05:00
6345ecc479
remove debug
2020-01-23 17:04:33 -05:00
948b3d7e43
Impleent click_AutoEmail to hide/show the Email options
2020-01-22 17:02:16 -05:00
d95857d419
Add EmailTo,EmailSubject,EmailBody fields to filter view
2020-01-22 14:05:08 -05:00
8aa0fe665f
Add EmailTo,EmailSubjecet,EmailBody fields to Filter object
2020-01-22 14:04:42 -05:00
f4b5f5f399
style the new Email content fields
2020-01-22 14:04:23 -05:00
dac76e0328
add language subs for FilterEmailTo, FilterEmailSubject, FilterEmailBody
2020-01-22 13:59:12 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
dbdb13efd7
Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811
2020-01-20 11:02:43 -05:00
ead52f30b1
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
2020-01-20 00:44:20 -08:00
75fa1d693d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-18 16:09:44 -05:00
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
6c7f003198
revert bogus change not including skin.js
2020-01-18 16:08:55 -05:00
de5bf21d8a
fix eslint
2020-01-17 15:06:46 -06:00
5b8e5eb349
don't output duplicated js when css=base
2020-01-17 14:51:02 -05:00
d0003215b1
Merge branch 'master' into rate_dropdown
2020-01-17 12:30:35 -05:00
86a2523498
break up a long line, add some parenthesis to clarify logic
2020-01-17 12:30:26 -05:00
a398f33e68
fix delTerm button not being enabled because it is a button now, not an input
2020-01-17 09:17:29 -05:00
4f2df830a8
fix inline js
2020-01-17 09:17:05 -05:00
74b3ad6dd9
add options help for HWACCEL options
2020-01-16 14:33:37 -05:00
6a43c2deb5
fix zoom_range to zoomout_range
2020-01-16 14:17:40 -05:00
028e7e8dde
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-15 19:03:11 -05:00
09f2298838
return empty array instead of nothing in probeNetwork
2020-01-15 19:02:40 -05:00
8b375de455
Avoid duplicate Monitors in API
2020-01-15 20:31:05 +01:00
02e9096d2b
When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code
2020-01-13 17:32:57 -05:00
e4ba1fd432
fix restarting zmcontrol on remote servers by passing object=filter as well
2020-01-13 17:16:15 -05:00
d7dc7cdc47
Add ServerId to database log entries in php
2020-01-13 16:18:01 -05:00
9036b6db77
fix typo
2020-01-13 16:17:39 -05:00
f3a9e608db
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-13 16:11:19 -05:00
91acb775eb
Fix Eventount to EventCount
2020-01-13 13:43:14 -05:00
b11815cfa9
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
2020-01-13 12:53:50 -05:00
6cd76ee2ff
Clear cache after loading Events so as to free ram.
2020-01-13 12:53:05 -05:00
f7e2359818
Implement a clear_cache function so that we can free up cached objects
2020-01-13 10:57:56 -05:00
398688550b
fixtypo
2020-01-10 20:15:52 -05:00
fabb7180d6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-10 20:13:28 -05:00
0c478c7962
fix Monitor->Server
2020-01-10 20:13:09 -05:00
6a4b66a792
add 3840x2160 4k UHD to monitor dropdown
...
I think this is fairly common in consumer IP cams now...
2020-01-10 19:44:06 -05:00
2f5caf2bb5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-10 17:21:10 -05:00
5ee0158735
Set defaults for vars == ''
2020-01-10 16:42:41 -05:00
f61f6eaf7d
remove line cutnpasted erroneously
2020-01-10 12:45:47 -05:00
d433590f74
use find_one in stead of new to use Cached Server
2020-01-10 12:45:30 -05:00
ef4ecd40fb
Set defaults before saving Objects
2020-01-10 12:44:59 -05:00
28a4bef6ba
fix tar invocation for *BSD platforms
...
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
2020-01-09 22:03:02 +02:00
f13a7199e1
fix eslint
2020-01-07 21:53:55 -06:00
c64de372a7
when auth_hash changes, update various CmdParms
2020-01-07 17:08:57 -05:00
0571909d05
add remote_IP to log entries on php side
2020-01-07 17:08:29 -05:00
1865df3fe0
remove some debug, add some parenthesis to ensure logic works as intended
2020-01-07 17:08:07 -05:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
61bc0ddd0a
add missing t and merge some lines
2020-01-07 11:01:53 -05:00
2f1b725ee4
quote SQL for mysql8
2020-01-07 11:01:02 -05:00
7535769e4b
controlcap needs to be larger
2020-01-05 17:34:40 -05:00
71581831b5
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
2020-01-05 17:34:27 -05:00
6ac26ec1aa
quotes
2020-01-05 17:33:53 -05:00
c3641df531
spaces
2020-01-05 17:30:06 -05:00
00f8a450de
spaces and quotes
2020-01-05 14:59:25 -05:00
7fdf6165d5
Fix case in var name
2020-01-03 17:08:11 -05:00
c8e39e2418
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-03 16:35:15 -05:00
e951b0af1c
add code to set default value for checkboxes
2020-01-03 16:35:04 -05:00
0a495395b0
Restore Gain tab
2020-01-03 16:34:46 -05:00
f572c4092a
add checks for Zoom, Focus, White, Iris movement types
2020-01-03 15:58:57 -05:00
158e26bb25
split long lines
2020-01-03 15:58:02 -05:00
c4aaa33bea
add widths for number inputs on controlcap view
2020-01-03 15:57:51 -05:00
0b3776dbf0
change text inputs to number inputs, cleanups
2020-01-03 15:57:29 -05:00
89844f72f4
Merge pull request #2790 from pliablepixels/jwt-token-duration
...
fix JWT access token always being 1 hr
2020-01-02 17:22:37 -05:00
d42e9beddc
Add warnings when the type of movement is not selected
2020-01-02 17:03:52 -05:00
e9815bf9c7
add ZM Namespace to Error calls
2020-01-02 16:54:50 -05:00
3cfc1a0a6d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-01-02 16:45:39 -05:00
399508b211
fix JWT access token always being 1 hr
2020-01-02 10:25:48 -05:00
60d45d967f
test for existence of selected checkboxes in post data because if none are selected, the array won't exist
2020-01-02 10:17:07 -05:00
98f7fb63b9
fix eslint errors
2019-12-31 19:24:51 -06:00
6a39893c1d
include i elements in data-on-click
2019-12-31 19:11:14 -05:00
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
77cfb7c190
fix spacing
2019-12-31 12:42:49 -05:00
2c76c12664
Fix export to include files when using DEEP scheme. Also make it more efficient
2019-12-30 22:18:55 -05:00
2301103da5
use small, non-zero values, for image buffer & pre & post buffers
2019-12-28 09:49:42 -06:00
845f35fe00
Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name()
2019-12-26 15:57:25 -05:00
66ec110b02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-26 15:21:33 -05:00
1977e48ddd
DefaultScale is a member of the Monitor, not the event
2019-12-26 15:21:27 -05:00
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
76b54a468f
use left join instead of inner join when listing monitors
2019-12-22 18:43:53 -05:00
42a724891b
spacing
2019-12-20 16:11:38 -05:00
63d20a1514
Move hidden inputs to top of form
2019-12-20 16:11:24 -05:00
5a45835006
break up long lines
2019-12-20 16:11:10 -05:00
23dde04725
remove timeout on changing runstate.
2019-12-20 16:10:30 -05:00
fc017893bc
Sort the log filtering options. Fixes #2756
2019-12-20 16:09:34 -05:00
d25a91ad13
Make Group containable
2019-12-20 14:56:14 -05:00
bcda92058e
proper way to make cakephp filter by group. Make Group containable, always add the join
2019-12-20 14:56:01 -05:00
0142c71c85
Merge branch 'master' into fix_2772
2019-12-20 11:02:27 -05:00
d87bf5a156
replace the rate display with a dropdown
2019-12-20 11:02:12 -05:00
3c59be9616
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-19 09:24:44 -05:00
958a6b8218
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-18 19:06:19 -05:00
e39a95d761
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
2019-12-18 19:06:10 -05:00
67cc9faa8c
remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else.
2019-12-18 19:05:06 -05:00
d21fa5c48a
Do not set defaults in Object->set(). This allows us to set an empty timestamp.
2019-12-18 19:03:37 -05:00
34354f5871
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
2019-12-18 12:13:00 -05:00
3b12b67b4a
fix eslint
2019-12-18 10:40:51 -05:00
5f006421cc
fix #2771 . Correct relationship from hasMany to hasAndBelongsToMany for Monitors in Group Modelel. Use save Assiociated in Controller, and add code to handle backwards compatibility by turning MonitorIds into the appropriate Monitor array
2019-12-15 15:31:40 -05:00
2a4d06f93b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-15 10:35:56 -05:00
4d9d4ba957
Do not allow deletion of archived events.
2019-12-15 10:35:43 -05:00
689956bba7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-12-13 17:49:00 -05:00
5b7efb2b33
fix mouseover streaming in chrome when adblocker disabled
2019-12-13 17:48:22 -05:00
18ed90d147
remove second hit to db to load storage areas with no serverid
2019-12-13 17:47:51 -05:00
b24e912050
Use ZM\Server::find_one for loading server so that it gets cached. Use a single regexp to determine config line validity instead of two for efficiency
2019-12-13 17:46:56 -05:00
0dbc1ef15c
Use multiport when talking monitor stream on montage
2019-12-13 11:51:55 -05:00
0bbbbb302e
add default for Units in new zone
2019-12-13 11:51:07 -05:00
d2a23e4822
add possing port to Monitor->UrlToIndex
2019-12-13 11:50:11 -05:00
bedc61a347
handle dbFetchNext on null result more gracefully
2019-12-13 11:49:55 -05:00
ea89ebf150
more mysql8 fixes
2019-12-08 21:33:29 -05:00
3bd0525e64
escape column names for mysql8
2019-12-08 14:27:07 -05:00
ed417a49b4
increase logspopup width to eliminate scrollbars
2019-12-08 11:21:38 -05:00
0de6396a5b
Test for null in user before testing for access in CanEdit et all
2019-12-07 12:39:28 -05:00
4632bbd124
Apply relevant changes to deal with php7,4 deprecations
2019-12-07 11:45:32 -05:00
cc6d40d67e
Missing ->
2019-12-07 10:38:51 -05:00
e123e689ca
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
2019-12-06 14:32:59 -05:00
4b786eaad5
fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in
2019-12-06 14:31:06 -05:00
eee3729b85
dirty fix filtering Monitors by GroupId. Change occurrences of GroupId to ' ' as that is what the key is in conditions. Please note that other operators like != won't work.
2019-12-04 22:23:55 -05:00
df9f6103e4
fix syntax error
2019-12-04 09:00:20 -05:00
78912584e1
re-arrange code to hopefully get rid of syntax error reported by some people
2019-12-04 07:10:33 -05:00
3af6358314
fix & to &
2019-12-02 15:49:49 -05:00
72cb5bd1bb
add missing </select>
2019-12-02 15:49:42 -05:00
09faa0a731
fix & to &
2019-12-02 15:49:32 -05:00
b686649589
fix & instead of &.
2019-12-02 15:34:31 -05:00
8bf74d2f35
fix & instead of &.
2019-12-02 15:34:23 -05:00
24022d157d
use & instead of &. Put inputs out of table where they belong
2019-12-02 15:33:58 -05:00
9f49e4f367
make Mark column text-align left so that checkboxes line up
2019-12-02 15:07:35 -05:00
f7e01aa999
switch to material icon for dot
2019-12-02 14:31:05 -05:00
cf35db120d
change to material icons, fix missing div
2019-12-02 14:21:51 -05:00
8e645e45e1
fix selecting Monitors by passing MonitorId as MonitorId[]
2019-12-02 14:21:25 -05:00
b70b75421b
quotes and spacing
2019-12-02 14:18:27 -05:00
16698b8a82
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-12-02 13:42:07 -05:00
9d0a416311
remove debugging code
2019-12-02 13:41:42 -05:00
c9a324b7b3
improve the configureExportButton to look at specific inputs instead of just counting checkboxes
2019-12-02 13:40:02 -05:00
09a6e06132
change layout from a table to something more bootstrappy. Use the new html_radio function generate the radio buttons for Format and Compression. Remove the data-on-click from the export button because we added setting up the click event in the javascript already
2019-12-02 13:38:23 -05:00
2713565c84
using bootstrap layout instead of a table, so text-align: right
2019-12-02 13:34:53 -05:00
80d0d037b5
add a style for inline form not supported by bootstrap 3
2019-12-02 13:34:11 -05:00
d39193cb6b
convert flip to material icons
2019-12-02 12:33:13 -05:00
576dd23907
test for existence of filter in query
2019-12-02 12:30:15 -05:00
355fceccb4
test for existence of default
2019-12-02 12:30:03 -05:00
caefcc2f7a
increase size of export popup
2019-12-02 12:17:33 -05:00
03d7bcdd11
better debug logging when on-click-this function isn't defined
2019-12-02 12:17:18 -05:00
c19632e114
Merge pull request #2769 from connortechnology/fix_api_alarm_auth
...
Fix api alarm auth
2019-12-02 07:53:50 -05:00
76d795f413
add rendering of enums for Events Controller
2019-12-01 12:32:14 -05:00
0b2853095e
cleanup auth in monitors alarm method
2019-12-01 12:30:27 -05:00
eedb31730e
fix saving Monitor values that don't get passed when empty, like Enabled
2019-11-29 14:49:43 -05:00
cab1056328
improve debugging in recursive_array_diff
2019-11-29 14:49:10 -05:00
393c25b4f2
fix array keys
2019-11-29 14:26:03 -05:00
d6a414a1a4
Merge pull request #2767 from connortechnology/fix_2692
...
Fix 2692
2019-11-29 14:24:00 -05:00
29572abef2
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:56:02 -05:00
a9d8e73f68
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:53:46 -05:00
7e92900542
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:50:02 -05:00
4817efe17c
Add enum support for Orientation and Scheme to Events
2019-11-29 13:48:20 -05:00
d02e30ceca
Change Orientation Enum to use strings instead of numbers as values. Sync them up with what we use in C code
2019-11-29 13:48:02 -05:00
7b99c89541
its not necessary the token is a refresh. Can also be empty
2019-11-26 20:57:25 -05:00
54a15573ad
Make 32bit the default for COlours
2019-11-26 15:06:24 -05:00
5ebf929598
Add Event counts, event disk usage to storage tab of options. Disable checkbox selection when there are events stored on the storage area.
2019-11-26 14:36:39 -05:00
ab9f99bdbb
Fix Width & Height rotation when scaling. Fixes #2760
2019-11-22 12:18:30 -05:00
1dc83700c0
Do a better job of handling the non-server, non-multiport case. Put the code in Url so that it works for other functions that call Url()
2019-11-21 13:32:27 -05:00
606c89962f
eliminate an extra db call
2019-11-20 16:30:26 -05:00
9d4c802b48
netEmpty is deprecated. Use notBlank instead
2019-11-20 09:32:19 -05:00
5feeedf7f4
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
2019-11-20 09:31:58 -05:00
5494fdb087
When upgrading from a version that doesn't do DiskSpace storage, there can be a lot of events to update. Can't load them all or we run out of ram. Batch them in 1000's
2019-11-20 09:31:16 -05:00
ac96a19371
Fix filtering monitors by user's MonitorId restriction
2019-11-19 17:21:01 -05:00
207e5918c8
fix lint, remove debug
2019-11-19 11:37:45 -05:00
59b9220ddd
if doing multiport still call Url(), as it requires a hostname
2019-11-11 13:33:54 -05:00
56618aac32
Handle buttons not existing
2019-11-10 15:49:39 -05:00
1c54f22627
Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to.
2019-11-08 15:18:08 -05:00
014ce0afe8
improve error message regarding timezone differences
2019-11-05 12:40:11 -05:00
5b02bc76f4
Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly
2019-11-05 10:07:42 -05:00
5603fd70f8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-04 12:04:37 -05:00
d218d2ee9f
If the default server case, don't add the Url component. So this will return just the path, using whatever servername/port combo is currently in use. Fixes #2750
2019-11-04 12:04:23 -05:00
4e16e9052a
Merge pull request #2749 from pliablepixels/monitor_add_validation
...
add model validation so that we don't create empty monitors
2019-11-02 10:16:41 -04:00
9d8a230252
Prevent deletion of entire events directory when monitor has empty name
2019-11-02 10:12:43 -04:00
16a6938710
add model validation so that we don't create empty monitors
2019-11-02 08:30:25 -04:00
54c11bc0d1
define monitor_options as an empty array instead of php implicitly dealing with it
2019-11-01 13:42:01 -04:00
a20517a6db
spacing
2019-11-01 13:41:37 -04:00
18c13c4bad
Make chosen dropdowns 100% width on monitor edit
2019-11-01 13:40:55 -04:00
eea4cf0924
add ParentGroup to language
2019-11-01 13:40:20 -04:00
968c28395d
close group popup when saving
2019-11-01 13:39:40 -04:00
9a3bee28d2
add logging and handling of oninput and oninput-this
2019-11-01 13:38:09 -04:00
3653ad5ce3
update group editing, solving inline javascript problems and removing cruft
2019-11-01 13:37:52 -04:00
e0d085d187
CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database.
2019-10-30 16:57:45 -04:00
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
daf71aa492
improvements to layout on zones and zone
2019-10-29 18:06:03 -04:00
988b2183c3
use new ViewWIdth and ViewHeight functions to generate video stream.
2019-10-29 17:42:48 -04:00
eb2269ea52
improve zone saving testing for value before doing math
2019-10-29 17:42:23 -04:00
f2300f2e8c
Add isPortrait and isLandscape functions. Rename Width and Height to ViewWidth and ViewHeight to return the rotated dimensions suitable for viewing
2019-10-29 17:39:12 -04:00
417123019c
fix crumbs
2019-10-23 09:52:36 -04:00
77118d55b2
add 4CIF aspect ratio padding. Fixes #2738
2019-10-23 09:50:49 -04:00
d036613776
Fix Server() not returning a ServerObject if not found when ServerId is null or 0
2019-10-21 13:45:27 -04:00
91651652c7
Only report an error for not finding the server if ServerId had a value
2019-10-21 13:41:32 -04:00
12dfcae81f
remove debug
2019-10-21 13:19:20 -04:00
3244c8ab5b
spacing, quotes, remove debug
2019-10-21 13:18:09 -04:00
6a3fe1ef1f
actually set date.timezone from ZM_TIMEZONE
2019-10-18 14:37:09 -04:00
1a417952c3
AutoStopTimeOut is part of Monitor, not Control
2019-10-18 14:19:25 -04:00
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
a6a61b75b9
update ptz css in classic
2019-10-18 13:52:34 -04:00
524a39a224
changeCodec no longer needs to be passed this
2019-10-18 13:40:29 -04:00
1abdf25ad3
Merge pull request #2727 from externo6/align_filter_options
...
align with other filter options
2019-10-17 10:22:01 -04:00
9068cb1a19
align with other filter options
2019-10-17 10:17:22 +01:00
fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
...
More filter options
2019-10-16 10:15:58 -04:00
ebebcad10d
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-10-16 10:13:31 -04:00
7146bdd59a
IN order to allow specifying a monitor Id that has been deleted, use monitor->Id instead of mid to test for monitor existence
2019-10-16 10:08:30 -04:00
d145adf9c6
set default for V4LCapturePerFrame to 1 instead of null.
2019-10-16 10:07:50 -04:00
f25a823bc8
Fix event => zm_event
2019-10-16 08:53:40 -04:00
4b71bc75ea
Change language to Contains / Not Contains and update perl filter.
2019-10-16 00:35:49 +01:00
8ee567442e
UPdate replay, scale, codec dropdown onchanges
2019-10-15 15:04:14 -04:00
ee1e12b938
Be more robust about returning a Server object when instantiating the default Storage area.
2019-10-11 17:29:47 -04:00
70396c5897
Don't warn about the spaces in the command
2019-10-09 13:10:43 -04:00
c7f5673b47
Make filterFIelds global and give more info in error message
2019-10-09 10:30:40 -04:00
b15f7ad47d
handle ipv6 in Server->Hostname. Fixes #2713
2019-10-09 10:00:13 -04:00
1cf034ec5f
fix inline js on the back/close button
2019-10-08 18:49:29 -04:00
d1b086ddc6
fix cases of monitor->CanZoom to control->CanZoom
2019-10-08 18:49:11 -04:00
c15e8eebb2
Make PTZ presets fill the entire window width and fix other visual problems with the buttons
2019-10-08 18:48:37 -04:00
f3f972359b
increase width of Zoom, White, Iris controls to fit wider button
2019-10-08 18:28:02 -04:00
4126554092
Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command
2019-10-08 18:07:33 -04:00
5040d5b075
remove extra (
2019-10-05 16:56:05 -04:00
b1496643eb
fix js error in onvif probe
2019-10-03 17:31:10 -04:00
Isaac Connor
Dvanderploeg
David van der Ploeg
Isaac Connor
out
Pliable Pixels
outline
Isaac Connor
hax0kartik
Andrew Bauer
zlodag
Garrett Scott
Javier Gonzalez
PrplHaz4
Alex Porosanu
Andrew Bauer
externo6