ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
22,545 Commits
33 Branches
94 Tags
174 MiB
Commit Graph

22545 Commits (more_gps)

Author SHA1 Message Date
Isaac Connor c922629729 Merge branch 'more_gps' of github.com:ZoneMinder/zoneminder into more_gps 2023-07-19 16:30:24 -04:00
Isaac Connor 51867a42f6 Merge stuff from fleet 2023-07-19 16:28:18 -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 83df25ee92 Define and allocate, and assign image_pixelformats in shmem 2023-07-18 20:31:00 -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
Isaac Connor 3e3d628fa1 Sync up missing fields in Monitor class. Add code for Manufacturer and Model 2023-07-11 17:27:08 -04:00
Isaac Connor efb27298c1 Rough in classes for Manufacturer and Model 2023-07-11 17:26:49 -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 93031e86d8 Add latitude and longitude to shmem 2023-07-09 12:03:51 -04:00
Isaac Connor 3cefa4cde4 Add Latitude and Longitude to shmem and accessors to monitor 2023-07-09 12:02:33 -04:00
Isaac Connor 87fafa43a8 Add storing Latitude&Longitude in the event record. 2023-07-09 12:02:07 -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 ddec9bbd39
Merge pull request #3735 from criadoperez/fix/criadoperez 
fix: messages
 2023-07-04 21:50:34 -04:00
Alejandro Criado-Pérez 871bf1772f
fix: messages 2023-07-05 01:03:48 +02: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 24eecfeddb Put back support for ffmpeg < 5 2023-06-27 15:16:00 -04:00
Isaac Connor 2f38a6a2c4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-06-27 15:06:51 -04:00
Isaac Connor df657db65c Add bookwork support 2023-06-27 15:06:42 -04:00
iconnor 38d0cf46fb Merge branch 'fix_ffmpeg5_deprecations' 2023-06-27 14:57:29 -04:00
iconnor 62789a83ab Implement more fixes for ffmpeg5 channel deprecations. 2023-06-27 13:20:19 -04:00
Isaac Connor 47ebf929cc Actualy populate Name, Email, Phone inputs 2023-06-27 11:55:21 -04:00