a937e14899
put the optional banner in its own navbar
2020-08-02 13:48:15 -05:00
d6999f5628
iterate through keys in data
2020-08-02 13:33:25 -05:00
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
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
cfa2d13948
set samesite=Strict in session cookie
2020-08-02 12:06:13 -04:00
037b696be0
Fix duplicate class attributes on navbar links
2020-08-02 12:05:52 -04:00
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
e768beaef2
fix whitespace
2020-08-01 16:20:51 -05:00
ad3b5a5aa3
call ob_start and ob_get_clean correctly
2020-08-01 16:16:23 -05:00
81c4bfa7c2
stop Chrome complaining about bootstrap.min.css.map
2020-08-01 12:22:47 -05:00
b746901ee7
close the dropmenu on any click
2020-08-01 10:57:13 -05:00
4851f1f940
remove errant text
2020-08-01 09:50:25 -05:00
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
b46d3b81d6
Update user view to use User class
2020-08-01 10:27:54 -04:00
8b3917d707
reapply navbar reload logic
2020-08-01 09:07:21 -05:00
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
cd96994a56
update getZMVersionHTML
2020-07-31 07:31:40 -05:00
366ce5b3eb
Add 100% width to LabelFormat
2020-07-30 19:36:27 -04:00
3df58fc9db
handle array args in daemonStatus
2020-07-30 19:36:05 -04:00
2699fa0313
force menubar to the top of the navbar
2020-07-30 16:56:38 -05:00
8bb30bb6d4
add framework for new navbar selection
2020-07-30 16:44:58 -05:00
561c44ece2
add runtimeStatus function
2020-07-30 16:14:41 -05:00
0a782814a7
Don't start filter if the command was execute
2020-07-30 17:13:30 -04:00
204086a56d
spacing and quotes
2020-07-30 17:12:00 -04:00
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -04:00
2cfa5fde98
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-30 16:54:00 -04:00
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
23596b142d
fix how we finish up getNavBarHTML
2020-07-30 11:55:54 -05:00
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -04:00
bf163beedb
Update permissions checking when viewing/editing users. Fixes #2982 . Also add a beforeFind that will remove the Password field from the query so that we don't return passwords
2020-07-30 11:03:24 -04:00
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
6b303b67d0
continued adjustment of options view fields
2020-07-30 09:03:03 -05:00
484051a191
adjust column widths on options
2020-07-30 08:23:25 -05:00
aa3b48e7c0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-29 18:59:50 -04:00
5ac4677c02
Add missing view tempplates for zone add/edit. Fixes #2986
2020-07-29 18:59:44 -04:00
b42eb44a79
handle when [fid] = 0; Fixes #2994
2020-07-29 18:51:11 -04:00
8e37efaa7a
handle when [fid] = 0; Fixes #2994
2020-07-29 18:50:14 -04:00
4bf7093ff1
align account circle with status button
2020-07-29 15:47:46 -05:00
c4d4a73c2a
json decoding errors shouldnt' be fatal
2020-07-29 16:41:37 -04:00
0139d06fcd
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:41:27 -04:00
1508b82754
Fix data-on-input-this using onchange instead of oninput
2020-07-29 16:40:57 -04:00
4c5a88a822
json decoding errors shouldnt' be fatal
2020-07-29 16:40:31 -04:00
1119923c38
Update functions.php
2020-07-29 15:26:07 -05:00
695da2221f
Update functions.php
2020-07-29 15:20:44 -05:00
4c242ef973
what a difference a single space makes
2020-07-29 15:09:47 -05:00
9f1901e413
fix typo
2020-07-29 14:42:06 -05:00
d285f2f998
adjust class name
2020-07-29 14:38:00 -05:00
ded0dbc4ae
shrink the vert nav items further
2020-07-29 14:00:44 -05:00
32bbeb556f
set the vert navbar bg color in base.css
2020-07-29 13:51:36 -05:00
907063e385
use smaller font in form control item
2020-07-29 13:25:40 -05:00
fd5adc6623
remove blockquote from options.php
...
It makes the vertical navbar font unnaturally large
2020-07-29 12:49:32 -05:00
a6005f0b0d
fix clor of options nav-pill active
2020-07-28 13:09:54 -05:00
52d88e15fd
let options span the full column
2020-07-28 12:45:25 -05:00
cf9eb405ee
don't wrap the rows on small screens
2020-07-28 12:43:51 -05:00
853a5728f8
align navbar logo and run status vertically
2020-07-28 12:20:18 -05:00
aa8662f311
fix copy/paste typo
2020-07-28 10:37:10 -05:00
b88f0c3991
display user:port@ip when controladdress is empty
2020-07-28 10:08:24 -05:00
45f88ee04a
float web console statusBreakdown left then down
2020-07-28 08:59:28 -05:00
85dec6194d
when maxmimize, rebuild jqeury chosen fields
2020-07-28 08:38:06 -05:00
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
767f5ebb03
navbar closes the form, and doesn't need to be in the form.
2020-07-27 12:40:46 -04:00
5d883d696b
give a better error message when submitThisForm fails
2020-07-27 12:40:25 -04:00
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
cec5d7ea06
w-100 class not needed
2020-07-27 10:22:23 -05:00
ffa3415318
when collapsed, force the menu button to the right
2020-07-27 10:13:02 -05:00
bc19ae604a
fix alignment of top navbar
2020-07-27 09:18:02 -05:00
1e76679820
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-26 22:33:34 -04:00
5f9c62f266
spacing and slightly improve nav item code in options
2020-07-26 22:33:29 -04:00
31cbfc35b1
fix use of is_callable so that we fix filter saving
2020-07-26 22:32:55 -04:00
003abfea29
Update class so that Submit button is hidden under new bootstrap
2020-07-26 22:32:36 -04:00
941c074a8e
add carriage returns to generated html for readability
2020-07-26 10:50:32 -05:00
6486f59383
fix colorization of navbar widgets
2020-07-26 10:41:05 -05:00
eaed5abcd3
add missing bootstrap.bundle.js.map
2020-07-25 16:56:17 -05:00
3ec7952c31
apply cache_busting to bootstrap, overlay anda reset
2020-07-25 15:05:12 -04:00
c81e4a3bca
fix
2020-07-25 14:32:30 -04:00
99d7aa0da0
fix
2020-07-25 14:31:57 -04:00
4af343e833
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-25 14:28:32 -04:00
e3b339e72e
add missing globals
2020-07-25 14:28:26 -04:00
e90efa7a7e
spacing
2020-07-25 14:28:08 -04:00
4c8f96b786
Update saving action to use our ORM methods
2020-07-25 14:28:01 -04:00
dda630f522
fix filter_regexp to remove trailing /
2020-07-25 14:27:09 -04:00
522dfecebe
Fix setting values by checking is_callable. Remove debug. Fix filter_regexp
2020-07-25 14:26:49 -04:00
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
fe9db4cfa2
add filtering to Storage->Path()
2020-07-25 13:51:13 -04:00
a819b73e18
allow filter_regexp to be an array
2020-07-25 13:50:59 -04:00
bda7e1a2b7
minor cleanup of getNavBarHTML
2020-07-23 12:52:21 -05:00
e9323f96a5
additional cleanup of getNavBarHTML
2020-07-23 10:52:12 -05:00
1416bc547e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-22 17:37:52 -04:00
e746f0babe
Use 0 instead of the word auto for scale
2020-07-22 17:28:41 -04:00
7fd038d99b
spacing and quotes
2020-07-22 17:28:12 -04:00
062ae675c8
partial cleanup of getNavBarHTML
2020-07-22 13:12:59 -05:00
d5dbebefe5
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-21 19:06:38 -04:00
495cd56b8b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-21 14:39:51 -04:00
64e4363302
update code populating DeviceChannel, DeviceFormat, CapturePalette
2020-07-21 13:40:04 -04:00
a70b329ce3
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-07-20 18:40:59 -04:00
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
03195a8786
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-20 16:25:59 -04:00
d716d1d686
Merge branch 'release-1.34'
2020-07-20 16:25:41 -04:00
4e2633d22b
Update code to make calls to api on remote servers
2020-07-20 16:25:29 -04:00
e839919b5e
Add foreign key MonitorId validation
2020-07-20 16:25:08 -04:00
955fc00b87
Fix Zone add api. Restart zmc when adding a zone. Use validation. Fixes #2983
2020-07-20 16:24:49 -04:00
bbee6b4f58
Whitespace, delete dead code
2020-07-20 16:23:55 -04:00
cb0e54d3be
consider Monitor->Controllable as well in stopping zmtrack. Don't complain about ControlCommand being told to start/stop
2020-07-20 10:23:26 -04:00
135bbb4190
remove unneeded config loading, just use defines. Spacing, remove commented out dead code
2020-07-19 17:51:28 -04:00
1becd21df0
Update it_it.php
...
Italian translation updates
2020-07-19 00:01:14 +02:00
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
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
dcd67a1acf
Remove args with non-sensical values from cgi params as a micro-opt
2020-07-13 14:50:21 -04:00
785ab58a80
make events table (events view) responsive
2020-07-13 11:33:26 +02:00
cfd57a851f
fix eslint
2020-07-08 20:53:12 -05:00
880219bb0f
Merge branch 'release-1.34'
2020-07-07 18:58:32 -04:00
6469300af5
fix some csp violations
...
y
2020-07-07 18:57:11 -04:00
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
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
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
8a35ae2daf
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
2020-07-04 09:04:38 -04:00
d6d70ab06d
Put a list of cameras to cycle through on the left
2020-07-04 09:04:26 -04:00
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
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
fd10f545bd
if width/height don't evaluate to an integer, set to auto.
2020-07-04 08:58:09 -04:00
cc0624eb3f
Don't allow viewing of monitor setting if monitor permissions are set to View
2020-07-03 19:19:13 -04:00
1860ad188b
Don't allow viewing of zones or zone if Monitor permissions are view
2020-07-03 19:18:36 -04:00
343d8d832e
handle scale values of '' and 'auto'
2020-07-03 19:18:05 -04:00
2026788e7a
Turn close link into a button
2020-07-03 19:17:26 -04:00
66b155008c
Fix scale defaulting to monitor default Scale
2020-07-03 19:17:11 -04:00
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
697f117ecd
Make width of content 100% instead of 96%.
2020-07-02 17:22:34 -04:00
346fe63ef0
Add styles for inputs on monitor view
2020-06-30 19:19:17 -04:00
c47a348fea
Handle empty string version of scale
2020-06-30 19:18:45 -04:00
b060e0835c
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2020-06-25 16:07:22 -04:00
13130a844e
handle array args in daemonStatus
2020-06-25 16:07:16 -04:00
0a383c02c4
Better debugging of REQUEST/POST vars
2020-06-23 22:20:07 -04:00
4d8d926c89
minor code updates. Use user_row instead of generic row variable name.
2020-06-23 22:19:46 -04:00
e778ea0918
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:19:04 -04:00
93b0552ed7
Update saving Users. Don't allow restrictions on admin user. Fix CSP violations.
2020-06-23 22:18:45 -04:00
f73cb3bebe
Don't start filter if the command was execute
2020-06-17 13:36:28 -04:00
e68bf13a6b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-06-17 12:50:42 -04:00
d3c474fc8b
use translate on Show/Hide Zones
2020-06-17 12:50:36 -04:00
8efe00157d
add a User object
2020-06-17 12:50:22 -04:00
dcb77cdaea
apply stream scale in zoom coordinates
2020-06-17 14:46:10 +02:00
aba403e3f2
Correct handling of Transport in onvif results
2020-06-16 16:48:17 -04:00
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
a719565bf3
Merge branch 'master' into add_user_to_filters
2020-06-05 19:03:23 -04:00
198790796d
Merge branch 'release-1.34'
...
plus cleanups in dbConnect
2020-06-05 19:02:43 -04:00
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
910d4b51c9
Escape table names for mysql-8
2020-06-04 11:44:59 -04:00
8802447b10
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:36:10 -04:00
ef3fc758cb
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
2020-06-04 11:34:48 -04:00
c4b2aa4a85
Handle no DB_HOST specifed so default to localhost
2020-06-04 11:34:16 -04:00
87078dfc31
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-06-03 17:41:09 -04:00
0644358d0a
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
2020-06-03 17:41:03 -04:00
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
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
a9c52a21ec
call to changeScale() on page init when "scale to fit" is selected
2020-06-02 17:25:07 +02:00
20870e22fa
fix eslint errors
2020-05-29 13:28:33 -04:00
8121787ee6
make monitors table (console view) responsive
2020-05-27 10:08:08 +02:00
eb41e4fb39
Fix the array for the de-interlacing options
2020-05-24 11:09:13 -04:00
85e1dcadf4
Fix the array for the de-interlacing options
2020-05-24 11:07:52 -04:00
e72c357fd0
Unable to probe should not be fatal
2020-05-23 16:13:48 -04:00
a9cec3ebbd
spacing
2020-05-23 16:13:29 -04:00
d7680e1a44
Spacing
2020-05-23 10:15:48 -04:00
46a13237b5
fix eslint errors
2020-05-22 09:28:15 -04:00
23900cbf01
fix
2020-05-21 13:34:09 -04:00
59c08410c1
Put the size of SHM in the title of the shm space used element
2020-05-21 13:32:33 -04:00
ce15e1c921
remove debug, don't pass element through event handler anymore on layout ddm
2020-05-20 09:42:29 -04:00
cc04ced406
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-20 09:42:06 -04:00
3faf20516f
add changeInterface handler
2020-05-19 16:58:45 -04:00
074e270e79
populate network interfaces list, rescan on change.
2020-05-19 16:58:26 -04:00
cc01a04efc
remove debug, don't pass element through event handler anymore on layout ddm
2020-05-19 16:57:45 -04:00
270ab36ff4
load zmMontageLayout ddm explicitly instead of passing event element
2020-05-19 16:56:58 -04:00
3c2e26ac32
Merge branch 'release-1.34'
2020-05-15 16:02:29 -04:00
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
6bb2c09a72
Merge branch 'release-1.34'
2020-05-15 11:41:34 -04:00
c4c4c5bcbf
fix Crud submodule version
2020-05-15 11:34:34 -04:00
424a4ed0b1
add onclick to div.zoom
2020-05-15 11:34:23 -04:00
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
94b29c6c7a
replace inline javascript in timeline zoom
2020-05-15 10:44:48 -04:00
992ac144a9
Fix ONVIF_User => ONVIF_Username
2020-05-13 16:04:26 -04:00
880b456d93
Rrename MetaConfig to ONVIF
2020-05-13 15:30:56 -04:00
88a910793c
Spacing
2020-05-13 08:06:55 -04:00
edd718afd2
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:02:49 -04:00
807efde523
xtell and ytell are data-xtell and data-ytell fixes #2932
2020-05-13 08:01:04 -04:00
69e5feb28b
Add ONVIF* to Monitor object
2020-05-12 15:47:00 -04:00
c83621822f
Rename Config* to ONVIF_*
2020-05-12 15:46:07 -04:00
1f3cf266a2
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-12 11:20:49 -04:00
89939efc9b
Fixup my updates to the MetaConfig tab of monitor view
2020-05-12 11:15:29 -04:00
3f50277e1c
Revert effort to escape column names. Not smart enough.
2020-05-12 09:21:05 -04:00
eadff23465
Fix missing )
2020-05-12 09:16:37 -04:00
c5f082e7ac
fix escaping column names
2020-05-12 09:06:57 -04:00
92ba017328
Spacing
2020-05-11 09:19:33 -04:00
582102c2c6
Fix use of backticks for newer mysql
2020-05-11 09:19:16 -04:00
81cd338545
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-05-11 08:34:19 -04:00
d23258cb23
Allow for backticks in sort column
2020-05-11 08:34:07 -04:00
75082064fd
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-09 16:40:17 -04:00
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
Andrew Bauer
Isaac Connor
Isaac Connor
Andrew Bauer
Andrea Vezzali
Romain ODDONE
Andrew Bauer
Romain ODDONE
Isaac Connor