Commit Graph

19058 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt bc7079a0be utils/startpackpack: Add support for Debian Bullseye 2021-09-04 10:08:10 -04:00
gmanproxtreme 75b16c9084 Updated WEB_TITLE section from ToDo.
The Web_Title's use was unknown. I have seen the changed title appear on the login screen. Documentation updated to reflect this.
2021-09-04 10:04:53 -04:00
Peter Keresztes Schmidt 53cbe524c1 docs: Reference current 1.36 version in installation instructions 2021-09-04 10:04:33 -04:00
Isaac Connor b0df3fd2f6 Fix user summary, as there must be a space between -u and dbuser, etc 2021-09-04 10:02:43 -04:00
Isaac Connor 583c259951 Spacing 2021-09-04 10:02:16 -04:00
Isaac Connor 8da5a1d2c9 If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap 2021-09-04 10:00:55 -04:00
Isaac Connor 9ebff52c44 Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately 2021-09-04 10:00:42 -04:00
Isaac Connor e9dab48834 Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition. 2021-09-04 09:59:38 -04:00
Isaac Connor 4612f4ae75 add getMonitorStatuses function to return string values for status numbers 2021-09-04 09:57:56 -04:00
Isaac Connor f319d02373 Fix PTZ Diagonal cmds. Fixes #3300 2021-09-03 22:39:44 -04:00
Isaac Connor e529d8fcd1 add autoplay tag. Fixes #3343 2021-09-03 22:29:45 -04:00
Isaac Connor 55080da9dc Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time. 2021-09-03 22:29:16 -04:00
Isaac Connor be46b063c8 spacing 2021-09-03 22:28:59 -04:00
r01k 2d965e7d50 Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php. 2021-09-03 22:28:37 -04:00
Isaac Connor 4c213ab453 Only show thumbnail if Function is != None 2021-09-03 22:28:08 -04:00
Isaac Connor 706e2ff536 spacing. When the selected layout is not freeform, calculate the ratio of computed size to stream source size to calculate a value for scale. 2021-09-03 22:27:53 -04:00
Isaac Connor dab9bce8f4 spacing remove dead code 2021-09-03 22:27:26 -04:00
Isaac Connor 25f6935280 Allow snapshot downloading 2021-09-03 22:26:51 -04:00
Isaac Connor 4c261eb413 Use event->canView so that events in snapshots can be exported 2021-09-03 22:26:26 -04:00
Isaac Connor ca4ec91ef3 Move CSP stuff down to view parsing. ajax requests only output json, so CSP shouldn't be relevant. Only end output buffer if there is one. archive view for example clears all output buffers. 2021-09-03 22:26:09 -04:00
Isaac Connor 30aad6ab9a Spacing and quotes 2021-09-03 22:25:43 -04:00
Isaac Connor bed79039f3 implement Event->canView 2021-09-03 22:25:14 -04:00
Isaac Connor d884d86b38 Can export events if canView Snapshots. Event->canView will filter events that are not in a snapshot 2021-09-03 22:23:30 -04:00
Isaac Connor 391fc1fec8 Use canView.Snapshots for snapshot permissions instead of canView.Events 2021-09-03 22:23:09 -04:00
Isaac Connor a1fe4e2638 Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated. 2021-09-03 22:22:47 -04:00
Isaac Connor a2f3583481 turn Save, SaveAs and Execute into submit buttons. Put Id into the form action so that it shows up in the url bar. Disable putting the form contents into the url bar in parse_rows. 2021-09-03 22:22:16 -04:00
Isaac Connor 809183716a clean up code logic so that if we are executing an unchanged filter we don't do the unecessary save. 2021-09-03 22:21:40 -04:00
Isaac Connor 3ca920f1a9 spacing. Add defaults for AutoMoveTo and AutoCopyTo so that we don't get false changes. redirect is a global, so make it so. Re-null the Id of the filter object after temp execute so that we don't reference a no longer existing filter. 2021-09-03 22:21:21 -04:00
Isaac Connor 2e09334b9c Fix url to ajax endpoint for deleting snapshots. 2021-09-03 22:20:51 -04:00
Isaac Connor a69882ffaf Cleanup, split export and download functions in snapshot. 2021-09-03 22:20:27 -04:00
Isaac Connor b306f92116 event may have changed (have endtime set) between load and saving Archived bit. Lock the event which now also reloads it. 2021-09-03 22:19:57 -04:00
Isaac Connor ae1e3d88b2 When locking, use the results to reload the object fields fresh as they may have changed since the object was loaded 2021-09-03 22:19:39 -04:00
Isaac Connor cf87f2cc40 Snapshot exports are now flat, without frame images 2021-09-03 22:19:19 -04:00
Isaac Connor c089702fab Pass exportStructure around so that it can be used to put the right filename to the jpg in the html. Fix flat zips. Fix video files being included if exportMisc is true. 2021-09-03 22:19:02 -04:00
Isaac Connor 2c7af3886c Actually delete the snapshot record, not just the event connection 2021-09-03 22:18:38 -04:00
Isaac Connor 2f7c44dce2 Fix deleting snapshots 2021-09-03 22:18:24 -04:00
Isaac Connor ad9ce720fd Allow specifying export Structure to get a flat zip 2021-09-03 22:18:06 -04:00
Isaac Connor 50326cf80c zmu may still output results even if it encounters errors, so continue even if we have an error return status from zmu. 2021-09-03 22:17:15 -04:00
Isaac Connor c280279cf7 Continue to work even if opener isn't defined, which it isn't anymore because we got rid of popups. Fixes save button on monitorprobe. 2021-09-03 22:16:30 -04:00
Isaac Connor 6a6d6935e8 Merge script sections just to remove bytes per view. 2021-09-03 22:15:56 -04:00
Isaac Connor 814e8559aa output an error message image when we can't load a jpeg 2021-09-03 22:15:29 -04:00
Isaac Connor 8d5207636a Turn on export functionality for snapshots 2021-09-03 22:15:08 -04:00
Isaac Connor 2273deaf17 Support specifying the export filename by passing the export_root 2021-09-03 22:14:42 -04:00
Isaac Connor 06ff94de2f Fix styling of the shutdown button 2021-09-03 22:13:55 -04:00
Steven Gilvarry 59a03d6d59 Update Dark Skin to fix modal being light and some other issues
Fixed Modal style as per post to forums, then also fixed text area and select being white. Adjusted some other colours to work better. Console hover could be better still
2021-09-03 22:13:26 -04:00
Isaac Connor 17ec2f922e Remove some debug logging 2021-09-03 22:11:51 -04:00
Isaac Connor 6d9c582e13 Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal 2021-09-03 22:11:14 -04:00
Isaac Connor cb58b70078 Leave the zoneminder source dir during build-deps step so that we don't pollute it. Seems to be an issue with newer ubuntu builds. 2021-09-03 21:59:36 -04:00
Isaac Connor 431417ea8b Use old time code as this is 1.36 2021-09-03 12:19:53 -04:00
Isaac Connor e0e81a3769 Fix frame_count fps when paused 2021-09-03 11:39:34 -04:00