Commit Graph

18965 Commits

Author SHA1 Message Date
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
Isaac Connor 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
Isaac Connor 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
Isaac Connor c00651e826 Spacing 2021-09-03 11:34:32 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Isaac Connor 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
Kendric Evans 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
Isaac Connor cb3dd78c61 Fix Archive FTP .zip filename not including monitor name. Fixes #3304 2021-06-23 10:27:23 -04:00
Isaac Connor ef92f1ea16 Bump version to 1.36.5 2021-06-22 14:35:13 -04:00
Isaac Connor 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
Andrew Bauer b95cf72dc8 comment to rpm changelog regarding cmake 2021-06-18 15:30:19 -05:00
Andrew Bauer 172a0555ed only refer to cmake3 when building on el7 2021-06-18 15:30:10 -05:00
Andrew Bauer a423f2620e Allow cakephp cache engine to be set during build 2021-06-18 15:29:54 -05:00
Isaac Connor 0ca10fe7cd Add special handling of sorting by EndTime because it can be NULL. Fixes #3298 2021-06-15 10:34:15 -04:00
Isaac Connor f6c29b51ef Fix EndTime case handling. 2021-06-14 11:58:06 -04:00
Isaac Connor db0f9911ae merge fixes from #3295. Fixes #3295. 2021-06-14 09:55:43 -04:00
Isaac Connor bb67c27d3b It is okay to call daemonControl with function==None for command == stop. All others give a warning. Fixes monitors on other servers not stopping when set to None. 2021-06-12 12:22:42 -04:00
Isaac Connor 3141ec32fe Add a limit of 1000 when pulling sessions. Sessions table can contain hundreds of thousands of lines all relatively useless. Modals need to pop up fast. 2021-06-12 11:58:18 -04:00
Isaac Connor b634338398 Bump version for 1.36.4 2021-06-08 16:00:20 -04:00
Isaac Connor 2288d32928 Use getStat instead of other jquery code to update the event data. Don't refresh before rename ajax finishes. Deprecate the n/a handling in getStat. Not sure why it's needed. Sync update eventData with what is returned by ajax status call. Fixes #3265 2021-06-08 15:58:17 -04:00
Isaac Connor 131e57a99e StartTimeShort should be StartDateTimeShort. Leave StartTimeShort for backwards compatibility. Add Storage, DiskSpace in status=>event 2021-06-08 15:54:14 -04:00
Isaac Connor 16295598dc spacing 2021-06-08 15:53:35 -04:00
Isaac Connor 9dd960beac Actually close the camera in localcamera::Close 2021-06-08 14:09:33 -04:00
Isaac Connor 1a6dc18a09 simplify test for being decoded. timestamping needs to be done as well 2021-06-08 14:05:23 -04:00
Isaac Connor 25bce3b8ca Adjust debug logging 2021-06-08 14:04:44 -04:00
Isaac Connor 85b35cf82c Use new get_packet_and_increment_it in decoder. Adjust some debugging levels 2021-06-08 14:04:35 -04:00
Isaac Connor a903ab5d09 Introduce get_packet_and_increase_it just so we can lose an extra grab lock and function calls, etc. In queuePacket, if the queue is full, WAIT instead of failing to queue. 2021-06-08 14:03:37 -04:00
Isaac Connor 61de5eaae5 More debugging around clearQueue. return early if deleting 2021-06-08 14:00:27 -04:00
Isaac Connor a676f7c407 SHould reset state as well as shared_data->state 2021-06-08 13:56:03 -04:00
Isaac Connor eda96d24e0 fix crash when in alert state with no event 2021-06-08 13:55:47 -04:00
Isaac Connor 13da1aca14 Remove 25x and options. Browsers do not support them. Add 16x which is the max. Fixes #3284 2021-06-08 13:37:40 -04:00
Xulunix a5341beaa5 Fixed bug in onvifprobe
The arguments for "/usr/bin/zmonvif-probe.pl" was always `probe 1.1,1.2 1` with the last argument always being `1` instead of the network interface name selected in the menu.
This change fixes this issue by using the selected interface name instead of the boolean return value of the `isset()` function.
2021-06-08 13:12:35 -04:00
Isaac Connor 4f3552a3e9 fix missing namespace on warning 2021-06-08 13:11:40 -04:00
Isaac Connor 959107f318 Default to UTC when no timezone set so that montagereview continues working. Fixes #3274 2021-06-08 13:11:06 -04:00
Isaac Connor 74b48c9f21 Fix samsite support for php <= 7.2 2021-06-08 13:09:43 -04:00
Isaac Connor f85efc17b4 Add samesite when setting cookie for skin and css 2021-06-08 13:09:30 -04:00
Isaac Connor be5c6371bb zmstats.pl: add use warnings. Fix log deletion only ever deleting 100 when it should delete more in a loop. Add deleting more than 100 sessions. Fix loop not terminating on Ctrl-C 2021-06-08 13:01:30 -04:00
Isaac Connor 9f6eec792c Fix Crud fork 2021-06-08 13:01:09 -04:00
Isaac Connor 0e598f67c9 Bump version to 1.36.3 for release 2021-05-30 18:49:09 -04:00
Isaac Connor 5bdbb25efb Don't print out buffer since it isn't zero terminated 2021-05-30 18:31:57 -04:00
Isaac Connor f723b39cf6 Apply height css to limit height of logout modal and apply overflow:auto to add a scrollbar if needed so that we don't have to scroll to logout. 2021-05-30 18:31:26 -04:00