Isaac Connor
5ee086bbfe
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:25:44 -04:00
Isaac Connor
e64e786c5b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-09 22:20:08 -04:00
Isaac Connor
f04e1a0ba7
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-09 22:20:06 -04:00
Isaac Connor
ec707acdd1
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-09 22:19:43 -04:00
Andrew Bauer
42fe024681
Update skin.js
2020-08-09 17:43:39 -05:00
Andrew Bauer
9a03a2c7d4
Update skin.js
2020-08-09 17:43:07 -05:00
Andrew Bauer
15005a2f17
fix typo
2020-08-09 14:25:11 -05:00
Andrew Bauer
d0e7443a3c
rough in update reminder dropdown
2020-08-09 14:18:44 -05:00
Andrew Bauer
b22f12dadb
rough in new zmversion widget
2020-08-09 12:20:11 -05:00
Andrew Bauer
a6ae4aee01
eslint nanny
2020-08-08 12:26:42 -05:00
Andrew Bauer
fd4b9ba4f4
move jquery in functions.php to skin.js
2020-08-08 12:06:57 -05:00
Andrew Bauer
b626e0de1c
eslint nanny strikes again
2020-08-08 11:19:29 -05:00
Isaac Connor
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
Andrew Bauer
96bd6397c6
eslint nanny
2020-08-08 10:38:58 -05:00
Isaac Connor
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
Isaac Connor
82357a0675
reapply click function to bandwidth dropdown entries after getNavBar
2020-08-08 11:17:26 -04:00
Andrew Bauer
3792043707
implement bw widget as dropdown
2020-08-08 10:07:26 -05:00
Isaac Connor
fc5fabf1c5
fix zone editing globals and inputs being too big
2020-08-06 12:24:51 -04:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
ef2ad12846
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-05 20:00:45 -04:00
Isaac Connor
ddeef6f031
Fix globals and a Fatal without ZM\ prefix
2020-08-05 20:00:39 -04:00
Isaac Connor
76e0d155d3
declare globals
2020-08-05 19:15:01 -04:00
Isaac Connor
90671cd4e5
Add missing globals
2020-08-04 18:07:01 -04:00
Isaac Connor
97096d87f9
Add mx-2 classes to be consistent
2020-08-04 18:06:49 -04:00
Isaac Connor
5b8ff10a34
style the storage dropdown better using css. rename it from dropdown01 to dropdown_storage. Put the text-warning class on the a content in the dropdown instead of the dropdown nav-item so that it takes effect. Rename Stor to Storage
2020-08-04 17:53:39 -04:00
Isaac Connor
1ab828c110
Add globals
2020-08-04 17:35:52 -04:00
Isaac Connor
dd627d9234
Update cycle monitorlist sidebar to bootstrap4
2020-08-04 17:35:41 -04:00
Isaac Connor
ba4d6dff64
Add globals definitions
2020-08-04 17:05:58 -04:00
Isaac Connor
9a06d6cab6
Fix some spacing
2020-08-04 17:05:44 -04:00
Isaac Connor
79c9671ef2
Use & instead of & in urls
2020-08-04 17:05:33 -04:00
Isaac Connor
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
Isaac Connor
82542c569c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-04 10:47:41 -04:00
Isaac Connor
6e9559df53
Put xhtmlHeaders in an ob_start ob_get_clean section so that calls to open session in view js php files don't cause a problem. Basically delay output. Fixes problems with logging in redirect. Also need to global cspNonce since we use it.
2020-08-04 10:47:37 -04:00
Andrew Bauer
a575b16278
set a target to about menu items
2020-08-03 15:45:27 -05:00
Andrew Bauer
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
Andrew Bauer
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
Isaac Connor
283d8557e6
remove the extra(globals). There are a LOT of globals. WE don't seem to actually use any in this function.
2020-08-03 12:50:36 -04:00
Andrew Bauer
a3e6fe5522
make the eslint nanny happy
2020-08-03 11:47:31 -05:00
Andrew Bauer
ce810320a2
bump right margin on storage widget
2020-08-03 11:02:30 -05:00
Andrew Bauer
8a711245f6
fix previous corrupted commit
2020-08-03 10:49:45 -05:00
Andrew Bauer
c1f37192b9
implement storage widget as dropdown
2020-08-03 10:43:24 -05:00
Isaac Connor
ece625e376
Remove the code that cleans the log on each page request. it was moved to zm_stats.pl. Accessing the log is kinda heavy, so should be done in background tasks, not interactively
2020-08-03 11:16:01 -04:00
Isaac Connor
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
Isaac Connor
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
Isaac Connor
325178a556
convert log filters to responsive bootstrap divs.
2020-08-02 20:25:24 -04:00
Isaac Connor
6f9947b583
Switch to jquery in login.js. We no longer include mootool for login view.
2020-08-02 19:12:07 -04:00
Andrew Bauer
3351a4de56
fix eslint
2020-08-02 15:33:10 -05:00
Andrew Bauer
0ecb1621ce
add colorized log icon to widget bar
2020-08-02 14:49:19 -05:00
Andrew Bauer
a937e14899
put the optional banner in its own navbar
2020-08-02 13:48:15 -05:00
Andrew Bauer
d6999f5628
iterate through keys in data
2020-08-02 13:33:25 -05:00
Andrew Bauer
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
Andrew Bauer
b746cf6a56
add id and output html string rather than echo
...
This sets up all the items on the navbar as reconfigurable, via javascript replaceWith
2020-08-02 11:31:36 -05:00
Isaac Connor
037b696be0
Fix duplicate class attributes on navbar links
2020-08-02 12:05:52 -04:00
Isaac Connor
68b7277784
Fix sizing of option name by removing the non-semantic elements and just specifying the styles
...
in css/base/views/option.css. Alsoo apply h-100 to columns to that nav bar fills the vertical space.
2020-08-02 11:20:18 -04:00
Andrew Bauer
e768beaef2
fix whitespace
2020-08-01 16:20:51 -05:00
Andrew Bauer
ad3b5a5aa3
call ob_start and ob_get_clean correctly
2020-08-01 16:16:23 -05:00
Andrew Bauer
b746901ee7
close the dropmenu on any click
2020-08-01 10:57:13 -05:00
Andrew Bauer
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
Andrew Bauer
889b08519a
Set a small breakpoint on table-responsive
...
This fixes (ugly) horizontal scroll bars appearing at the bottom of the monitor table on larger screens, without breaking functionality on mobile devices. @roddone please test this on your mobile device
2020-08-01 09:49:27 -05:00
Isaac Connor
b46d3b81d6
Update user view to use User class
2020-08-01 10:27:54 -04:00
Andrew Bauer
8b3917d707
reapply navbar reload logic
2020-08-01 09:07:21 -05:00
Andrew Bauer
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
Andrew Bauer
cd96994a56
update getZMVersionHTML
2020-07-31 07:31:40 -05:00
Isaac Connor
366ce5b3eb
Add 100% width to LabelFormat
2020-07-30 19:36:27 -04:00
Andrew Bauer
2699fa0313
force menubar to the top of the navbar
2020-07-30 16:56:38 -05:00
Andrew Bauer
8bb30bb6d4
add framework for new navbar selection
2020-07-30 16:44:58 -05:00
Andrew Bauer
561c44ece2
add runtimeStatus function
2020-07-30 16:14:41 -05:00
Isaac Connor
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
Isaac Connor
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
Andrew Bauer
23596b142d
fix how we finish up getNavBarHTML
2020-07-30 11:55:54 -05:00
Isaac Connor
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
Andrew Bauer
68dcc05cce
force the options labels small
...
seems backwards, but the bootstrap 4 docs have <small> and <strong> tags rather than a css class
2020-07-30 09:11:39 -05:00
Andrew Bauer
6b303b67d0
continued adjustment of options view fields
2020-07-30 09:03:03 -05:00
Andrew Bauer
484051a191
adjust column widths on options
2020-07-30 08:23:25 -05:00
Isaac Connor
aa3b48e7c0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-29 18:59:50 -04:00
Isaac Connor
b42eb44a79
handle when [fid] = 0; Fixes #2994
2020-07-29 18:51:11 -04:00
Isaac Connor
8e37efaa7a
handle when [fid] = 0; Fixes #2994
2020-07-29 18:50:14 -04:00
Andrew Bauer
4bf7093ff1
align account circle with status button
2020-07-29 15:47:46 -05:00
Isaac Connor
0139d06fcd
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:41:27 -04:00
Isaac Connor
1508b82754
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:40:57 -04:00
Andrew Bauer
1119923c38
Update functions.php
2020-07-29 15:26:07 -05:00
Andrew Bauer
695da2221f
Update functions.php
2020-07-29 15:20:44 -05:00
Andrew Bauer
4c242ef973
what a difference a single space makes
2020-07-29 15:09:47 -05:00
Andrew Bauer
9f1901e413
fix typo
2020-07-29 14:42:06 -05:00
Andrew Bauer
d285f2f998
adjust class name
2020-07-29 14:38:00 -05:00
Andrew Bauer
ded0dbc4ae
shrink the vert nav items further
2020-07-29 14:00:44 -05:00
Andrew Bauer
32bbeb556f
set the vert navbar bg color in base.css
2020-07-29 13:51:36 -05:00
Andrew Bauer
907063e385
use smaller font in form control item
2020-07-29 13:25:40 -05:00
Andrew Bauer
fd5adc6623
remove blockquote from options.php
...
It makes the vertical navbar font unnaturally large
2020-07-29 12:49:32 -05:00
Andrew Bauer
a6005f0b0d
fix clor of options nav-pill active
2020-07-28 13:09:54 -05:00
Andrew Bauer
52d88e15fd
let options span the full column
2020-07-28 12:45:25 -05:00
Andrew Bauer
cf9eb405ee
don't wrap the rows on small screens
2020-07-28 12:43:51 -05:00
Andrew Bauer
853a5728f8
align navbar logo and run status vertically
2020-07-28 12:20:18 -05:00
Andrew Bauer
aa8662f311
fix copy/paste typo
2020-07-28 10:37:10 -05:00
Andrew Bauer
b88f0c3991
display user:port@ip when controladdress is empty
2020-07-28 10:08:24 -05:00
Andrew Bauer
45f88ee04a
float web console statusBreakdown left then down
2020-07-28 08:59:28 -05:00
Andrew Bauer
85dec6194d
when maxmimize, rebuild jqeury chosen fields
2020-07-28 08:38:06 -05:00
Andrew Bauer
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
Isaac Connor
767f5ebb03
navbar closes the form, and doesn't need to be in the form.
2020-07-27 12:40:46 -04:00
Isaac Connor
5d883d696b
give a better error message when submitThisForm fails
2020-07-27 12:40:25 -04:00
Isaac Connor
ca07602414
fix html structure when not logged in. Move version class down to where we use it. add parenthesis to quiet php deprecation errors
2020-07-27 12:15:37 -04:00
Andrew Bauer
cec5d7ea06
w-100 class not needed
2020-07-27 10:22:23 -05:00
Andrew Bauer
ffa3415318
when collapsed, force the menu button to the right
2020-07-27 10:13:02 -05:00
Andrew Bauer
bc19ae604a
fix alignment of top navbar
2020-07-27 09:18:02 -05:00
Isaac Connor
1e76679820
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-26 22:33:34 -04:00
Isaac Connor
5f9c62f266
spacing and slightly improve nav item code in options
2020-07-26 22:33:29 -04:00
Isaac Connor
003abfea29
Update class so that Submit button is hidden under new bootstrap
2020-07-26 22:32:36 -04:00
Andrew Bauer
941c074a8e
add carriage returns to generated html for readability
2020-07-26 10:50:32 -05:00
Andrew Bauer
6486f59383
fix colorization of navbar widgets
2020-07-26 10:41:05 -05:00
Andrew Bauer
eaed5abcd3
add missing bootstrap.bundle.js.map
2020-07-25 16:56:17 -05:00
Isaac Connor
3ec7952c31
apply cache_busting to bootstrap, overlay anda reset
2020-07-25 15:05:12 -04:00
Isaac Connor
4af343e833
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-25 14:28:32 -04:00
Isaac Connor
e3b339e72e
add missing globals
2020-07-25 14:28:26 -04:00
Andrew Bauer
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
Andrew Bauer
bda7e1a2b7
minor cleanup of getNavBarHTML
2020-07-23 12:52:21 -05:00
Andrew Bauer
e9323f96a5
additional cleanup of getNavBarHTML
2020-07-23 10:52:12 -05:00
Isaac Connor
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
Isaac Connor
e746f0babe
Use 0 instead of the word auto for scale
2020-07-22 17:28:41 -04:00
Andrew Bauer
062ae675c8
partial cleanup of getNavBarHTML
2020-07-22 13:12:59 -05:00
Isaac Connor
495cd56b8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-21 14:39:51 -04:00
Isaac Connor
64e4363302
update code populating DeviceChannel, DeviceFormat, CapturePalette
2020-07-21 13:40:04 -04:00
Isaac Connor
e23c6de373
populate monitors with monitor array which will be json-encoded. Fixes failed population of monitor names dropdown
2020-07-20 17:42:25 -04:00
Isaac Connor
9d6e0fc3af
Merge pull request #2977 from roddone/fix_events_table_responsive
...
make events table (events view) responsive
2020-07-16 15:49:01 -04:00
Isaac Connor
855efd57fd
Merge pull request #2977 from roddone/fix_events_table_responsive
...
make events table (events view) responsive
2020-07-15 10:44:34 -04:00
Isaac Connor
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
Romain ODDONE
785ab58a80
make events table (events view) responsive
2020-07-13 11:33:26 +02:00
Andrew Bauer
cfd57a851f
fix eslint
2020-07-08 20:53:12 -05:00
Isaac Connor
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
Isaac Connor
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
Isaac Connor
89f975e646
remove code to play a sound on alarm. Not going to support that when editing a zone.
2020-07-07 16:40:33 -04:00
Isaac Connor
33d4680f02
Apply input limits when switching between percent and pixels. pixels must be integer, percent can be decimal.
2020-07-07 16:35:37 -04:00
Isaac Connor
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
Isaac Connor
8a35ae2daf
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-04 09:04:38 -04:00
Isaac Connor
d6d70ab06d
Put a list of cameras to cycle through on the left
2020-07-04 09:04:26 -04:00
Isaac Connor
ff265d2f17
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
2020-07-04 09:00:30 -04:00
Isaac Connor
e2a38268a0
replace buildSelect with htmlSelect. Update number inputs to take floats. Remove fixed sizes on various text inputs
2020-07-04 08:59:41 -04:00
Isaac Connor
fd10f545bd
if width/height don't evaluate to an integer, set to auto.
2020-07-04 08:58:09 -04:00
Isaac Connor
cc0624eb3f
Don't allow viewing of monitor setting if monitor permissions are set to View
2020-07-03 19:19:13 -04:00
Isaac Connor
1860ad188b
Don't allow viewing of zones or zone if Monitor permissions are view
2020-07-03 19:18:36 -04:00
Isaac Connor
343d8d832e
handle scale values of '' and 'auto'
2020-07-03 19:18:05 -04:00
Isaac Connor
2026788e7a
Turn close link into a button
2020-07-03 19:17:26 -04:00
Isaac Connor
66b155008c
Fix scale defaulting to monitor default Scale
2020-07-03 19:17:11 -04:00
Isaac Connor
9f821c74f6
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
2020-07-03 19:16:41 -04:00
Isaac Connor
697f117ecd
Make width of content 100% instead of 96%.
2020-07-02 17:22:34 -04:00
Isaac Connor
346fe63ef0
Add styles for inputs on monitor view
2020-06-30 19:19:17 -04:00
Isaac Connor
4d8d926c89
minor code updates. Use user_row instead of generic row variable name.
2020-06-23 22:19:46 -04:00
Isaac Connor
e778ea0918
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:19:04 -04:00
Isaac Connor
93b0552ed7
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:18:45 -04:00
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
Isaac Connor
e29c426f04
Pass event object to data-on-click events
2020-05-01 13:04:55 -04:00
Isaac Connor
89245e0d46
Add auth relay information when auth_relay is something other than hashed.
2020-05-01 13:04:37 -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
830929a85f
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 12:53:47 -04:00
Isaac Connor
0ed6cb7875
Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets
2020-05-01 10:06:41 -04:00
Isaac Connor
8d8d37c648
fix eslint
2020-05-01 09:57:46 -04:00
Dvanderploeg
1d618136c0
Merge branch 'master' into camera_control_preset_correction
2020-04-30 22:10:54 -06:00
David van der Ploeg
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
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
9ec89f20d3
Add auth relay information when auth_relay is something other than hashed.
2020-04-29 16:33:41 -04:00
Isaac Connor
5e88181380
Pass event object to data-on-click events
2020-04-29 16:32:55 -04:00
Isaac Connor
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
David van der Ploeg
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
Isaac Connor
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
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