Commit Graph

6502 Commits

Author SHA1 Message Date
Isaac Connor 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
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
Isaac Connor 6c831be61f remove extra , 2020-08-08 14:27:37 -04: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 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
Isaac Connor da757d075b Only save the DiskSpace on completed events. Fixes #3007 2020-08-07 09:53:35 -04:00
Isaac Connor eff96c5fa3 Only save the DiskSpace on completed events. Fixes #3007 2020-08-07 09:53:15 -04: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 3242ce6ec9 Handle backticks in matches sort fields. Fixes regression in 1.34.17 2020-08-06 10:37:56 -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 e5513bc7a4 Add setting Name and Path 2020-08-04 17:35:16 -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 d7de4768d7 Fix use of is_callable 2020-08-04 16:36:04 -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 9acbd9d1b2 fix typos prevent array based regexp from working. Fixes saving Storage 2020-08-03 11:05:16 -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 56bf181dc4 set SameSite on session cookie. 2020-08-03 10:55:54 -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 cfa2d13948 set samesite=Strict in session cookie 2020-08-02 12:06:13 -04: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 81c4bfa7c2 stop Chrome complaining about bootstrap.min.css.map 2020-08-01 12:22:47 -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
Isaac Connor 3df58fc9db handle array args in daemonStatus 2020-07-30 19:36:05 -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 0a782814a7 Don't start filter if the command was execute 2020-07-30 17:13:30 -04:00
Isaac Connor 204086a56d spacing and quotes 2020-07-30 17:12:00 -04:00
Isaac Connor c2ac7ed4a9 spacing and escape sql fields 2020-07-30 17:07:43 -04:00
Isaac Connor 2cfa5fde98 Add missing view tempplates for zone add/edit. Fixes #2986 2020-07-30 16:54:00 -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 5ac4677c02 Add missing view tempplates for zone add/edit. Fixes #2986 2020-07-29 18:59:44 -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 c4d4a73c2a json decoding errors shouldnt' be fatal 2020-07-29 16:41:37 -04: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
Isaac Connor 4c5a88a822 json decoding errors shouldnt' be fatal 2020-07-29 16:40:31 -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