2f03e051cd
Don't try to populate event info table if there is no data. Prevents js errors
2025-01-29 11:31:54 -05:00
0c3a7e6737
Merge pull request #4211 from IgorA100/patch-65458
...
Fix: Stop RTSP2Web (close RTCPeerConnection) when playback stops
2025-01-28 16:51:15 -05:00
1d78a10cc1
Fix: Stop RTSP2Web (close RTCPeerConnection) when playback stops (MonitorStream.js)
2025-01-28 23:11:43 +03:00
ec41f603a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-27 12:02:35 -05:00
810e2e8377
Fix ISE when selecting a group from console. Fixes #4209
2025-01-27 12:02:29 -05:00
42b4ee025e
rpm specfiles - add json-devel builddep & delete unwanted files
2025-01-25 12:03:25 -06:00
0eb8c03db8
track new files in rpm specfile
2025-01-25 11:14:59 -06:00
16081e6e29
remove reference to combozola from rpm specfile
2025-01-25 09:50:11 -06:00
35f1d87f11
Update startpackpack.sh
...
update packpack to pull the latest commit from RTSPServer project
2025-01-25 09:39:01 -06:00
6923cf8258
add debugging all 4 data andlinesize fields
2025-01-24 12:40:49 -05:00
f2e8741984
Choose altnernate video stream if it matches the specified resolution. Don't return packets that don't match our stream. discard unmatched streams.
2025-01-24 12:37:36 -05:00
5fa5d8f79b
Use UPSERT on Monitor_Status so that the record re-appears after it has been removed in on-demand cameras
2025-01-24 12:36:39 -05:00
f7232972de
Fix clearing packets in queuePacket
2025-01-24 12:35:46 -05:00
64411489bc
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-24 12:34:15 -05:00
8c0c08694b
Remove commas that cause problems on some php. Remove unreachable code.
2025-01-24 12:31:35 -05:00
501d6a6d01
Merge pull request #4206 from un-clouded/master
...
Small fix for Apache virtual server configuration instructions.
2025-01-19 14:30:09 -05:00
400ecb98c2
Small fix for Apache virtual server configuration instructions.
2025-01-19 17:21:31 +13:00
8e5a9e462c
Don't loop forever ignoring sigterm on initial connect
2025-01-16 17:29:10 -05:00
53d7d910d7
Log monitor id and name in error message about not being able to load control
2025-01-14 06:59:38 -05:00
1502723a74
Move ping to Control.pm
2025-01-14 06:58:42 -05:00
3307c9ea90
Don't log cant edit
2025-01-07 16:55:02 -05:00
b5ee966d90
Add some -> and test for ControlDevice so as not to give a warning
2025-01-05 13:12:40 -05:00
833cc41b0b
If self{address} exists, use that instead of concatenating host + port
2025-01-05 13:11:19 -05:00
0cfd860856
Handle Users no longer having MOnitorIds column
2025-01-04 12:51:53 -05:00
7c180887c7
Add missing }
2025-01-04 12:12:57 -05:00
067362382a
Fixed funding.json
2025-01-03 14:45:53 -05:00
2187c9b3f0
Add funding-manifest-urls
2025-01-03 14:00:57 -05:00
ef3055e638
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-03 13:54:47 -05:00
5105629fe5
Add funding.json
2025-01-03 13:54:39 -05:00
c3fa5bc15a
Fix adding rotation when not needed.
2025-01-02 14:15:01 -05:00
4e70c36cfa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-01 12:05:50 -05:00
4b34efa1cd
DO like we do in 1.36 and only update the db monitor_status table every 10 seconds instead of every second.
2025-01-01 12:05:43 -05:00
24ad12fa22
Don't include empty fields in filter query string, just to shorten it a bit
2024-12-21 14:34:35 -05:00
27dfdd1b4e
Upgrade Amcrest to use parent's code
2024-12-21 14:32:48 -05:00
7b59995a48
Use parent's credentials in HikVision
2024-12-21 14:32:48 -05:00
72330a5234
Fix api url getting monitors for map
2024-12-18 13:44:20 -05:00
0bbaedc5d9
Add explicit path to sphinx conf.py as required by readthedocs
2024-12-18 12:27:38 -05:00
dae071bd10
Don't show deleted monitors in zones
2024-12-17 16:09:42 -05:00
6ec0b5a1dc
Fix SQL query when a user is limited to a subset of monitors and tries to view all zones.
2024-12-17 15:58:23 -05:00
4dcab65d51
document what scaleEl is
2024-12-16 10:57:16 -05:00
3aaba3154b
Move changeScale down as the video area has to have height before we can call scaleToFit
2024-12-16 10:56:43 -05:00
7b6d4952bd
Revert "Don't allow a scale of 0. Default to 100. Call changeStreamQuality after changeScale so that we always pass the right value. Prevents Errors in logs about bogus scale value"
...
This reverts commit 223dc4b70f
2024-12-16 10:45:30 -05:00
b71d6e4569
Merge pull request #4198 from sertonix/gzip-n
...
Strip build time from compressed manpages
2024-12-16 10:38:49 -05:00
16e02e11cd
Strip build time from compressed manpages
...
The manpage compression metadata include the true build time (and not
SOURCE_DATE_EPOCH like the manpages themselves). Excluding the build time
allows the manpage to be build reproducibly.
Ref https://reproducible-builds.org/
2024-12-16 16:07:43 +01:00
55b99e19ab
Use a redirect on homeview to fix having query params added on
2024-12-13 12:19:30 -05:00
4c4ae608e0
Fix quoting on default for Importance
2024-12-13 11:40:39 -05:00
36f45fdbc7
Wait until we get a successful shm connect before trying to set StartupTime. fixes crash
2024-12-12 12:21:32 -05:00
3fbb8bdaca
Fix ffm=>video_out_stream
2024-12-10 15:45:39 -05:00
df0438d487
Fix lack of support for rotation in ffmpeg 5.1 onwards
2024-12-10 15:20:15 -05:00
9700ecf773
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-12-09 19:10:47 -05:00
Isaac Connor
Isaac Connor
IgorA100
Andrew Bauer
Neil
Sertonix