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

22716 Commits (openbsd)

Author SHA1 Message Date
Charlie Root 41dc7c8f4e Fixes to not log errors when there are no monitors to display in watch. 2023-09-13 11:19:16 -07:00
Charlie Root e11b700fbd Add Id as a protected member, only lookup monitor status if Id has a value 2023-09-13 11:18:50 -07:00
Charlie Root 6754fcb208 Make Filter properties protected 2023-09-13 11:18:28 -07:00
Charlie Root 1c3206b781 Merge branch 'master' into openbsd 2023-09-13 10:15:06 -07:00
Charlie Root fccebee056 Add -a to arp, add ZM_PATH_OUI for path to ieee-oui.txt 2023-09-13 10:14:49 -07:00
Charlie Root c4302c27ac Add code to test for existence of ip and support ifconfig 2023-09-13 10:14:21 -07:00
Isaac Connor a58949ab32 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-13 13:10:37 -04:00
Isaac Connor d9bf168066 Merge ../ZoneMinder.connortechnology 2023-09-13 13:10:14 -04:00
Isaac Connor c6a7fe949a Use different syntax for property access 2023-09-13 13:10:01 -04:00
Isaac Connor d7090ce84a Define properties 2023-09-13 13:08:12 -04:00
Isaac Connor 3767d815a5 Use different syntax for assigning object properties 2023-09-13 13:05:57 -04:00
Isaac Connor ef402e7b99 Define tablename member 2023-09-13 13:05:39 -04:00
Isaac Connor 46ac2dba2f Define tablename member 2023-09-13 13:05:25 -04:00
Isaac Connor 6a87f56ac2 Never display errors 2023-09-13 13:04:16 -04:00
Isaac Connor 7eb601ef4d Restore audio recording 2023-09-13 10:47:45 -04:00
Isaac Connor de8f387207 Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj 2023-09-13 10:12:04 -04:00
Isaac Connor 22d911940f Remove deprecated reconnect setting for mysql 2023-09-12 15:10:34 -04:00
Isaac Connor e353523073 Fix int()=>(int) causing events to not load 2023-09-12 09:07:46 -04:00
Charlie Root da213d8532 Merge branch 'master' into openbsd 2023-09-11 13:42:43 -07:00
Charlie Root 50059e5842 Only show ram info if proc exists. 2023-09-11 13:42:22 -07:00
Isaac Connor b7ed7a4bd8 in detaintPath also strip :// because php:// is a way to inject code 2023-09-11 12:34:31 -04:00
Isaac Connor a194fe81d3 Only allow Events Columns for sort. Fixes GHSA-2qp3-fwpv-mc96. Fixes GHSA-9cmr-7437-v9fj 2023-09-11 11:29:54 -04:00
Isaac Connor 09081be010 Fix again the infinite loop in counting keyframes 2023-09-11 11:29:54 -04:00
Isaac Connor 3146c30543
Merge pull request #3765 from d-bum/3764-improve-ffmpeg-camera-init 
Fix #3764 - improve ffmpeg camera init
 2023-09-09 12:57:26 -04:00
David Schmidt 5bfa28d172 Use unique_ptr instread of local scope object pointer for second input 2023-09-09 18:51:54 +02:00
David Schmidt 320864d252 Implement get video and audio codec context 2023-09-09 18:51:36 +02:00
Isaac Connor a13c9c06f2 Handle when filter limit is '0' 2023-09-09 12:38:47 -04:00
Isaac Connor b1cdf9905c Make notes clickable to bring up objdetect image like in events list 2023-09-09 12:37:27 -04:00
Isaac Connor e53974119b Ensure that group_id is defined 2023-09-09 12:08:44 -04:00
Isaac Connor bf34db7da2 Log a warning when failed to send an email 2023-09-09 12:04:57 -04:00
Isaac Connor b44216d3da Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-09-08 14:19:09 -04:00
Isaac Connor a9997b943a Use new event::find_virtual_frame when loading frames 2023-09-08 14:19:01 -04:00
Isaac Connor cb5442d5b8 Add 704x576 aspect ratio to timeline css 2023-09-08 14:18:34 -04:00
Isaac Connor 82e972943e Add frame loading including virtual frames 2023-09-08 14:18:11 -04:00
Isaac Connor 473d34e220 Update events frameimage status code to use Event object. Make not finding the frame a debug because of bulk frames. 2023-09-08 14:17:36 -04:00
Isaac Connor 1f4ed44371 Fix infinite loop looking for keyframe interval 2023-09-08 14:16:31 -04:00
Isaac Connor 2b2c43e630
Merge pull request #3748 from Simpler1/patch-6 
Refresh table on show
 2023-09-05 13:05:36 -04:00
Isaac Connor cd73060236
Merge pull request #3763 from ZoneMinder/dependabot/github_actions/actions/checkout-4 
Bump actions/checkout from 3 to 4
 2023-09-05 13:04:20 -04:00
dependabot[bot] 1438c025b9
Bump actions/checkout from 3 to 4 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-04 17:11:40 +00:00
Isaac Connor e5d125c4ef Handle when no linefeed found 2023-08-31 12:46:12 -04:00
Isaac Connor 56999da3eb Check for existence of path before scanning it generating a lot of erros 2023-08-30 14:38:43 -04:00
Isaac Connor 6331d79a73 Add visibility toggle for password inputs on user edit 2023-08-28 16:39:23 -04:00
Isaac Connor df411c3fe3
Merge pull request #3760 from criadoperez/fix/texts 
Text corrections
 2023-08-27 13:17:08 -04:00
Alejandro Criado-Pérez 6fd119157a
Text corrections 2023-08-27 02:00:59 +02:00
Isaac Connor cf713b59d7 Add 500 and 1000 as pagination options 2023-08-25 19:02:17 -04:00
Isaac Connor 79b755047a Add db update to correct column type of Longitude in Events and Servers table 2023-08-25 12:49:14 -04:00
Isaac Connor 194c5a0628 Add another Annke Hikvision mac address 2023-08-25 10:54:44 -04:00
Isaac Connor 9132f8947d If scale is 0 or negative, then start with scale=100 2023-08-23 16:32:39 -04:00
Isaac Connor 76d5646cbf Fix scaling being constantly set to 0 and hence logging a bogus value for scale 2023-08-23 16:32:13 -04:00
Isaac Connor 1dba6115b1 Fix eslint 2023-08-23 11:44:16 -04:00