github.com/ZoneMinder/zoneminder commits | Ecosyste.ms: OpenCollective

Merge branch 'master' of github.com:ZoneMinder/zoneminder

ae2dc039ac41ef23984f61b075dd818d5e44bd7a authored 11 months ago

Merge pull request #3837 from BHMSD-bdailey/master

Prevent events from exceeding the section_length

141980076ccb8561366b564dcda1d2638c4a111d authored 11 months ago

Split the if so that we get better debug output

364d0c438e8954567cf98affd551b83a566a79ed authored 11 months ago

Remove second data-click-to-select

b0792819002cbe0f851165c01a05309c31742e76 authored 11 months ago

Apply bootstrap table to servers list. Split the servers content into it's own file. Add overflow:auto to the container which for some reason fixes button visibility.

0cbce2a8a47b6e365da1a054a07459e70dffb6c9 authored 11 months ago

Fix StorageServerId value

8f353391989ffbdf4efc9d46cdbf383ce2f9907c authored 11 months ago

Update debug to make it unique

025fc939a971caa9ea5e23c3278b6392b977ae9f authored 11 months ago

Fix: Logging levels coloring

When getting the index, you cannot use text(), because there may be different meaning depending ...

34815e02b946616d88d46e692b86f53f2373cebc authored 11 months ago

Prevent events from exceeding the section_length even if we are still in alarm

ebee72bf65f34ad50784168008ed0d3d2b7b0368 authored 11 months ago

Subsitute a 0 when ZM_SERVER_ID is not defined

edcf09882fa1c80b0b2e97f1397e0f36bb2d25d9 authored 11 months ago

Fix support for FilterServerId

91aeeb4d6000c2284629acf99e4372ad3e2d9365 authored 11 months ago

Always increment alarm_frames if it is an alarm packet. Doesn't have to have an image.

63b3f2bd36820854512134818e312e1373b2ba58 authored 11 months ago

Merge branch 'master' of github.com:ZoneMinder/zoneminder

1c83b137bb102a267e16badb922cba3d6b253e80 authored 11 months ago

Move setting of last_signal up to where it is used for clarity

15e4a7ac659376ff1240af17c92979f74d2f3c11 authored 11 months ago

Merge pull request #3835 from BHMSD-bdailey/master

Simple typo and consistency fixes.

c7bcb64f61380bcff40dbf5f18ddaae326b42acd authored 11 months ago

Merge branch 'ZoneMinder:master' into master

ec24235cd35fcec90e5ee1b534840ce91fd9d3a7 authored 11 months ago

Simple typo and consistency fixes.

7e6efde1a95e5abfab51dd8f4465ec4407c58c46 authored 11 months ago

Handle undefined sort field

48774d3c31490aaef858a1cd60c7e5c06960eb54 authored 11 months ago

Merge pull request #3832 from webgeek1234/rpi-dec

Fix raspberry pi hardware decoding

0994e9da488761ede8894c0f79ffd5c758900b70 authored 11 months ago

Merge pull request #3834 from IgorA100/patch-2

Adding the lost "All Events" button from Live View

3151b991854f727f196e28331df5262afd6c24b2 authored 11 months ago

Adding an "All Events" Button from Live View

Ability to jump to viewing all events from live viewing.

9783c5a560d36925f9a771c6cd79fdd44150f1d3 authored 11 months ago

Clicking the "All Events" button from Live View

When you press the button, we go to view all events.

d9cfcfbaa70935bb56d351d80b7550cebaba703f authored 11 months ago

Include unistd because we use sleep

72cbf4a3932e077022475bd099f843b95293c2dd authored 11 months ago

Add a return value to zmDbReconnect which seems to fix the crashing

e03afd678a5ab052da65cbfb841dec9cfc2224d1 authored 11 months ago

Fix nitpick

93ee735086d47fde1565bd381c8af6ddc5c21529 authored 11 months ago

Only do mysql_close if we think we are connected

87156149a0f0426b20db1e3958f73a5010a78b7f authored 11 months ago

Add zmDbReconnect, which closes the connection before trying to reconnect, in an attempt to prevent mem leak. This adds a 1 sec sleep if we fail to connect. This also removes the disabling of db logging before doing logging... because we are going to assume (possibly incorrectly) that the logging code is correct and generating well-formed sql, and hence the error is external. This might be a bad idea.

e9e429083ed977d8a032098823ee607fc764dd91 authored 11 months ago

Add Cpu Usage % to header

661d8620fd7da047ea5133adb2b92562876b7bd0 authored 11 months ago

Add server stats fields

f54f10df7250ce4f3d8ee988db6f8af8cf3ad1ce authored 11 months ago

Update to use Server module updates and store CpuUsage stats instead of just load

68e2b194408431d56b0c816f0480c4bd42f7147d authored 11 months ago

Implement CpuUsage to get data either from /proc/stat or top output.

93ef297c248a2d52656a705fdf57a3156799e343 authored 11 months ago

ffmpeg: Rework decode and encode flows

send_packet will fail with -EAGAIN if receive_frame hasn't consumed the
last packet. Similarly s...

e710127924cc244f4ee217c146212602abdd4edb authored 11 months ago

Use time instead of pts for legibility in warning about jumping back in time. Don't break capture until we have at least 5 of these errors.

ff41c1612f08588046221d2feb20ca1daae31631 authored 11 months ago

Fix relative path to dms.js

def378fe12b58ca121669f13e438b268d2b2d64a authored 11 months ago

Add duration mode to eventclosemode

d32b4809af7f6eb843e197edb5fc551e1873e1e9 authored 11 months ago

Add duration mode to eventclosemode

c947da47a93aad32d7ddb4669d8ef60ae6945d71 authored 11 months ago

Merge pull request #3831 from ovargasp/master

On Options -> System , show languages with names not codes/filenames

0b7cbee812f45aed0d9bfcee9c3464820d5ed597 authored 11 months ago

removed unnecessary definition in lang file.

16392fc1fb59695767d7ad6d52f51f3ad960c731 authored 11 months ago

On Options -> System , show languages with names not codes/filenames

Possible implementation for issue #3694

78676ac2490d9b91a35039a8e3de5a94f7cdeb2e authored 11 months ago

Put back test for out of order packets. These buffers can take up a lot of ram even though they may not be needed.

01ebcad29c15569cc07f95164bf4e63e40566d2e authored 11 months ago

Update loading the download modal. Include the monitor and events filters, include auth_relay

2fd7c089e3461526b8b1dc1027f81cac68f6fca8 authored 11 months ago

Remove requirement for id or eids. We can specify by filter now. Fix populating exportIds making sure it is an array.

7e98cf36d688fddab1f26b97a2f70cfced5429c9 authored 11 months ago

Fix typo

49fb9cde121389c49f4b2ad1f20ad3dcc0d44aef authored 11 months ago

When listing option name, remove the ZM_ to be consistent with the options view

f339ba550800c68de2d5980788063882e2203392 authored 11 months ago

Merge branch 'master' of github.com:ZoneMinder/zoneminder

83b2e20b34f7f2b83102eac4681ff40de804e3fe authored 11 months ago

Add a resize handler

4424bab051ef6a394cea67f72f3c35bbcf203b52 authored 11 months ago

Fix issue with packet have score != -1. We don't set snap->score until after doing motion detection because we give up if we are waiting for decoding. We now always do state transitions regardless of whether we did motion detection.

602959adce9b7744756747a4d6fd9bbbf23406c2 authored 11 months ago

Revert "Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early""

This reverts commit efe5c022232a826483af049717277362dc2ec22f.

29d70ab79b7d9f1a025e9260619f4ad6daf43c5e authored 11 months ago

Revert "Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early"

This reverts commit 0e1cf9beda5e43d04232e27b042edef0672f1dd1.

efe5c022232a826483af049717277362dc2ec22f authored 11 months ago

Merge score and snap->score. The effect is to treat all alarms as alarmed frames regardless of source. Should fix linked monitors ending the event early

0e1cf9beda5e43d04232e27b042edef0672f1dd1 authored 11 months ago

Fix missing `

50c61a733cb8726630d7780f60648bf78f17e2e3 authored 11 months ago

Add db update for SOAP_wsa_compl. Bump version as a result

af9402cde8101a06d3eb3f56560a150a3da383b9 authored 12 months ago

Add some more debugging. Include zm_terminate in while loop condition. return instead of continuing to process nals if _stop or _zmterminate

7517de2811d4caf80922b6471c7e1814ce06ddd4 authored 12 months ago

Merge branch 'master' of github.com:ZoneMinder/zoneminder

839f09dba11df1cd3ea8e795c028796917ab8fe7 authored 12 months ago

Put back Accept-Ranges as it breaks seeking

013f6daaf614fd32e18b53e3a302cae6fc641b46 authored 12 months ago

Move code to shutdown the process properly into exit_zms and use it when auth fails. The stops a segfault.

01c6df434cb346305446e659c09926e8186e65cc authored 12 months ago

Merge pull request #3828 from ovargasp/snapshot_1.37.50

SOAP WSA option for Chinese cameras

565badeaa5db97c43385a8a75bbf5241929003a6 authored 12 months ago

Implements an option to disable soap_wsa code that doesn't work

with some chinese cameras, more common to Latam zone

0ff48f631e87653155fed1e19413e5c4ae338b3c authored 12 months ago

INclude monitor Name in monitors array, because it useful to show monitors by name instead of id

8ffbc1d6f02beb1fc9983966c2d9de1093d97e82 authored 12 months ago

Handle user being undefined when not logged in

dc556c0f70027c400a80e3ec2468b0fc7f2b35a3 authored 12 months ago

Merge pull request #3823 from davvid/cmake

cmake: export compile_commands.json for use by development tools

b57b434c6a917a9283e5d013f286c38244776c51 authored 12 months ago

Merge pull request #3827 from davvid/podman

distros: add a Containerfile for building zoneminder using podman

c59835849063145d1a990bd94bd6e6b566c789a1 authored 12 months ago

Merge pull request #3826 from davvid/user-memleak

zm_user: avoid memory leak when user cannot be authenticated

0fddf96e4e1e3dbe8cb2e17c565b5393ab68b220 authored 12 months ago

Changes to zm_monitor code to enable/disable soap_wsa support

for chinnese cameras that doesn't have it implemented

5d5210b1166c74396094381b7cdebeca1be26a9e authored 12 months ago

distros: add a Containerfile for building zoneminder using podman

1bfb7bea20d6a99e4140a9cb0e9a92a2f5b2df6b authored 12 months ago

cmake: export compile_commands.json for use by development tools

a3e15b57d8354018f19d00ce1cb2a0a4dbc27b20 authored 12 months ago

zm_user: avoid memory leak when user cannot be authenticated

2e9379b3f50dcc5fe5c20e87f7deb3bcec17447a authored 12 months ago

Merge pull request #3822 from IgorA100/patch-1

Sorting an array of events when merging into a file

51020e92a4cf5a97e3627bcdae234e1d12a8ae97 authored 12 months ago

Fix children MonitorIds not being included due to the use of + instead of array_merge

8bb368fe13f5f8e12534b761e6c6f74202b5f6e8 authored 12 months ago

Code optimization

a204a973f1eb6511441c29456788d606a433c8c7 authored 12 months ago

Sorting an array of events when merging into a file

When merging events into a file, they must first be sorted by time and start date of the event.

d0dc4bcbe105851ec5736aee29b97cc3651c6cc0 authored 12 months ago

Set zm_terminate on io error

b87c86621a70be06826c1761c43bcbd8fe139b0c authored 12 months ago

Still generate an auth if no password present.

31af9d905cec6c0add9b15234b42ae65a0898859 authored 12 months ago

Use const on bottomLoc

ec20772f98acbdd5c3a77d3e0eba3fc5e70d2301 authored 12 months ago

fix unexpected this, although according to jquery docs it is totally valid

f795fb3c1992563378f6818a4d1289e4cc1858b7 authored 12 months ago

When monitor is Decoding==None send a more informative text image saying so. Instead of simply returning, set zm_terminate and go through the normal flow so that comms thread and db threads terminate as well. Might fixes zms hangs

79ce5cf80f7407f8a4368a030ae29c98a4a26aa0 authored 12 months ago

Add autocomplete=off to Montage Layout name

00f27ca8af658f189c99a1e03f36d1bd361124e0 authored 12 months ago

Merge branch 'master' of github.com:ZoneMinder/zoneminder

5acf359e14d5f67617dfaca4a1fac19d85a739c3 authored 12 months ago

Remove debug line causing crashes

efe61f3a83c6876b8fd3970912968540832cee6a authored 12 months ago

Add some more debugging to track down idle events not closing on alarm

593f6f1601c520a7fbf4949900e499b6f8d86a15 authored 12 months ago

Add warnings when event_close_mode is weird. Fix monitor always being in close_mode=idle. Still do state changes even if packet is not video. Do not set state=ALARM when triggered, let the state machine do that.

a64b24687c363f818adf444044ad1063c1f03f6c authored 12 months ago

Move declaration of zones down to where it is used

4993a55b1407f1105eaca95ef5b18f223966323a authored 12 months ago

Can't set alarm when triggering. Must be done by the state machine

22a28462185954c6dad386470b8c42054f3cac05 authored 12 months ago

Spacing, cpplint

ad232761e1ba59de7a39b2ff9e7eda262a43168b authored 12 months ago

Spacing

f92115b4fed26520052a04215e3fe51c090354df authored 12 months ago

Rename DMS2LL to dms2ll to satisfy eslint

cc7b8fa9d02302991cb38ffecabc08e3e5ac22c5 authored 12 months ago

Merge branch 'master' of github.com:ZoneMinder/zoneminder

b817094fb84628de0b823a5d334b2694c1c8e0d4 authored 12 months ago

Rename EventName to Name and Monitor Name to Monitor to take up less space

b94b454bf97ccff7de2dc42e7063ff3ab665b0de authored 12 months ago

Rename EventName to Name and Monitor Name to Monitor to take up less space

bd7bfcbdcd7aca6658719d0502a033902d7c137d authored 12 months ago

rename table=>eventStatTable. Apply width and height to map if it is to be displayed

cc5bb8ecec61cca17cc4cb0154e2fbf65394a0d3 authored 12 months ago

Remove fixed width and height from map, they will be set in js if map is to be displayed

79164993f9eda8a30382c25b2437e838379bcf97 authored 12 months ago

Add display: flex to content so that scroll bars work

36b4d9a264243b470f1aa661eb5537f5c5dbea78 authored 12 months ago

Rename zmMap to ZMMap because eslint thinks constructors should always be capitalized.

fcac8ec2f200a1ee640daf42c42bffc97c3fca2c authored 12 months ago

Make eventVideo div take up available space so that scaleToFit can do it's job

5f6df6fad7eb1fe93466bf3fe56890355aa843eb authored 12 months ago

pass #eventVIdeo as container to scaleToFit so that it fits within available width

124bbc02957efcdb9a991ab82cadbb04122814f8 authored 12 months ago

Add px-3 to the flex container for stats and view to handle scroll bar

3c91a2bcafa2f7568600ecb272b41fb3e9d73387 authored 12 months ago

Add container to params for scaleToFit. The container we want to fit width into might not be #content.

e6eff5903f9ee7fc984c8fb1b5993fe25de787da authored 12 months ago

Merge pull request #3818 from ZoneMinder/revert-3817-database-certificate-verification

Revert "Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…"

e7bdd83a576c0d21c5abfcfdfb30a2b34dff02bc authored 12 months ago

Revert "Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…"

caccc6def03e6c5e4c92951a5ed25916ad1c40da authored 12 months ago

Merge pull request #3817 from jmpalacios/database-certificate-verification

Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…

3f0076bf492c0341a08e0a84d2f427cebd7040ab authored 12 months ago