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
dab9bce8f4
spacing remove dead code
2021-09-03 22:27:26 -04:00
25f6935280
Allow snapshot downloading
2021-09-03 22:26:51 -04:00
4c261eb413
Use event->canView so that events in snapshots can be exported
2021-09-03 22:26:26 -04:00
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
30aad6ab9a
Spacing and quotes
2021-09-03 22:25:43 -04:00
bed79039f3
implement Event->canView
2021-09-03 22:25:14 -04:00
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
391fc1fec8
Use canView.Snapshots for snapshot permissions instead of canView.Events
2021-09-03 22:23:09 -04:00
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
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
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
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
2e09334b9c
Fix url to ajax endpoint for deleting snapshots.
2021-09-03 22:20:51 -04:00
a69882ffaf
Cleanup, split export and download functions in snapshot.
2021-09-03 22:20:27 -04:00
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
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
cf87f2cc40
Snapshot exports are now flat, without frame images
2021-09-03 22:19:19 -04:00
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
2c7af3886c
Actually delete the snapshot record, not just the event connection
2021-09-03 22:18:38 -04:00
2f7c44dce2
Fix deleting snapshots
2021-09-03 22:18:24 -04:00
ad9ce720fd
Allow specifying export Structure to get a flat zip
2021-09-03 22:18:06 -04:00
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
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
6a6d6935e8
Merge script sections just to remove bytes per view.
2021-09-03 22:15:56 -04:00
814e8559aa
output an error message image when we can't load a jpeg
2021-09-03 22:15:29 -04:00
8d5207636a
Turn on export functionality for snapshots
2021-09-03 22:15:08 -04:00
2273deaf17
Support specifying the export filename by passing the export_root
2021-09-03 22:14:42 -04:00
06ff94de2f
Fix styling of the shutdown button
2021-09-03 22:13:55 -04:00
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
17ec2f922e
Remove some debug logging
2021-09-03 22:11:51 -04:00
6d9c582e13
Merge an old stash allowing passing an alternate buttonconfig parameter to show/get Modal
2021-09-03 22:11:14 -04:00
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
431417ea8b
Use old time code as this is 1.36
2021-09-03 12:19:53 -04:00
e0e81a3769
Fix frame_count fps when paused
2021-09-03 11:39:34 -04:00
94662dc170
Fix viewing fps display by keeping track of last update time, last frame count and actually calculate it based on frames sent over a period of time.
2021-09-03 11:38:09 -04:00
132fc84c31
Spacing and fix the bogus setting shared_data->valid to false on disconnect. Other processes call disconnect. Only the capturing thread should set it to false.
2021-09-03 11:35:54 -04:00
c00651e826
Spacing
2021-09-03 11:34:32 -04:00
ea83e8c3b1
Add libjwt-dev as a build dependency. libjwt-gnutls-dev doesn't exist in bionic anymore.
2021-08-09 10:23:02 -04:00
3e59ad9cb4
Test for existence of file before adding it to zip. Apparently our glob can return the snapshot.jpg string even if it doesn't exist. This is a workaround to Archive::Zip not testing for failure and crashing. Fixes #3313
2021-07-08 11:06:20 -04:00
c06cda6a65
Handle the case when the monitor doesn't exist more gracefully and not crash. Fixes #3316
2021-07-08 10:06:49 -04:00
0b76892ddf
Merge pull request #3307 from pliablepixels/optimize-event-api
...
API: allow option to not load the frames DB table
2021-07-05 12:49:58 -04:00
95263d148d
Rename zm_update-1.35.29.sql zm_update-1.36.6.sql so that it gets picked up.
2021-07-05 10:35:26 -04:00
271c59c24f
Updating the size of the Longitude field
...
To address https://github.com/ZoneMinder/zoneminder/issues/3311
2021-07-05 10:34:24 -04:00
cb3dd78c61
Fix Archive FTP .zip filename not including monitor name. Fixes #3304
2021-06-23 10:27:23 -04:00
ef92f1ea16
Bump version to 1.36.5
2021-06-22 14:35:13 -04:00
610fdd3129
Remove the code to do adaptive skipping. We should never sleep when doing Analysis unless an error occurred.
2021-06-22 14:34:28 -04:00
b95cf72dc8
comment to rpm changelog regarding cmake
2021-06-18 15:30:19 -05:00
172a0555ed
only refer to cmake3 when building on el7
2021-06-18 15:30:10 -05:00
a423f2620e
Allow cakephp cache engine to be set during build
2021-06-18 15:29:54 -05:00
Isaac Connor
Steven Gilvarry
Isaac Connor
Isaac Connor
Kendric Evans
Andrew Bauer