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
d3cc4d589f
Remove the parseFilter etc calls from getNavBarHTML code which was used to populate the filter link with the currently viewed events list. I think we can do this better with saving it to the sesssion or similar.
2020-08-16 13:04:42 -04:00
344f586f19
Add language entry for ExistsInFileSystem
2020-08-16 13:03:18 -04:00
d1126b3007
Move term logic from parseFilter to FilterTerm class
2020-08-16 13:02:34 -04:00
9be63f1d99
reorganize and init eventTable
2020-08-16 11:34:37 -05:00
82a1670d80
Rough in FilterTerm class, stealing code from functions.php and adapting it.
2020-08-15 17:49:59 -04:00
8a170f2841
Remove Debug
2020-08-15 17:49:26 -04:00
93475bef7e
eslint nanny
2020-08-15 16:08:53 -05:00
252bf7995a
eslint nannt
2020-08-15 15:54:58 -05:00
1c558b66e7
add font-awesome stylesheet
2020-08-15 15:44:54 -05:00
50a1ceb48a
add bootstrap-table.min.css
2020-08-15 15:37:02 -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
6550876a92
fix css so that the background colour of the dropdown divs is set
2020-08-13 12:40:11 -04:00
c674cb7b55
Move the dropdown id's to the a element where they should be. Remove duplicated id on storage_dropdown.
2020-08-13 12:39:51 -04:00
4fee59208d
Use str_replace and ltrim instead of preg_replace for efficiency
2020-08-13 12:14:18 -04: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
81296bbe31
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-10 17:31:08 -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
63da7f0074
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
2020-08-10 14:02:25 -04:00
81b55589db
Fix unsetting scale, width and height when generating url to zms. width and height are normally pixels but maybe someday could be percent.
2020-08-10 13:59:47 -04: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
e64e786c5b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-09 22:20:08 -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
25426d5fdd
Don't add 442 for https and 80 for http. Just cleaner
2020-08-09 22:18:35 -04:00
b4a3ccdfed
only put the hostname in the CSP headers so that we accept as source either http or https or any port. Useful for multiport.
2020-08-09 22:18:07 -04:00
42fe024681
Update skin.js
2020-08-09 17:43:39 -05:00
9a03a2c7d4
Update skin.js
2020-08-09 17:43:07 -05:00
15005a2f17
fix typo
2020-08-09 14:25:11 -05:00
d0e7443a3c
rough in update reminder dropdown
2020-08-09 14:18:44 -05:00
b22f12dadb
rough in new zmversion widget
2020-08-09 12:20:11 -05:00
6c831be61f
remove extra ,
2020-08-08 14:27:37 -04:00
a6ae4aee01
eslint nanny
2020-08-08 12:26:42 -05:00
fd4b9ba4f4
move jquery in functions.php to skin.js
2020-08-08 12:06:57 -05:00
b626e0de1c
eslint nanny strikes again
2020-08-08 11:19:29 -05:00
a001c93321
fix zone editing globals and inputs being too big
2020-08-08 11:41:24 -04:00
96bd6397c6
eslint nanny
2020-08-08 10:38:58 -05:00
8533ce7018
fix CSP on polygons
2020-08-08 11:38:54 -04:00
82357a0675
reapply click function to bandwidth dropdown entries after getNavBar
2020-08-08 11:17:26 -04:00
3792043707
implement bw widget as dropdown
2020-08-08 10:07:26 -05:00
bf7aa3f5c2
this version of set_cookie_params was introduced in 7.3. So put back code for previous versions of php which unfortunately do not support the samesite parameter. Fixes #3009
2020-08-08 09:58:18 -04:00
da757d075b
Only save the DiskSpace on completed events. Fixes #3007
2020-08-07 09:53:35 -04:00
eff96c5fa3
Only save the DiskSpace on completed events. Fixes #3007
2020-08-07 09:53:15 -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
3242ce6ec9
Handle backticks in matches sort fields. Fixes regression in 1.34.17
2020-08-06 10:37:56 -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
97096d87f9
Add mx-2 classes to be consistent
2020-08-04 18:06:49 -04:00
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
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
e5513bc7a4
Add setting Name and Path
2020-08-04 17:35:16 -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
79c9671ef2
Use & instead of & in urls
2020-08-04 17:05:33 -04:00
c0f21ab55d
Fix globals
2020-08-04 16:36:24 -04:00
d7de4768d7
Fix use of is_callable
2020-08-04 16:36:04 -04:00
82542c569c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-04 10:47:41 -04:00
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
a575b16278
set a target to about menu items
2020-08-03 15:45:27 -05:00
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
ab9a135759
fix inability to stop zm from the web console
2020-08-03 12:10:34 -05:00
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
a3e6fe5522
make the eslint nanny happy
2020-08-03 11:47:31 -05:00
ce810320a2
bump right margin on storage widget
2020-08-03 11:02:30 -05:00
8a711245f6
fix previous corrupted commit
2020-08-03 10:49:45 -05:00
c1f37192b9
implement storage widget as dropdown
2020-08-03 10:43:24 -05:00
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
eb1d94345f
remove crud
2020-08-03 11:05:58 -04:00
9acbd9d1b2
fix typos prevent array based regexp from working. Fixes saving Storage
2020-08-03 11:05:16 -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
56bf181dc4
set SameSite on session cookie.
2020-08-03 10:55:54 -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
3351a4de56
fix eslint
2020-08-02 15:33:10 -05:00
0ecb1621ce
add colorized log icon to widget bar
2020-08-02 14:49:19 -05:00
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
Andrew Bauer
Isaac Connor
Isaac Connor
Andrew Bauer