Commit Graph

22563 Commits

Author SHA1 Message Date
Isaac Connor
b360e092d4 Add AMCREST to logs relating to Amcrest ONVIF support to ease debugging 2023-07-24 17:45:36 -04:00
Isaac Connor
ca25f70fee Merge pull request #3747 from Simpler1/patch-5
Event table data should be aligned with column headers
2023-07-24 15:17:33 -04:00
Simpler1
8c49d911a0 Event table data should be aligned with column headers
This is more noticeable when some columns of the events table are toggled off, but the column headers were centered and the data in columns were left justified.  This made it difficult to read which column went to which data.

This change centers both the column headers and the data in the columns so that they line up.
2023-07-24 15:01:12 -04:00
Isaac Connor
add08aeb56 Add 5MP resolution 2023-07-21 14:30:10 -07:00
Isaac Connor
2fb0b4476b add mac to probe results 2023-07-21 14:26:56 -07:00
Isaac Connor
c0b5bbf8cc Rough in Hanwha support. Fix results getting overwritten 2023-07-21 14:26:39 -07:00
Isaac Connor
185f8a8d5f Add another Zmcreest mac 2023-07-21 14:25:57 -07:00
Isaac Connor
701c1fc0b6 Merge pull request #3745 from Simpler1/patch-1
fix(event): Honor the Alt key with left/right arrow
2023-07-21 15:28:09 -04:00
Isaac Connor
01257d2ca1 Output debug the pixformat of the shm image 2023-07-21 15:09:51 -04:00
Isaac Connor
2e4db107a6 When doing detection on y-channel, use y-image when creating analsysis image, and scale the y-channel image to what is expected for monitor dimensions when dimensions don't match capture. 2023-07-21 15:09:32 -04:00
Isaac Connor
b8c43c42d1 Change camera_width and height to signed... just so we don't have to cast when comparing to avframe->width and height 2023-07-21 15:08:35 -04:00
Simpler1
c949b9e2d6 fix(event): Honor the Alt key with left/right arrow
Fixes a race condition when using Alt-LeftArrow to go back to the previous page (standard browser behavior).

Sometimes it would go the previous event and sometimes it would go to the previous page.  Now it will consistently go to the previous page when the alt key is pressed with the left arrow.
2023-07-21 15:07:22 -04:00
Isaac Connor
a62b32f2e4 Include fifo name in debug 2023-07-21 14:10:46 -04:00
Isaac Connor
328f454248 Define and allocate, and assign image_pixelformats in shmem 2023-07-21 14:08:25 -04:00
Isaac Connor
05beec58e7 Merge pull request #3744 from Simpler1/master
chore(): Update .gitignore to remove node_modules
2023-07-21 13:48:01 -04:00
Isaac Connor
5fd544b1b0 Merge pull request #3743 from Simpler1/master
fix(cookies): Use max-age instead of expires
2023-07-21 13:34:34 -04:00
Simpler1
5e90f05c7c chore(): Update .gitignore to remove node_modules 2023-07-21 13:34:31 -04:00
Simpler1
10f7e4320f fix(cookies): Use max-age instead of expires 2023-07-21 13:27:44 -04:00
Isaac Connor
164e1f6730 Merge pull request #3742 from Simpler1/master
Set default cookie time to Jan 2038
2023-07-21 11:48:39 -04:00
Simpler1
ef68943b7c chore(): Set default cookie time to Jan 2038 2023-07-21 11:07:11 -04:00
Isaac Connor
6cb4f0a4f6 Fix logic on filtering monitorNames 2023-07-20 16:44:23 -04:00
Isaac Connor
75322142a4 Remove deprecated MonitorsIds. Replace it's use with looking for edit permission per monitor 2023-07-19 12:39:32 -04:00
Isaac Connor
33d9a974d5 white space 2023-07-19 12:38:32 -04:00
Isaac Connor
f4d3b979f4 Implement automatic setting of redorder_queue_size in videostore by implementing has_out_of_order_packets and get_max_keyframe_interval in the monitor object. 2023-07-19 12:38:11 -04:00
Isaac Connor
cb7d954a87 Fix warning when creating new user 2023-07-17 17:29:16 -04:00
Isaac Connor
6dbdd2120d Cleanup mid before use. Mostly to quiet snyk 2023-07-17 17:02:32 -04:00
Isaac Connor
ef29805a4d Test for word auto in decodername and don't do lookup for it 2023-07-17 17:01:39 -04:00
Isaac Connor
f46ef094dc Merge envserv:sandbox/ZoneMinder 2023-07-17 15:37:12 -04:00
IPC
65d37e7a36 Rough in a Grandstream detector 2023-07-17 14:36:28 -05:00
Isaac Connor
6426ea882a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-07-17 13:46:59 -04:00
Isaac Connor
fa266c6578 Reread config files and reread db config when given HUP 2023-07-17 13:46:47 -04:00
Isaac Connor
64057eec95 ROugh in Foscam and DLink detections 2023-07-15 10:29:54 -04:00
Isaac Connor
cae8fda326 Remove debug 2023-07-15 10:29:38 -04:00
Isaac Connor
761ce43796 Turn down debug on ondemand monitors 2023-07-15 10:29:27 -04:00
Isaac Connor
55f1e560c6 Add a mac for Foscam 2023-07-15 10:29:06 -04:00
Isaac Connor
c7259fdc14 Implement read locks when accessing jpgs. Implement locking on creating scaled jpegs. 2023-07-13 17:20:18 -04:00
Isaac Connor
15d9ec32de Add advisory locking around image writing. So that someone can potentially wait for the image to be fully written to. Hopefully will resolve issues with zmes and incomplete images 2023-07-13 14:25:56 -04:00
Isaac Connor
b002ae18b5 Use syntax that works on mysql <8 2023-07-13 13:19:07 -04:00
Isaac Connor
d172d41638 Add Capturing=Always 2023-07-13 12:45:25 -04:00
Isaac Connor
bdb0768dfe Bump to 1.37.41 to get a db update to correct the case of ONVIF_Alarm_Text 2023-07-12 17:48:20 -04:00
Isaac Connor
40516598fa Fix errant ` 2023-07-12 17:45:33 -04:00
Isaac Connor
b21b58c5ba Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-07-12 17:09:51 -04:00
Isaac Connor
752faf5899 Add ue strict, some speed control functions and fixes for use strict 2023-07-12 17:08:44 -04:00
Isaac Connor
e13a42aa46 Fix not saving Manufacturer and Model. Have to unset the text input if the ddm is populated 2023-07-12 14:30:49 -04:00
Isaac Connor
5d21a19231 Merge pull request #3726 from Simpler1/patch-2
Remember Events table settings
2023-07-12 10:34:13 -04:00
Isaac Connor
5a8330ac98 Merge pull request #3727 from Simpler1/patch-3
Fix(event): Consistent cookie timeframe
2023-07-12 10:33:18 -04:00
Isaac Connor
566e4421c8 Merge pull request #3740 from Simpler1/patch-1
fix(events): Dark background for table while loading
2023-07-12 10:32:31 -04:00
Simpler1
87e493376f fix(events): Dark background for table while loading
When using the dark theme css, as the events table is loaded, the background is a dark grey instead of white.

Previously, the "loading" background color was white which was very jarring for the user as the screen flashes from dark grey to white and then back to dark grey.
2023-07-12 10:28:59 -04:00
Isaac Connor
37c39386ee Correct casing of ONVIF_Alarm_Text 2023-07-11 18:24:58 -04:00
Isaac Connor
e96d2a6acc No longer abort when sending a command... no streaming ajax should take any significant time. 2023-07-11 17:27:52 -04:00