Isaac Connor
e787cbc654
Merge pull request #4201 from IgorA100/patch-34260
...
When panning, it is now possible to "grab" the image in the space between the top buttons
2025-02-12 15:06:53 -05:00
Isaac Connor
0d343c4916
Merge pull request #4212 from IgorA100/patch-51674
...
Fix: Load 'js/hls.js' if at least one of the cameras uses HLS on the Watch page
2025-02-12 15:06:14 -05:00
Isaac Connor
fae724a2c7
Merge pull request #4218 from IgorA100/patch-508180
...
Fix: URL parameters for RTSP2Web Type MSE due to which playback was unavailable & fix type HLS
2025-02-08 09:57:06 -05:00
Isaac Connor
7c6929fce0
Add build depends for onvif, vnc, mosquitto
2025-02-08 09:12:34 -05:00
Isaac Connor
edd77e692e
Add debug of capturing and analysing status
2025-02-04 20:03:35 -05:00
Isaac Connor
6f176182bc
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-02-04 15:23:17 -05:00
IgorA100
234b21d42f
Correctly stop RTSP2Web Type HLS when executing "MonitorStream.stop()" (MonitorStream.js)
...
1. Correctly stop RTSP2Web Type HLS when executing "MonitorStream.stop()"
2. Merged with Fix: Stop RTSP2Web Type HLS when stream stops #4214
2025-02-02 20:47:31 +03:00
IgorA100
4eff84b80e
Fix: URL parameters for RTSP2Web Type MSE (MonitorStream.js)
...
You can't combine the path and search parameters in one line, because there may be problems, for example the "?" sign will be converted to "%3F and the socket will not be created!
2025-02-02 17:06:19 +03:00
Isaac Connor
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
IgorA100
5f51249aec
Fix: Load 'js/hls.js' if at least one of the cameras uses HLS on the Watch page (watch.php)
2025-01-29 14:39:37 +03:00
Isaac Connor
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
IgorA100
1d78a10cc1
Fix: Stop RTSP2Web (close RTCPeerConnection) when playback stops (MonitorStream.js)
2025-01-28 23:11:43 +03:00
Isaac Connor
ec41f603a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-27 12:02:35 -05:00
Isaac Connor
810e2e8377
Fix ISE when selecting a group from console. Fixes #4209
2025-01-27 12:02:29 -05:00
Andrew Bauer
42b4ee025e
rpm specfiles - add json-devel builddep & delete unwanted files
2025-01-25 12:03:25 -06:00
Andrew Bauer
0eb8c03db8
track new files in rpm specfile
2025-01-25 11:14:59 -06:00
Andrew Bauer
16081e6e29
remove reference to combozola from rpm specfile
2025-01-25 09:50:11 -06:00
Andrew Bauer
35f1d87f11
Update startpackpack.sh
...
update packpack to pull the latest commit from RTSPServer project
2025-01-25 09:39:01 -06:00
Isaac Connor
6923cf8258
add debugging all 4 data andlinesize fields
2025-01-24 12:40:49 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
f7232972de
Fix clearing packets in queuePacket
2025-01-24 12:35:46 -05:00
Isaac Connor
64411489bc
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-24 12:34:15 -05:00
Isaac Connor
8c0c08694b
Remove commas that cause problems on some php. Remove unreachable code.
2025-01-24 12:31:35 -05:00
Isaac Connor
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
Neil
400ecb98c2
Small fix for Apache virtual server configuration instructions.
2025-01-19 17:21:31 +13:00
Isaac Connor
8e5a9e462c
Don't loop forever ignoring sigterm on initial connect
2025-01-16 17:29:10 -05:00
Isaac Connor
53d7d910d7
Log monitor id and name in error message about not being able to load control
2025-01-14 06:59:38 -05:00
Isaac Connor
1502723a74
Move ping to Control.pm
2025-01-14 06:58:42 -05:00
Isaac Connor
3307c9ea90
Don't log cant edit
2025-01-07 16:55:02 -05:00
Isaac Connor
b5ee966d90
Add some -> and test for ControlDevice so as not to give a warning
2025-01-05 13:12:40 -05:00
Isaac Connor
833cc41b0b
If self{address} exists, use that instead of concatenating host + port
2025-01-05 13:11:19 -05:00
Isaac Connor
0cfd860856
Handle Users no longer having MOnitorIds column
2025-01-04 12:51:53 -05:00
Isaac Connor
7c180887c7
Add missing }
2025-01-04 12:12:57 -05:00
IgorA100
bc228b8240
Avoid overlapping the central button block with the zoom buttons (skin.css)
...
20% - calculated approximately.
A precise calculation will take additional resources (since our buttons are scalable) and there is no need for a precise calculation yet.
2025-01-04 11:23:28 +03:00
Isaac Connor
067362382a
Fixed funding.json
2025-01-03 14:45:53 -05:00
Isaac Connor
2187c9b3f0
Add funding-manifest-urls
2025-01-03 14:00:57 -05:00
Isaac Connor
ef3055e638
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-03 13:54:47 -05:00
Isaac Connor
5105629fe5
Add funding.json
2025-01-03 13:54:39 -05:00
IgorA100
780e6062be
Use "grid-area" for buttons block zoom (montage.css)
2025-01-03 13:57:15 +03:00
IgorA100
d6c4de7b84
Use "grid-area" for buttons block zoom (event.css)
2025-01-03 13:37:19 +03:00
IgorA100
0bb06461ba
Changed the method for controlling the visibility of the "#button_zoom" button bar (event.js)
...
If we use "slideDown" & "slideUp", then with "display=grid" for the external block, there may be problems,
Perhaps because we also used "display=none" for the button block.
2025-01-03 13:32:55 +03:00
IgorA100
3cdbae20cf
Changed the method for controlling the visibility of the "#button_zoom" button bar (watch.js)
...
If we use "slideDown" & "slideUp", then with "display=grid" for the external block, there may be problems,
Perhaps because we also used "display=none" for the button block.
2025-01-03 13:23:20 +03:00
IgorA100
08e9fa6548
Update watch.css
2025-01-03 00:30:48 +03:00
IgorA100
2940cbe090
For ".block-button-center" change position from absolute to relative (skin.css)
2025-01-03 00:24:13 +03:00
Isaac Connor
c3fa5bc15a
Fix adding rotation when not needed.
2025-01-02 14:15:01 -05:00
Isaac Connor
4e70c36cfa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-01 12:05:50 -05:00
Isaac Connor
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
Isaac Connor
24ad12fa22
Don't include empty fields in filter query string, just to shorten it a bit
2024-12-21 14:34:35 -05:00
Isaac Connor
27dfdd1b4e
Upgrade Amcrest to use parent's code
2024-12-21 14:32:48 -05:00
