Commit Graph

14835 Commits

Author SHA1 Message Date
Isaac Connor 74d2ba56db Persist video volume in a cookie so that subsequent events remember the volume level. 2020-08-26 15:15:10 -04:00
Isaac Connor 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
Isaac Connor 6587cdd3de Handle failure to get v4l settings. Fix assignment of values to monitor object. 2020-08-25 12:39:44 -04:00
Isaac Connor b0f5f3617a Always set auth_hash and always set auth_relay, using our handy new get_auth_relay function 2020-08-25 12:39:14 -04:00
Isaac Connor f1fab6361f fix dimensions of v4l settings popup 2020-08-25 12:38:46 -04:00
Isaac Connor 98dce06d6b Introduce get_auth_relay to return an auth string to use in urls. 2020-08-25 12:38:31 -04:00
Isaac Connor 3c29228df5 Use zm_session_start 2020-08-25 11:30:22 -04:00
Isaac Connor 586f9f3e52 Use zm_session_start 2020-08-25 11:27:25 -04:00
Isaac Connor 977dee29f1 bump for release 1.34.20 2020-08-23 11:48:00 -04:00
Isaac Connor cf63cc65c8 eoan is deprecated. 2020-08-23 11:42:08 -04:00
Isaac Connor c2d6b8f493 revert code that passed the div hightlightOn/Off. Better to pass index. Fixes js errors. 2020-08-19 14:39:15 -04:00
Isaac Connor d0c21995cd Fixes to function converting from pixels to percent. Adjust to 100 if > 100. 2020-08-19 14:14:32 -04:00
Isaac Connor efec1e7d4f remove debug 2020-08-19 14:13:48 -04:00
Isaac Connor 177df46113 Apply min=0 to filterX and Y so that we don't get negative values 2020-08-19 14:11:16 -04:00
Isaac Connor 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
Isaac Connor 768c746944 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-18 09:00:20 -04:00
Isaac Connor 4c69d7b748
Merge pull request #3001 from connortechnology/update_users_controller
Update permissions checking when viewing/editing users.  Fixes #2982.…
2020-08-18 09:00:07 -04:00
Isaac Connor a92a16f13e Merge branch 'update_users_controller' into release-1.34 2020-08-17 19:33:31 -04:00
Isaac Connor 57b4d2b278 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-08-17 19:29:07 -04:00
Isaac Connor e5dda8d142 Include avutils/imgutils.h to support compile on libav-tools 2020-08-16 14:56:52 -04:00
Isaac Connor c87886f5a5 Fix v4l2 channel and palette dropdowns allowing the saving of local monitors. 2020-08-15 12:31:30 -04:00
Isaac Connor 19fff95079 Remove default from LabelFormat 2020-08-11 17:31:32 -04:00
Isaac Connor 56fbfa0dd2 Add db update to drop default value for LabelFormat. Fixes #2896 2020-08-11 14:14:16 -04:00
Isaac Connor 6918461c3e Bump version to 1.34.19 for release 2020-08-11 11:03:20 -04:00
Isaac Connor afae319c94 Fix MOCORD not going into ALARM state. 2020-08-11 11:02:26 -04:00
Isaac Connor 12dbd267bf Add devuan beowulf support 2020-08-11 09:21:48 -04:00
Isaac Connor 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
Isaac Connor bafffdb486 Test for configuration of ZM_PATH_SHUTDOWN and provide useul error message 2020-08-10 12:26:37 -04:00
Isaac Connor 1ea36e3ee6 populate ZM_PATH_SHUTDOWN 2020-08-10 12:26:26 -04:00
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
Isaac Connor a001c93321 fix zone editing globals and inputs being too big 2020-08-08 11:41:24 -04:00
Isaac Connor 8533ce7018 fix CSP on polygons 2020-08-08 11:38:54 -04:00
Isaac Connor eff96c5fa3 Only save the DiskSpace on completed events. Fixes #3007 2020-08-07 09:53:15 -04:00
Isaac Connor 6b9ffb505d Bump version to 1.34.18 for Rrelease 2020-08-06 10:38:39 -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 302189a65e Don't use camera->LineSize when allocating shared images. It doesn't work because other processes don't know about it. 2020-08-06 10:11:00 -04:00
Andrew Bauer 3ba8ad579e fix pod2man out-of-source builds 2020-08-04 21:18:37 -05:00
Isaac Connor be05040a47 fix rotated images 2020-07-30 19:50:25 -04: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
Isaac Connor 916d566390 bump version to 1.34.17 for release 2020-07-30 17:22:37 -04: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 05107bb2f7 Add debug of unused options 2020-07-30 15:16:31 -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
Isaac Connor 6a4ce29bce eslint fixes 2020-07-30 12:15:05 -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
Isaac Connor 8e37efaa7a handle when [fid] = 0; Fixes #2994 2020-07-29 18:50:14 -04:00