b5ef7b08b9
settings popup has to come from the server hosting the v4l device, so use monitor->UrlToIndex and include auth.
2020-08-25 12:40:22 -04:00
6587cdd3de
Handle failure to get v4l settings. Fix assignment of values to monitor object.
2020-08-25 12:39:44 -04:00
e3a48c2db4
Handle the case where the layout has invalid json
2020-08-25 12:07:45 -04:00
6fbe7457ff
Add missing globals
2020-08-25 11:47:49 -04:00
626e892b33
add global
2020-08-25 11:43:55 -04:00
3d3dde22c4
Use zm_session_start
2020-08-25 11:31:06 -04:00
278be59c86
Use zm_session_start
2020-08-25 11:30:51 -04:00
3c29228df5
Use zm_session_start
2020-08-25 11:30:22 -04:00
586f9f3e52
Use zm_session_start
2020-08-25 11:27:25 -04:00
981439cbd9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 17:42:37 -04:00
fe5e005d8e
Calculate scale to pass to getStreamSrc for thumbnail still and stream
2020-08-24 17:42:23 -04:00
0879ecf9a5
update timeline header
2020-08-24 14:33:01 -05:00
8c32511c83
whitespace
2020-08-24 12:05:31 -05:00
bce38ae2c6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-24 12:05:25 -04:00
56e2ac5baa
add scale to query params because zms doesn't wupport width&height
2020-08-24 12:05:14 -04:00
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
c6e3107a50
make donate view a modal
2020-08-24 09:31:21 -05:00
67f2e3c1a0
Merge branch 'master' into filter_pre_post
2020-08-24 10:30:01 -04:00
b5cdc5c32d
Set width and height on image tag so browser knows how to lay them out. Fixes flickering.
2020-08-24 10:26:07 -04:00
0e9c8a35e6
fix thumbnail height style. Make thumbnail clickable.
2020-08-24 09:32:49 -04:00
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
8ea806e264
eslint
2020-08-23 18:40:58 -05:00
699b20b961
whitespace
2020-08-23 17:54:57 -05:00
65181c84ee
update frame top toolbar
2020-08-23 17:53:47 -05:00
773557ee8a
set view to stats rather than popup
2020-08-23 13:25:09 -05:00
86f0d41d8e
autoinit changeScale in frame view
2020-08-23 13:17:03 -05:00
63fc59568f
pad frames cells to account for detail view
2020-08-23 13:12:54 -05:00
4b144dea74
whitespace
2020-08-23 13:02:35 -05:00
f06bfe7cbb
use bootstrap-table on stats view
2020-08-23 12:23:58 -05:00
69ba9e6d0e
eslint
2020-08-23 12:14:09 -05:00
2a7ea52330
Merge branch 'release-1.34'
2020-08-23 11:51:54 -04:00
4cbac47d6d
add navbar to stats view
2020-08-22 21:09:58 -05:00
de1d1c2ac6
change close link to back link
2020-08-22 14:43:53 -05:00
ad67f74ba4
add formatting to stats table
2020-08-22 14:12:11 -05:00
afc3d2c548
fix horizontal scroll issues events
2020-08-22 13:00:53 -05:00
e69e767878
fix horizontal scroll nonsense
2020-08-22 12:56:31 -05:00
61f89e3306
rough in frames detail view
2020-08-22 12:45:19 -05:00
5d09ae91ab
move div tag into $imgHTML
2020-08-22 07:14:47 -05:00
8ea7b783b5
generate thumbnails when monitor is connected
2020-08-21 21:18:55 -05:00
c8e40eb5b3
don't generate tumbnails when not running
2020-08-21 21:14:16 -05:00
39d538d5cf
add missig }
2020-08-21 20:57:05 -05:00
73a01855f8
rough in thumbnail animation
2020-08-21 20:44:20 -05:00
ac0976324f
Fix case of filterQuery. Fixes #3017
2020-08-21 11:22:47 -04:00
9357017a39
add export fx to tables
2020-08-21 07:11:57 -05:00
519bfae1da
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-20 17:12:41 -04:00
de4d144cd4
fix scale dropdown in frame view
2020-08-20 10:16:28 -05:00
72d95275c3
add navbar for frame view
2020-08-20 09:19:04 -05:00
247ace7fa2
process clicks per cell in frames
2020-08-20 09:13:11 -05:00
7175fa3d86
no padding on frames outermost div
2020-08-20 08:19:53 -05:00
c9de30d427
click any row to load frame
2020-08-19 17:54:39 -05:00
b2a632a3f8
reinit thumbnail ani on click events
2020-08-19 16:16:27 -05:00
8f70ae192d
enable thumbnail zoom on frames view
2020-08-19 15:42:35 -05:00
a903a885b6
whitepsace
2020-08-19 14:07:00 -05:00
c2d6b8f493
revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors.
2020-08-19 14:39:15 -04:00
d0c21995cd
Fixes to function converting from pixels to percent. Adjust to 100 if > 100.
2020-08-19 14:14:32 -04:00
efec1e7d4f
remove debug
2020-08-19 14:13:48 -04:00
177df46113
Apply min=0 to filterX and Y so that we don't get negative values
2020-08-19 14:11:16 -04:00
d366d41297
Update parseFilter to Filter::parse
2020-08-19 14:07:51 -04:00
842efc1574
remove <a> tags from col headers
2020-08-19 12:31:13 -05:00
74b0ad2cb3
get rid of horizontal scrollbar in frames
2020-08-19 12:20:57 -05:00
f317bf1722
fix copy/paste typo
2020-08-19 12:07:31 -05:00
e38a532b78
rough new frames view
2020-08-19 12:04:08 -05:00
ad9b9d91cc
disable the back button when new page
2020-08-18 16:57:03 -05:00
b38c5e98a8
Merge branch 'master' into filter_pre_post
2020-08-18 16:33:04 -04:00
3664a9b42c
set the pagination list
2020-08-18 15:12:07 -05:00
1e41bd0823
whitespace
2020-08-18 13:48:18 -05:00
6eb7b6d51c
set the right toolbar btn class to match
2020-08-18 13:13:32 -05:00
df02d84a56
don't go back if not referred
2020-08-18 13:08:17 -05:00
2c9caeb348
whitespace
2020-08-18 12:40:27 -05:00
2d5522df14
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-18 13:25:21 -04:00
c837a17aea
Add a warning about missing EndTime term on UpdateDiskSpace
2020-08-18 13:25:18 -04:00
bf63500b08
fix thumbnail animation after user event
2020-08-18 12:00:20 -05:00
e6d6ee1b67
Merge branch 'filter_warnings'
2020-08-18 11:17:46 -04:00
16efa9dbb2
Add extra checks for Deleting without an Archived State term and Running in the background without any actions.
2020-08-18 11:17:22 -04:00
1627b1d0d1
privacy view page formatting
2020-08-18 09:08:26 -05:00
287c585d3d
use translated text for delete confirmation
2020-08-18 08:26:45 -05:00
b32bcab91f
add a delete confirmation modal
2020-08-18 08:06:58 -05:00
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
0a3ad719cd
Merge branch 'master' into filter_pre_post
2020-08-17 18:30:44 -04:00
1dd0b44334
eslint nanny strikes again
2020-08-17 16:59:57 -05:00
dc451cbc85
Use filter class
2020-08-17 17:42:22 -04:00
e3fe75f21b
fix case on filterQuery
2020-08-17 17:42:03 -04:00
e5dd10fc04
use filter class instead of parseFilter
2020-08-17 17:41:50 -04:00
0f90b999c0
use filter class instead of parseFilter
2020-08-17 17:41:38 -04:00
6649a30bbb
Use querystring instead of query
2020-08-17 17:41:13 -04:00
80b92573b8
set the icons used in bstable toolbar
2020-08-17 16:18:18 -05:00
f4594f06d1
Add in pre_condition checks.
2020-08-17 16:58:37 -04:00
e452c23c4d
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:43 -04:00
e4425d7565
Merge branch 'master' into filter_pre_post
2020-08-17 12:56:20 -04:00
11afad5c92
add pagination on/off toggle
2020-08-17 11:02:25 -05:00
1a6154752a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-16 20:08:49 -04:00
a8455d4ecf
Add necessary globals
2020-08-16 20:08:42 -04:00
de0a4a18ee
fix checkbox column
2020-08-16 18:00:11 -05:00
5468c0322e
appease the eslint nanny
2020-08-16 16:30:35 -05:00
0cbf559821
only hide cols if cookie not exist
2020-08-16 16:02:43 -05:00
33ea9de8cf
better spacing archived & emailed tinytext
2020-08-16 15:19:08 -05:00
f27f6e6394
fix archive buttons, remove asterisk from event name
2020-08-16 14:46:56 -05:00
94d666b296
tiny text under event name, add emailed column
2020-08-16 14:41:50 -05:00
ee31761627
cleanup & consolidate events view buttons
2020-08-16 13:44:18 -05:00
77c391fcae
Add booleanvalues for operators support
2020-08-16 13:07:42 -04:00
77f9f4bffb
Add ExistsInFileSystem support in Filters. This also includes limiting operators to IS/IS NOT
2020-08-16 13:07:21 -04:00
303154c690
Remove countSQL code that ran the sql query once to get the # of entries returned to be used in pagination. Now that we support POSTSQL Conditions it is no longer useful. Pagination has to happen later. Implement POSTSQLConditions in filtering results.
2020-08-16 13:06:37 -04:00
9be63f1d99
reorganize and init eventTable
2020-08-16 11:34:37 -05:00
93475bef7e
eslint nanny
2020-08-15 16:08:53 -05:00
252bf7995a
eslint nannt
2020-08-15 15:54:58 -05:00
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
dbb2535a6b
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-08-14 13:08:04 -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
f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -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
Isaac Connor
Andrew Bauer
Andrew Bauer
Isaac Connor
Romain ODDONE