Commit Graph

11301 Commits (master)

Author SHA1 Message Date
IgorA100 e0d53922a9
Chore: fix space (watch.js) 2025-02-13 11:51:34 +03:00
IgorA100 0bfed3356a
Fix: Start/Stop when showing/hiding page (Update watch.js)
When hiding a page:
Remember the current state of the stream.
If the stream was previously stopped - do nothing

When displaying a page:
Do not start playback if the stream was stopped before hiding the page.
You cannot use "monitorStream.started", because when the stream is stopped it will always be "false"
2025-02-13 11:49:03 +03:00
Isaac Connor 9afec506a9
Merge pull request #4217 from IgorA100/patch-836420
The most correct transmission of RTSP stream with audio support when using RTSPToWeb
2025-02-12 16:05:20 -05:00
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
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
IgorA100 32badf1b6c
Fis space (MonitorStream.js) 2025-02-02 14:42:59 +03:00
IgorA100 b65fb1bbdb
Fix space (MonitorStream.js) 2025-02-02 14:37:28 +03:00
IgorA100 33ec46d941
Fix Eslint (MonitorStream.js) 2025-02-02 14:31:01 +03:00
IgorA100 d38472597e
The most correct transmission of RTSP stream with audio support (MonitorStream.js) 2025-02-02 14:14:15 +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
IgorA100 1d78a10cc1
Fix: Stop RTSP2Web (close RTCPeerConnection) when playback stops (MonitorStream.js) 2025-01-28 23:11:43 +03:00
Isaac Connor 810e2e8377 Fix ISE when selecting a group from console. Fixes #4209 2025-01-27 12:02:29 -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 3307c9ea90 Don't log cant edit 2025-01-07 16:55:02 -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
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 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 72330a5234 Fix api url getting monitors for map 2024-12-18 13:44:20 -05:00
Isaac Connor dae071bd10 Don't show deleted monitors in zones 2024-12-17 16:09:42 -05:00
Isaac Connor 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
Isaac Connor 4dcab65d51 document what scaleEl is 2024-12-16 10:57:16 -05:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 55b99e19ab Use a redirect on homeview to fix having query params added on 2024-12-13 12:19:30 -05:00
Isaac Connor 9700ecf773 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-12-09 19:10:47 -05:00
Isaac Connor 223dc4b70f 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 2024-12-09 19:08:35 -05:00
Isaac Connor 8c8a689c4a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-12-09 17:28:03 -05:00
Isaac Connor ffeec4cdec Add E.Id != and use >= and <= when comparing StartDateTime so that we don't skip events with the same startDateTime. Fixes #4186 2024-12-09 17:27:56 -05:00
Isaac Connor edb0836fe1 Fix not being able to undelete a monitor 2024-12-09 12:27:42 -05:00
Isaac Connor 15dfaa5fc0
Merge pull request #4193 from Aleksanderk123/More-language-changes
More language changes
2024-12-04 18:09:13 -05:00
Aleksanderk123 313442707e
Translated language list 2024-12-04 23:35:59 +01:00
Aleksanderk123 5586cae348
Update en_gb.php
Added norwegian language to the list of languages
2024-12-04 23:30:34 +01:00
Isaac Connor 57fb0cba1b Check for existing monitorStream to avoid js errors 2024-12-04 15:07:29 -05:00
Aleksanderk123 4c0e037b2f
Norwegian Translation 2024-12-04 00:21:35 +01:00
Aleksanderk123 8afdec1cdc
Uploaded Partially Norwegian language 2024-12-03 21:55:35 +01:00
Isaac Connor 19aca785c2 When invalid monitor id specified, pop up an alert instead of a bunch failed js. Handle livestream not existing. 2024-12-03 12:54:04 -05:00
Isaac Connor 9125b8e6f9 Add support for sorting by Notes. Warn when the sort_field is unsupported 2024-11-27 13:56:35 -05:00
Isaac Connor 359330b384 When loading prev/next event, sort by StartDateTime, not Id. Id's are not guaranteed to be time-wise sequential. Maybe Fixes #4186 2024-11-27 13:55:50 -05:00
Isaac Connor d42040d7c3 Add grouping by Monitor. Apparently mysql is complaining about not having it now. 2024-11-27 13:54:24 -05:00
Isaac Connor 0128cd1e57 Handle no .imageFeed present 2024-11-25 12:39:14 -05:00
Isaac Connor 3125dbbfc6 Only show scan button if arp or arp-scan is defined 2024-11-25 12:34:47 -05:00
Isaac Connor 7bcb588bf3 Fix eslint 2024-11-23 14:08:35 -05:00
Isaac Connor 65e098c35b If no view, default to home view 2024-11-23 13:36:59 -05:00
Isaac Connor 7fed03d41b Add auth to v4lsetting 2024-11-22 16:30:28 -05:00
Isaac Connor 1c2600ff2a Don't set view in skin.php. Causes problems with not detecting not being logged in 2024-11-22 16:30:11 -05:00
Isaac Connor 1884b18611 Don't run actions if we intend to redirect 2024-11-22 16:29:35 -05:00
Isaac Connor 9c097919f6 Rough in missing v4l2settings.php 2024-11-22 16:28:32 -05:00
Isaac Connor 7933bd4852 Add some logging of invalid mid 2024-11-22 16:28:08 -05:00
Isaac Connor 19bd85c9f2 Restart streams when user clicks off the AYSW modal. 2024-11-18 11:51:02 -05:00
Isaac Connor 16a5f9e0a2 Merge dbUpdate and dbInsert from another branch 2024-11-18 10:47:07 -05:00
Isaac Connor d4d6438228 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-11-17 10:16:35 -05:00
Isaac Connor 70c715212f Move authentication options to it's own tab 2024-11-17 10:16:31 -05:00
Isaac Connor 6236f68add Fix console.err=>console.error 2024-11-15 16:19:40 -05:00
Isaac Connor 1667e97dac Add Last Modified and Size to files and folders list. Size of folders is calculated recursively 2024-11-10 18:27:36 -05:00
Isaac Connor 3c6ba77be9 If no path given, if there is 1 storage area, default to it otherwise list available storage areas 2024-11-09 18:09:56 -05:00
Isaac Connor b6a49bef00 Fix stream getting killed after visibility returns if we return before 15 seconds 2024-11-06 16:43:16 -05:00
Isaac Connor 6c214c462c Don't show deleted monitors 2024-11-06 13:21:02 -05:00
Isaac Connor 63ab3d6e14 Remove the modal content so that when choosing another group or new we get that instead of the first content 2024-11-06 13:18:24 -05:00
Isaac Connor 996d131179 destroying then re-applying chosen for some reason auto-selects all options. Fix the problem by fixing the table width with css so that the underlying select is already 100%. 2024-11-06 12:21:57 -05:00
Isaac Connor 8385aca883 Set any tables in a modal to 100% so that they fill the modal. 2024-11-06 12:21:15 -05:00
Isaac Connor f51f1b4200 If no group id don't do sql lookup 2024-11-06 12:20:48 -05:00
Isaac Connor b78ce0fea5 Give an id to the newGroup[MonitorIds] select can look it up more efficiently when applying chosen rules 2024-11-06 12:20:09 -05:00
Isaac Connor a8c658aa50 Ensure that Servers is global. 2024-11-06 10:38:24 -05:00
Isaac Connor 5c01109f03 List monitor id in warning message about not being assigned a server. 2024-11-04 09:17:20 -05:00
Isaac Connor 9e7d31841e Fix SQL Vulnerability. Fixes GHSA-qm8h-3xvf-m7j3 2024-10-31 13:51:50 -04:00
Isaac Connor 335900a727 Remove debugging of fps 2024-10-30 10:32:06 -04:00
Isaac Connor 1de8d76cae Remove debug of forceAlarmButton 2024-10-29 13:31:11 -04:00
Isaac Connor e616449af6 If AYSW is active, don't restart stream when window becomes visible again 2024-10-29 13:31:00 -04:00
Isaac Connor e7d4bafecf Produce better error log when panZoom entry is not found 2024-10-28 16:05:14 -04:00
Isaac Connor 94c2816841 Split out the default and initial_default concepts 2024-10-26 13:59:59 -04:00
Isaac Connor 1c0e03b813 Set the default for AnalysisFPSLimit to null so that we can empty it. Add an initial_default to use when creating a new monitor 2024-10-26 13:59:45 -04:00
Isaac Connor ad582e9033 Add Linked as a cause type to search for 2024-10-26 13:34:40 -04:00
Isaac Connor c51c287c01 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-25 15:44:10 -04:00
Isaac Connor d9718235b9 Now that we are doing a better job of sizing/laying out the streams, we can set svg height to 100% so that it matches the ratio adjustment 2024-10-25 15:43:56 -04:00
Isaac Connor 3e1c5573ec Don't warn about no locale set, that is normal 2024-10-25 11:02:49 -04:00
Isaac Connor f02121fcc2 Check for validity of locale. Handle fatal crash when setting datetiemformatter when an invalid locale is used. Fixes #4179 2024-10-25 10:41:56 -04:00
Isaac Connor bd6570d492 Add missing const 2024-10-24 18:29:23 -04:00
Isaac Connor 8a7c7f20f6 Add Turkishtr 2024-10-24 10:00:32 -04:00
Isaac Connor 2e4cd94853 Fix eslint 2024-10-24 09:02:46 -04:00
Isaac Connor 550c08969f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-24 09:02:09 -04:00
Isaac Connor bc5000ec06 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-23 19:06:37 -04:00
Isaac Connor 6f8ac29aa9 Make stream state inline so it all fits on one line 2024-10-22 18:31:36 -04:00
Isaac Connor 02871576a5 Add fps to event status. Convert CmdTimer to Interval 2024-10-22 18:22:19 -04:00
Isaac Connor b6d01f45f4 Removed the deprecated delay code, and swapped some vars for consts 2024-10-22 16:18:54 -04:00
Isaac Connor ce1a1b87e9 Only try to send a command to enable analysis frames if we are streaming through zms. prevents an error being logged 2024-10-22 16:18:31 -04:00
Isaac Connor bbe366f05f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-10-22 10:15:08 -04:00
Isaac Connor 5ff4bee71f Gracefully handle if panzoom entry hasn't been created 2024-10-22 10:15:04 -04:00
Isaac Connor a140754eb1 Janus_Use_RTSP_REstream is a checkbox, and so doesn't have length. 2024-10-21 17:40:01 -04:00
Isaac Connor 91e31d91bc Load #progressBar once 2024-10-21 17:40:01 -04:00
Isaac Connor dea3b741c9 Require path to be a defined storage area. Use detaintPath to prevent Path Traversal. Fixes GHSA-g355-3rf6-f38v 2024-10-21 17:40:01 -04:00
Isaac Connor 123c261e75 Fix eslint 2024-10-15 18:16:55 -04:00