Isaac Connor
|
02bf85bb34
|
Merge pull request #2950 from roddone/scale_to_fit_watchview
Fix the scale to fit option that is not persisted on page refresh
|
2020-06-02 12:53:50 -04:00 |
Romain ODDONE
|
a9c52a21ec
|
call to changeScale() on page init when "scale to fit" is selected
|
2020-06-02 17:25:07 +02:00 |
Isaac Connor
|
85e1dcadf4
|
Fix the array for the de-interlacing options
|
2020-05-24 11:07:52 -04:00 |
|
Isaac Connor
|
e72c357fd0
|
Unable to probe should not be fatal
|
2020-05-23 16:13:48 -04:00 |
|
Isaac Connor
|
a9cec3ebbd
|
spacing
|
2020-05-23 16:13:29 -04:00 |
|
Isaac Connor
|
46a13237b5
|
fix eslint errors
|
2020-05-22 09:28:15 -04:00 |
|
Isaac Connor
|
3faf20516f
|
add changeInterface handler
|
2020-05-19 16:58:45 -04:00 |
|
Isaac Connor
|
074e270e79
|
populate network interfaces list, rescan on change.
|
2020-05-19 16:58:26 -04:00 |
|
Isaac Connor
|
cc01a04efc
|
remove debug, don't pass element through event handler anymore on layout ddm
|
2020-05-19 16:57:45 -04:00 |
|
Isaac Connor
|
270ab36ff4
|
load zmMontageLayout ddm explicitly instead of passing event element
|
2020-05-19 16:56:58 -04:00 |
|
Isaac Connor
|
3c2e26ac32
|
Merge branch 'release-1.34'
|
2020-05-15 16:02:29 -04:00 |
|
Isaac Connor
|
4dc693022e
|
Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize
|
2020-05-15 16:02:19 -04:00 |
|
Isaac Connor
|
6bb2c09a72
|
Merge branch 'release-1.34'
|
2020-05-15 11:41:34 -04:00 |
|
Isaac Connor
|
424a4ed0b1
|
add onclick to div.zoom
|
2020-05-15 11:34:23 -04:00 |
|
Isaac Connor
|
0dd426d64c
|
handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click
|
2020-05-15 11:33:10 -04:00 |
|
Isaac Connor
|
94b29c6c7a
|
replace inline javascript in timeline zoom
|
2020-05-15 10:44:48 -04:00 |
|
Isaac Connor
|
992ac144a9
|
Fix ONVIF_User => ONVIF_Username
|
2020-05-13 16:04:26 -04:00 |
|
Isaac Connor
|
880b456d93
|
Rrename MetaConfig to ONVIF
|
2020-05-13 15:30:56 -04:00 |
|
Isaac Connor
|
edd718afd2
|
xtell and ytell are data-xtell and data-ytell fixes #2932
|
2020-05-13 08:02:49 -04:00 |
|
Isaac Connor
|
807efde523
|
xtell and ytell are data-xtell and data-ytell fixes #2932
|
2020-05-13 08:01:04 -04:00 |
|
Isaac Connor
|
c83621822f
|
Rename Config* to ONVIF_*
|
2020-05-12 15:46:07 -04:00 |
|
Isaac Connor
|
89939efc9b
|
Fixup my updates to the MetaConfig tab of monitor view
|
2020-05-12 11:15:29 -04:00 |
|
Isaac Connor
|
75082064fd
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
|
2020-05-09 16:40:17 -04:00 |
|
Isaac Connor
|
732bb5416f
|
Merge branch 'master' into onvif_updated
|
2020-05-09 16:26:29 -04:00 |
|
Isaac Connor
|
408da1be27
|
Merge branch 'release-1.34'
|
2020-05-08 18:46:19 -04:00 |
|
Isaac Connor
|
8195223a86
|
merge some php
|
2020-05-08 17:54:51 -04:00 |
|
Isaac Connor
|
f1d794c11b
|
spacing and escape sql fields
|
2020-05-07 13:57:37 -04:00 |
|
Isaac Connor
|
28a3691b9c
|
Merge branch 'release-1.34'
|
2020-05-01 19:46:38 -04:00 |
|
Isaac Connor
|
c99db3a03f
|
Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate
|
2020-05-01 18:47:10 -04:00 |
|
Isaac Connor
|
0085e3d34f
|
Don't warn about image for WebSite Monitors
|
2020-05-01 18:15:19 -04:00 |
|
Isaac Connor
|
1bd340d602
|
spacing in watch.php
|
2020-05-01 13:30:00 -04:00 |
|
Isaac Connor
|
2da88be307
|
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
|
2020-05-01 13:04:16 -04:00 |
|
Isaac Connor
|
4c9f67eb5a
|
Fix no redirect on login with palemoon browser
|
2020-05-01 13:03:56 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
daa08e8740
|
Always just default to scale from monitor
|
2020-05-01 13:03:17 -04:00 |
|
Isaac Connor
|
8d8d37c648
|
fix eslint
|
2020-05-01 09:57:46 -04:00 |
|
Isaac Connor
|
4466bd9b16
|
Always just default to scale from monitor
|
2020-04-29 16:35:20 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
eebd0a274d
|
Fix no redirect on login with palemoon browser
|
2020-04-29 16:34:27 -04:00 |
|
Isaac Connor
|
8b0f88a707
|
Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none.
|
2020-04-29 16:34:07 -04:00 |
|
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
|
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 |