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

21093 Commits (d9babda8adb2e2f28c2bac0b1fc4959c5bc6dd4a)

Author SHA1 Message Date
Isaac Connor 6e3c90261d zone_index would be left with a value if not found due to > instead of >=. Make the code a little better. 2022-06-26 18:40:46 -04:00
Isaac Connor 7cb08c0ffa Use ImportanceNumber instead of Importance because Importance is a string 2022-06-24 14:02:32 -04:00
Isaac Connor 2bfc85c816 Implement sub ImportanceNumber because Importance is a string but we want to do math on it 2022-06-24 14:01:42 -04:00
Isaac Connor e03d42103b Return true or false for open 2022-06-24 13:57:59 -04:00
Isaac Connor 0d48c92bc8 Calling zmMemInvalidate when detached should be fine, so turn Error into a debug 2022-06-24 13:57:10 -04:00
Isaac Connor 1ee5b1e57b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-23 17:02:20 -04:00
Isaac Connor 8fc957b7ae Merge branch 'master' of github.com:ConnorTechnology/zoneminder 2022-06-23 17:01:49 -04:00
Isaac Connor 009c1ab0fb We cannot break if there are packets in the queue. They must be deleted. 2022-06-23 16:57:08 -04:00
Isaac Connor ca8ba73ee9 Revert "When we wake from wait, we MUST clear the queue. If a packet snuck in, it MUSt be deleted. Otherwise it remains locked. THis could likely be improved with RAII skills." 
This reverts commit 80338467e7.
 2022-06-23 16:55:34 -04:00
Isaac Connor 00b284314f Revert "Redo the login in Event::Run. We cannot leave with packets still in the queue. I think." 
This reverts commit b6c5b47d66.
 2022-06-23 16:54:57 -04:00
Isaac Connor f78fb772ae Remove debug and dead code 2022-06-23 14:31:21 -04:00
Isaac Connor b6c5b47d66 Redo the login in Event::Run. We cannot leave with packets still in the queue. I think. 2022-06-23 14:31:08 -04:00
Isaac Connor 1af1b6a30b Center the up/down arrows in console Mark column 2022-06-23 14:24:08 -04:00
Isaac Connor 80338467e7 When we wake from wait, we MUST clear the queue. If a packet snuck in, it MUSt be deleted. Otherwise it remains locked. THis could likely be improved with RAII skills. 2022-06-22 21:00:06 -04:00
Isaac Connor e6eb94760c Use MaskedPath when logging failure to open 2022-06-22 11:13:43 -04:00
Isaac Connor 9d89fb6f0f Fix only one zone per monitor listed in Linked Monitors. Add type to zone name to indicated inactive 2022-06-22 10:03:57 -04:00
Andrew Bauer 1575dced0a additional runtime requires for rpm specfile 2022-06-21 15:13:51 -05:00
Isaac Connor e08b826843 Add support for lambda functions as post processing. Use the to replace StartDateTimeShort with StartDateTimeFormatted so that dates on viewed events use the specified formatting. 2022-06-21 11:42:18 -04:00
Isaac Connor 50df24f8da Return undef if we failed in Monitor::connect. Fixes zmtrigger endlessly complaining about a dead monitor after it has been disabled or moved to a different server 2022-06-21 10:46:57 -04:00
Isaac Connor 3f82513df9 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-20 18:52:40 -04:00
Isaac Connor 6dcbdcfdeb Merge branch 'reorder_queue' 2022-06-20 18:52:16 -04:00
Isaac Connor 9c9786de6e fix eslint 2022-06-20 17:12:15 -04:00
Isaac Connor 00b537d45e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-20 17:11:43 -04:00
Isaac Connor 70cfaaa43a Merge branch 'master' into reorder_queue 2022-06-20 17:07:34 -04:00
Isaac Connor 6f8240d57d Merge branch 'master' of github.com:ConnorTechnology/zoneminder 2022-06-20 17:07:14 -04:00
Isaac Connor 9e22852195 Put back setting height of viewer 2022-06-20 17:06:44 -04:00
Isaac Connor dd1fc87bc4
Merge pull request #3509 from ZoneMinder/dependabot/github_actions/actions/dependency-review-action-2 
Bump actions/dependency-review-action from 1 to 2
 2022-06-20 15:14:52 -04:00
Isaac Connor 574f9fe628
Merge pull request #108 from connortechnology/dependabot/github_actions/actions/dependency-review-action-2 
Bump actions/dependency-review-action from 1 to 2
 2022-06-20 15:14:32 -04:00
dependabot[bot] ff908953b4
Bump actions/dependency-review-action from 1 to 2 
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 1 to 2.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](https://github.com/actions/dependency-review-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-20 18:39:22 +00:00
dependabot[bot] 1a4c506306
Bump actions/dependency-review-action from 1 to 2 
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 1 to 2.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](https://github.com/actions/dependency-review-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-06-20 17:30:51 +00:00
Isaac Connor d5f6e753b2 Merge branch 'master' into reorder_queue 2022-06-17 17:25:29 -04:00
Isaac Connor a515c3a899 clean out the if0'd out reorder code 2022-06-17 17:25:08 -04:00
Isaac Connor aeca49d427 Stop the packetque first before stopping threads that may be in it. Only call clearPackets for video packets 2022-06-17 17:24:14 -04:00
Isaac Connor 3c8b590925 Make DecoderThread::Stop wait for the thread to stop 2022-06-17 17:23:33 -04:00
Isaac Connor ed66f1b1a8 Make AnalysisThread::Stop wait for the thread to stop 2022-06-17 17:23:25 -04:00
Isaac Connor 4326b0d359 Merge branch 'master' into reorder_queue 2022-06-17 16:34:44 -04:00
Isaac Connor bd711c5230 Sleep if Decode fails instead of spinning 2022-06-17 16:32:05 -04:00
Isaac Connor 3d9e8ae83c Add extra debug to figure out hangs on close 2022-06-17 16:31:33 -04:00
Isaac Connor 0ae74aaf6c Merge branch 'master' into reorder_queue 2022-06-17 15:14:58 -04:00
Isaac Connor 71ad8a2c98 Update handleClick to use consts 2022-06-17 15:14:41 -04:00
Isaac Connor dbedfb3303 Default to using height: auto on image stream img. Default to 100% for progress bar. Use clickZoomOut on zoomout button 2022-06-17 15:14:26 -04:00
Isaac Connor 290eca12fb implement CMD_ZOOMSTOP 2022-06-17 15:13:30 -04:00
Isaac Connor 95b0f017af Fix sizes of download and zones buttons. Set videoFeed img tag to 100% 2022-06-17 15:13:17 -04:00
Isaac Connor a4621b3ade Zoom in/out by increments of 10. Implement handling of ZOOMSTOP command 2022-06-17 15:12:47 -04:00
Isaac Connor b0717797b1 Use separate function for clicking on zoomout button. If CTRL is pressed, zoom out fully using new ZOOMSTOP command. Replace zoomin handleClick code with version from live watch view which fixes it. 2022-06-17 15:12:22 -04:00
Isaac Connor 4dbe66779a Implement CMD_ZOOMSTOP 2022-06-17 15:11:27 -04:00
Isaac Connor 4fc4ffeec4 Merge branch 'master' into reorder_queue 2022-06-17 13:27:39 -04:00
Isaac Connor cfed17051b Fix ram leak due to logic inversion 2022-06-17 13:27:07 -04:00
Isaac Connor a7bed00275 Introduce a quick function to return the amount of ram a zmpacket is using 2022-06-17 13:26:49 -04:00
Isaac Connor dfc4acd69f Escape single quotes in config values. Fixes #3508. 2022-06-17 10:53:42 -04:00