ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,205 Commits
32 Branches
93 Tags
163 MiB
Commit Graph

21205 Commits (e2bd72b6a0c93ac4f4bd28fbfc156b4d4ae05d7b)

Author SHA1 Message Date
Isaac Connor d1222d2fa7
Merge pull request #3572 from jp-bennett/master 
Adds Janus Restream and Profile Override
 2022-08-09 18:15:39 -04:00
Isaac Connor 091718da82
Merge pull request #3571 from ZoneMinder/update-RTSP-doc 
Update ZM_MIN_RTSP_PORT description
 2022-08-09 18:12:56 -04:00
Jonathan Bennett 2c48d83860 Properly hide Janus options when Janus is disabled for a given monitor. 2022-08-09 15:17:40 -05:00
Jonathan Bennett ebd4a30666
Update ZM_MIN_RTSP_PORT description 2022-08-09 15:04:09 -05:00
Isaac Connor 165ccf5820 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-09 15:48:06 -04:00
Isaac Connor 3034636501 Provide support for libaom-av1 2022-08-09 15:47:39 -04:00
Isaac Connor a83ed1dbf5 Don't use array_keys_first as it doesn't exist in php < 7.3. 2022-08-09 15:01:25 -04:00
Isaac Connor e5c871ab7e Fix eslint 2022-08-09 14:35:24 -04:00
Isaac Connor 1cc83a3bbb
Merge pull request #3566 from ovargasp/zmAlarmServer 
Adds Alarm Server for NETSurveillance WEB IP cameras
 2022-08-09 14:31:49 -04:00
Isaac Connor f09355f2ff If monitor has Control configured and control supports rebooting, reboot camera on fail to capture. 2022-08-09 13:41:43 -04:00
Isaac Connor 6c0e34e84b Fix loading info from ControlAddress. Fix path used when testing auth. 2022-08-09 13:41:14 -04:00
Jonathan Bennett d41792ae00 Adds Janus options Profile-ID Override and Use RTSP Restream to work around camera issues 2022-08-09 00:54:41 -05:00
Isaac Connor eb9ccf41f2 keyframe_interval gets reset so can give erroneous logs. Use a second variable to start the actual found keyframe interval. Use a const ref to prevent copying in notify_all 2022-08-08 13:58:22 -04:00
Isaac Connor d1b5451c7e Ignore errors decoding log message 2022-08-08 13:57:09 -04:00
Isaac Connor 294fd9b3c7 Always populate add MonitorLink dropdown. 2022-08-08 10:05:15 -04:00
Isaac Connor f794077d71 Only add or operator if monitorlinks has content 2022-08-08 10:02:20 -04:00
Ratchanan Srirattanamet d0a7b51283 db: start the processing thread after all fields are initialized 
Initializing `zmDbQueue::mThread` with initializer list makes the thread
start in the middle of object initialization. This means `zmDbQueue::
process()` could start and reach mCondition.wait(lock); before `std::
wait_condition`'s constructor, which causes deadlock.

To make sure thread won't start before object initialize, move
`mThread`'s initialization to constructor's body.

This _at last_ solves the random zmu deadlock issue that has plagued my
setup for almost a year.
 2022-08-08 03:13:08 +07:00
Isaac Connor cad80eb37d Revert "Fix memleak due to not deleting okpt in VideoStore destructor" 
This reverts commit 896a05c65d.
 2022-08-06 09:54:23 -04:00
Isaac Connor 896a05c65d Fix memleak due to not deleting okpt in VideoStore destructor 2022-08-06 09:47:25 -04:00
ovargasp 6753a04e91 Latest version of zmAlarmServer 2022-08-05 16:46:11 -06:00
ovargasp 8978ebcc3b Adds Alarm Server for NETSurveillance WEB IP cameras 2022-08-05 15:59:42 -06:00
Isaac Connor 5405ebdaa8 Replace the Event index with an eventId,ZoneId index, which mysql will actually use to speed up the subquery for AlarmedZone 2022-08-05 10:53:25 -04:00
Isaac Connor 9b287d56a3
Merge pull request #3563 from ovargasp/Date-Format 
Date format
 2022-08-05 09:31:20 -04:00
Isaac Connor 35ed770de7
Merge pull request #3562 from ovargasp/master 
Modify zmu
 2022-08-05 09:29:43 -04:00
ovargasp b01c75ab76 Modify config.php.in 
Modifies config.php to use ZM_TIMEZONE if defined by user
 2022-08-05 06:40:23 -06:00
ovargasp a0f6ba1455 Modify zmu 
Adds option to get monitor triggered status.
 2022-08-04 20:31:12 -06:00
Isaac Connor 409dac7051
Merge pull request #3557 from teridon/axiszoomfix 
Make proportional zoom and movement work for AxisV2 API
 2022-08-04 12:44:46 -04:00
Robert Jacobson 3190051287 Make proportional and continuous movement actually work 2022-08-04 12:40:31 -04:00
Isaac Connor 71325fdd5c Setting padding to 0 for ptz buttons 2022-08-04 12:13:53 -04:00
Isaac Connor 6bc0ec6aab Add Report ORM 2022-08-04 09:35:25 -04:00
Isaac Connor b4000ef0c7 Add Reports table creation 2022-08-04 09:34:06 -04:00
Isaac Connor 84385442d7 Set button padding to 0 for ptz buttons 2022-08-04 09:22:30 -04:00
Isaac Connor 715694138c More reports rough in, css and js 2022-08-04 09:12:45 -04:00
Isaac Connor ad764ca0bb rough in major actions for reports 2022-08-04 09:11:24 -04:00
Isaac Connor ce1f3a8ac6 Further roughing in of reports listing 2022-08-04 09:11:03 -04:00
Isaac Connor d9b077d792 rough in editing and timeline graphing 2022-08-04 09:08:11 -04:00
Isaac Connor f6a7698e43 Add Reports menu option 2022-08-04 09:07:46 -04:00
Isaac Connor ca1ad2e2e4 Fix use of filter instead of this 2022-08-04 09:07:33 -04:00
Isaac Connor 23c2546cb6 Record an Amcrest mac vendor but don't implement probe yet 2022-08-03 18:01:47 -04:00
Isaac Connor dc52105c8f Allow to link to ourself 2022-08-03 14:44:44 -04:00
Isaac Connor 4587d0576d Remove unused code 2022-08-03 14:30:18 -04:00
Isaac Connor 6c292dd0e3 Improve adding parenthesis, rename function to snake case 2022-08-03 14:30:18 -04:00
Isaac Connor e27e1c0991 Add backtrace to invalid value for width 2022-08-03 14:30:18 -04:00
Isaac Connor a00d332ade Rough in reports views and add Chart.min.js 2022-08-03 14:29:53 -04:00
Isaac Connor eb4b097560 fix eslint 2022-08-03 13:52:01 -04:00
Isaac Connor 19952b25c1 Remove unused code 2022-08-03 13:40:08 -04:00
Isaac Connor 2e5d7ee167 Improve adding parenthesis, rename function to snake case 2022-08-03 13:38:56 -04:00
Isaac Connor f4b8066d00 Add backtrace to invalid value for width 2022-08-03 12:28:39 -04:00
Isaac Connor 6f146d1af0 Add MonitorLinkExpression.js 2022-08-03 12:14:51 -04:00
Isaac Connor 45697c7da9 Merge branch 'master' into reports 2022-08-03 11:57:07 -04:00