Commit Graph

18937 Commits

Author SHA1 Message Date
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
Isaac Connor cd36bd9bf5 Merge pull request #3266 from Carbenium/fill-out-of-bounds
Image: Remove std::vector out-of-bounds access when filling polygons
2021-05-30 10:55:22 -04:00
Isaac Connor 1219bd8d1e the filename is incorrect so the tmpfiles.d configuration is not being included 2021-05-30 10:54:59 -04:00
Isaac Connor cd16f3f8e4 Bump version for 1.36.2 2021-05-28 14:00:36 -04:00
Isaac Connor a4e4ebe3fd Restore api behaviour. Add zmu output to response 2021-05-28 12:29:02 -04:00
Isaac Connor 829708f8f2 Change SQL to add Controls for ONVIF camera, Foscam 9831W and 8918W to specify columns so that if other columns are present the sql still executes. Fixes #3260 2021-05-28 10:24:13 -04:00
Isaac Connor 225123dd11 Allow [] characters in url to work with ipv6. Fixes #3261 2021-05-26 18:50:26 -04:00
Isaac Connor 3b5de40d05 Merge pull request #3259 from gerazo/master
Updated Hungarian translation
2021-05-25 13:16:35 -04:00
Isaac Connor c7e9144124 Merge pull request #3257 from Carbenium/ffmpeg-stretch
FfmpegCamera/Videostore: Disable hwaccel for ffmpeg found in Debian Stretch
2021-05-25 13:16:12 -04:00
Isaac Connor 8d783d3cd5 Merge pull request #3254 from bestlong/add-lang
web ui add lang (Chinese Traditional)
2021-05-25 13:15:56 -04:00
Isaac Connor 80800785be Fix getting border width on firefox. Need to specify which border. Went a little further and split x and y axis borders in the maxfit2. Fixes #3249 2021-05-25 13:15:04 -04:00
Isaac Connor d59118fc47 Add redirect so that Yes I'd like to donate now goes to the zoneminder /donate website. This used to happen in javascript but got removed when it was turned into a modal. 2021-05-25 11:33:12 -04:00
Peter Keresztes Schmidt e659543d0a Logger: Fix DB log messages not being populated
We need to `resize` the buffer string since `reserve` does not guarantee that the buffer is
actually available.

Follow-up on 298415fff3
2021-05-25 11:29:32 -04:00
Isaac Connor 6a9ed9c457 Use data-onclick instead of data-on-click-this. 2021-05-25 11:22:43 -04:00
Isaac Connor f6fcc2144f jquery.js doesn't exist, so link jquery.min.js instead 2021-05-22 13:59:32 -04:00
Isaac Connor 4c99baf725 Use data-onclick instead of data-on-click-this. Load form by id instead of passed in element. Fixes #3250 2021-05-22 13:59:10 -04:00
Isaac Connor 1caeb67a3e fix behaviour of reverse and fast forward buttons. Fixes #3251 2021-05-22 13:39:42 -04:00
Isaac Connor e16d71b9c6 spacing, code style, code comments 2021-05-22 13:39:42 -04:00
Andrew Bauer 800a8ecc2e sync rpm specfile changelog with rpmfusion 2021-05-22 07:00:07 -05:00
Andrew Bauer cb0a421d25 use latest rtspserver commit 2021-05-21 15:10:42 -05:00
Isaac Connor 2afeaefec4 Set version to 1.36.1 for release 2021-05-21 10:46:56 -04:00
Isaac Connor d218d81f87 Merge branch 'fix_out_of_files_in_encoding' into release-1.36 2021-05-21 10:39:58 -04:00
Isaac Connor a0df6aacaf Spacing 2021-05-21 10:38:55 -04:00
Isaac Connor 4fcdeb7287 Fix alignment in get_out_frame. Fixes #3233. If width % 32 then we can't use the more efficient 32 aligned scaling. 2021-05-21 10:37:51 -04:00
Isaac Connor 797a4adf70 Merge branch 'master' into fix_out_of_files_in_encoding 2021-05-20 18:56:16 -04:00
Isaac Connor 3540101c68 change mem_file to std::string to resolve initialization problems 2021-05-20 18:55:29 -04:00
Isaac Connor dd99d9ff22 include memory to fix build on centos 7 2021-05-20 18:55:17 -04:00
Isaac Connor 294d29580e Fix initializers to compile on centos7 2021-05-20 18:55:07 -04:00
Isaac Connor f947c041df Fix status of delete button when archived. Change title to say that you can't delete due to archived 2021-05-20 18:54:37 -04:00