Commit Graph

15818 Commits

Author SHA1 Message Date
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
Isaac Connor 34b079fa9e Start roughing in pre and post conditions 2020-07-30 12:13:09 -04:00
Isaac Connor 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
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
Isaac Connor d658479048 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-29 16:27:21 -04:00
Isaac Connor 2f57ccc9b9 Merge branch 'release-1.34' 2020-07-29 16:27:01 -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
Andrew Bauer ded0dbc4ae
shrink the vert nav items further 2020-07-29 14:00:44 -05:00
Andrew Bauer 32bbeb556f set the vert navbar bg color in base.css 2020-07-29 13:51:36 -05:00
Andrew Bauer 907063e385
use smaller font in form control item 2020-07-29 13:25:40 -05:00
Isaac Connor 4ed0ad26a7 bail early if fwrite fails 2020-07-29 14:01:52 -04:00
Andrew Bauer fd5adc6623
remove blockquote from options.php
It makes the vertical navbar font unnaturally large
2020-07-29 12:49:32 -05:00
Isaac Connor b1054a7db6 bail earlier if writing content-length fails. Dropped connections aren't really errors, make them Info. Fixes #2996 2020-07-29 13:39:00 -04:00
Andrew Bauer a6005f0b0d fix clor of options nav-pill active 2020-07-28 13:09:54 -05:00
Andrew Bauer 52d88e15fd let options span the full column 2020-07-28 12:45:25 -05:00
Andrew Bauer cf9eb405ee don't wrap the rows on small screens 2020-07-28 12:43:51 -05:00
Andrew Bauer 853a5728f8 align navbar logo and run status vertically 2020-07-28 12:20:18 -05:00
Andrew Bauer aa8662f311
fix copy/paste typo 2020-07-28 10:37:10 -05:00
Andrew Bauer b88f0c3991 display user:port@ip when controladdress is empty 2020-07-28 10:08:24 -05:00
Isaac Connor 5bea68c93d add comment and improve logging of figuring out event starttime from youngest file 2020-07-28 10:35:28 -04:00
Andrew Bauer 45f88ee04a float web console statusBreakdown left then down 2020-07-28 08:59:28 -05:00
Isaac Connor c2f4991a76
Merge pull request #2993 from knight-of-ni/min-filterbar
implement minimize chevron for filterbar
2020-07-28 09:48:53 -04:00
Andrew Bauer 85dec6194d when maxmimize, rebuild jqeury chosen fields 2020-07-28 08:38:06 -05:00
Andrew Bauer 47b35e97fb implement minimize chevron for filterbar 2020-07-27 16:14:15 -05:00
Isaac Connor 9b6ddb6933 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-27 16:11:46 -04:00
Isaac Connor 1840413564 fix distro in apt line in buster section of debian guide 2020-07-27 16:11:32 -04:00
Isaac Connor 767f5ebb03 navbar closes the form, and doesn't need to be in the form. 2020-07-27 12:40:46 -04:00
Isaac Connor 5d883d696b give a better error message when submitThisForm fails 2020-07-27 12:40:25 -04:00
Isaac Connor 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
Andrew Bauer cec5d7ea06 w-100 class not needed 2020-07-27 10:22:23 -05:00
Andrew Bauer ffa3415318 when collapsed, force the menu button to the right 2020-07-27 10:13:02 -05:00
Andrew Bauer bc19ae604a fix alignment of top navbar 2020-07-27 09:18:02 -05:00
Isaac Connor 1e76679820 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-07-26 22:33:34 -04:00