Isaac Connor
|
e68bf13a6b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-06-17 12:50:42 -04:00 |
|
Isaac Connor
|
d3c474fc8b
|
use translate on Show/Hide Zones
|
2020-06-17 12:50:36 -04:00 |
Romain ODDONE
|
dcb77cdaea
|
apply stream scale in zoom coordinates
|
2020-06-17 14:46:10 +02:00 |
Isaac Connor
|
aba403e3f2
|
Correct handling of Transport in onvif results
|
2020-06-16 16:48:17 -04:00 |
|
Isaac Connor
|
30072cf9e1
|
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
|
2020-06-15 16:06:51 -04:00 |
|
Isaac Connor
|
0905655377
|
Merge branch 'master' into add_user_to_filters
|
2020-06-05 17:08:14 -04:00 |
|
Isaac Connor
|
f71926c736
|
Merge branch 'release-1.34'
|
2020-06-05 10:09:07 -04:00 |
Isaac Connor
|
14f7e01c00
|
Merge pull request #2942 from roddone/fix_monitors_table_responsive
make monitors table (console view) responsive
|
2020-06-03 15:44:38 -04:00 |
|
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
|
20870e22fa
|
fix eslint errors
|
2020-05-29 13:28:33 -04:00 |
|
Romain ODDONE
|
8121787ee6
|
make monitors table (console view) responsive
|
2020-05-27 10:08:08 +02:00 |
|
Isaac Connor
|
eb41e4fb39
|
Fix the array for the de-interlacing options
|
2020-05-24 11:09:13 -04: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
|
23900cbf01
|
fix
|
2020-05-21 13:34:09 -04:00 |
|
Isaac Connor
|
59c08410c1
|
Put the size of SHM in the title of the shm space used element
|
2020-05-21 13:32:33 -04:00 |
|
Isaac Connor
|
ce15e1c921
|
remove debug, don't pass element through event handler anymore on layout ddm
|
2020-05-20 09:42:29 -04:00 |
|
Isaac Connor
|
cc04ced406
|
load zmMontageLayout ddm explicitly instead of passing event element
|
2020-05-20 09:42:06 -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
|
d71de221ae
|
If auth is turned on, add a UserId dropdown to filters
|
2020-05-07 11:00:50 -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
|
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 |
|
Isaac Connor
|
e960e638b3
|
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
|
2020-05-01 13:07:29 -04:00 |
|
Isaac Connor
|
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 |