Commit Graph

9702 Commits

Author SHA1 Message Date
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
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
Simpler1
10f7e4320f fix(cookies): Use max-age instead of expires 2023-07-21 13:27:44 -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
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
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
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
c7259fdc14 Implement read locks when accessing jpgs. Implement locking on creating scaled jpegs. 2023-07-13 17:20:18 -04:00
Isaac Connor
d172d41638 Add Capturing=Always 2023-07-13 12:45:25 -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
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
e96d2a6acc No longer abort when sending a command... no streaming ajax should take any significant time. 2023-07-11 17:27:52 -04:00
Isaac Connor
4f80577d36 Add geolocation to event view 2023-07-10 13:45:12 -04:00
Isaac Connor
f96ac69033 Set thumbnail image source to stream immediately, then change the class for zoom. Increate timeout to 250 2023-07-09 12:05:18 -04:00
Isaac Connor
37b571a58a Handle no password specified and make testing for www-authenticate header non case sensitive 2023-07-05 15:51:16 -04:00
Isaac Connor
fd39c57038 Use sticky instead of absolute to fix zoomed thumbnails when scrolled 2023-06-28 14:51:32 -04:00
Isaac Connor
2862f47a8b Add standard divs and put canvas in the content div so scrolbars work 2023-06-28 14:49:31 -04:00
Isaac Connor
47ebf929cc Actualy populate Name, Email, Phone inputs 2023-06-27 11:55:21 -04:00
Isaac Connor
3714b38caa Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-06-27 11:47:03 -04:00
Isaac Connor
961f05b228 Don't show deleted monitors in group dropdowns 2023-06-27 10:45:13 -04:00
Isaac Connor
bc1214e8e5 Don't use empty because it tests for false, and 0 is false. Just check for empty string. Fixes #3732 2023-06-27 10:44:25 -04:00
Isaac Connor
93dc57401f Remove duplicated ExistsInFileSystem label 2023-06-26 10:34:19 -04:00
Isaac Connor
ccdbb8edf6 Improve Avigilon detection 2023-06-22 13:31:01 -04:00
Isaac Connor
139315776d Fix searching by monitor name 2023-06-22 13:13:19 -04:00
Isaac Connor
2f2c488e5a Merge pull request #3725 from Simpler1/patch-1
Fix(monitor.css): Narrow layout for pills-tab
2023-06-20 13:02:43 -04:00
Simpler1
fa68fc3894 Merge remote-tracking branch 'origin/patch-4' into patch-5 2023-06-19 11:36:39 -04:00
Simpler1
2d07098e1b Add Help text for OPTIONS_ALARMMAXFPS
Previously this was pointing to the same text as OPTIONS_MAXFPS.
2023-06-19 11:33:20 -04:00
Simpler1
40a4d5266e Add Help for OPTIONS_ALARMMAXFPS
Pulled text from ReadTheDocs.
2023-06-19 11:29:31 -04:00
Simpler1
80373f8f44 Fix(event): Consistent cookie timeframe
Sets cookie timeframe from one hour to two years (consistent with other cookie settings).
2023-06-14 19:23:14 -04:00
Simpler1
4c28b16c4b Remember Events table settings
Fixes #3671
2023-06-14 19:19:58 -04:00
Simpler1
ed1a4c249d Fix(monitor.css): Narrow layout for pills-tab
Fixes issue #3714
2023-06-14 19:13:42 -04:00
Isaac Connor
87fbc96609 Fix where error_log write to to include path 2023-06-09 19:37:47 -04:00
Isaac Connor
19128eee18 Do not allow directory names in ZM_LOG_DEBUG_FILE. Only log to ZM_LOG_DIR 2023-06-09 17:27:54 -04:00
Isaac Connor
8a00be8cc8 Load the ZM::Event using the Event Model data instead of loading by Id which goes back to db. 2023-06-09 10:53:10 -04:00
Isaac Connor
c811f1bc90 Load event using find_one which does caching. 2023-06-09 10:52:39 -04:00
Isaac Connor
2cb697f0e9 Debug alarm.jpg path when not found. Spacing. Remove unused Monitor variable 2023-06-09 10:40:34 -04:00
Isaac Connor
14eb38a00b add timeout value to debug, only send scale command if it is > 0 2023-06-08 10:30:01 -04:00
Isaac Connor
59ff7f3a31 Improve logged wrt insufficient permissions 2023-06-08 09:17:16 -04:00