ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,961 Commits
33 Branches
93 Tags
172 MiB
Commit Graph

20961 Commits (702df653f9e60c66c650b28551803c67248646e2)

Author SHA1 Message Date
Jonathan Bennett 702df653f9
Fix typo in field name 2022-08-10 03:59:18 -05:00
Isaac Connor f5a6a0a5d9 Test for existence of monitors[i] before trying to kill it just to reduce javascript errors 2022-08-09 18:52:35 -04:00
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 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 84385442d7 Set button padding to 0 for ptz buttons 2022-08-04 09:22:30 -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
Isaac Connor 6e5b9b56ed Only load linked monitors if doing capture 2022-08-03 11:55:44 -04:00
Isaac Connor cf3c194e21 Handle when there are no servers and hence no defined ServerId in newMonitor 2022-08-03 11:55:44 -04:00
Robert Jacobson 77472492e2 Make zoom buttons work for Axis P5655-E 2022-08-03 09:57:57 -04:00
Isaac Connor b40423d720 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-08-02 20:57:48 -04:00
Isaac Connor 2fa90cff4d Use const or let instead of var 2022-08-02 20:47:47 -04:00
Isaac Connor 89631a8531 Fix spelling 2022-08-02 20:47:07 -04:00
Isaac Connor 79f2d1d20f If nothing selected, present a message about it. This shouldn't happen, but does 2022-08-02 20:46:33 -04:00
Isaac Connor c40cedc15c Simply code about zm_terminate, replace fixed 60 second max sleep time with ZM_WATCH_MAX_DELAY 2022-08-02 20:45:45 -04:00
Isaac Connor 6f02096098 Notify all packets when doing packetqueue:stop so prevent deadlock when waiting for decode 2022-08-02 20:44:45 -04:00
Isaac Connor 1d40279fcf Check heartbeat time for monitors that don't do decoding 2022-08-02 20:44:10 -04:00
Isaac Connor 42bb0c41a0 Rename zmc_heartbeat_time to just heartbeat_time 2022-08-02 20:43:49 -04:00
Isaac Connor baf65819cb add notify_all functions 2022-08-02 20:43:20 -04:00
Isaac Connor a03189046e Rename zmc_heartbeat_time to heartbeat_time. Set it during waiting for prime and capturing. 2022-08-02 17:54:27 -04:00
Isaac Connor 30271283ba Make CMD_LIST available to specific monitors as well as all monitors. 2022-08-02 14:19:57 -04:00
Isaac Connor a9cc417a8b Fix logic around warning about keyframe interval being larger than max image buffer count. 2022-08-02 13:02:12 -04:00