45fde13535
rough in new events view
2020-08-15 15:27:58 -05:00
c87886f5a5
Fix v4l2 channel and palette dropdowns allowing the saving of local monitors.
2020-08-15 12:31:30 -04:00
7225281771
enlarge event thumbs on hover
2020-08-13 12:50:59 -05:00
b45c4fac1f
tighten up event column spacing
2020-08-13 12:33:13 -05:00
047d69ace7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-13 11:28:00 -04:00
c4ee4fb307
split start & end times into sep cols & wrap
2020-08-13 09:24:42 -05:00
27c80cedac
set small screen breakpoint on table-responsive
...
This gets rid of the ugly horizontal scroll bars on the table on larger screens
2020-08-12 10:10:55 -05:00
6cbc54ef87
When storage area has been deleted, say so
2020-08-11 14:11:48 -04:00
5f0da93c6e
turn off debug
2020-08-11 13:47:48 -04:00
303cec92f6
Add globals, fixing timeline view
2020-08-11 13:47:37 -04:00
0a7df075ae
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-11 11:41:15 -04:00
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
355428e93e
direct settings view to the monitor that is actually recording the stream
2020-08-10 21:32:23 -04:00
e8bf2aa386
Update settings view. Were assigning to a function. More work to be done.
2020-08-10 21:20:23 -04:00
4a31ebe045
Update options.php
2020-08-10 15:48:20 -05:00
b5553c968b
expand options to full width
2020-08-10 15:41:25 -05:00
4097693b38
appease the eslint nanny
2020-08-10 13:38:53 -05:00
3fa97f2bc1
reogranize state.php
2020-08-10 13:35:12 -05:00
bafffdb486
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:26:37 -04:00
5ee086bbfe
Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message
2020-08-10 12:25:44 -04:00
f04e1a0ba7
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-09 22:20:06 -04:00
ec707acdd1
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-09 22:19:43 -04:00
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
fc5fabf1c5
fix zone editing globals and inputs being too big
2020-08-06 12:24:51 -04:00
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
ef2ad12846
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-05 20:00:45 -04:00
ddeef6f031
Fix globals and a Fatal without ZM\ prefix
2020-08-05 20:00:39 -04:00
76e0d155d3
declare globals
2020-08-05 19:15:01 -04:00
90671cd4e5
Add missing globals
2020-08-04 18:07:01 -04:00
1ab828c110
Add globals
2020-08-04 17:35:52 -04:00
dd627d9234
Update cycle monitorlist sidebar to bootstrap4
2020-08-04 17:35:41 -04:00
ba4d6dff64
Add globals definitions
2020-08-04 17:05:58 -04:00
9a06d6cab6
Fix some spacing
2020-08-04 17:05:44 -04:00
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
325178a556
convert log filters to responsive bootstrap divs.
2020-08-02 20:25:24 -04:00
6f9947b583
Switch to jquery in login.js. We no longer include mootool for login view.
2020-08-02 19:12:07 -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
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
c2ac7ed4a9
spacing and escape sql fields
2020-07-30 17:07:43 -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
6a4ce29bce
eslint fixes
2020-07-30 12:15:05 -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
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
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
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
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
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
5f9c62f266
spacing and slightly improve nav item code in options
2020-07-26 22:33:29 -04:00
003abfea29
Update class so that Submit button is hidden under new bootstrap
2020-07-26 22:32:36 -04:00
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -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
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
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
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
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
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
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
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
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
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
Andrew Bauer
Isaac Connor
Isaac Connor
Romain ODDONE
Andrew Bauer
Romain ODDONE
Isaac Connor