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
Isaac Connor
c2fe3ce1e8
Fix eslint
2024-10-15 18:10:05 -04:00
Isaac Connor
f1a72c909d
Merge pull request #4171 from IgorA100/patch-438287
...
Fix: incorrect placement of brackets (event.php)
2024-10-10 13:52:33 -04:00
Isaac Connor
8e2bbd57c5
Merge pull request #4172 from IgorA100/patch-406680
...
Fix: Specify 'mode'=>'mp4' for getStreamSrc() Otherwise video.js sometimes cannot determine that it is a file recording that is being played, and not a direct viewing. on Event page
2024-10-10 13:51:00 -04:00
IgorA100
e4fa3e9e12
Increase z-index to 20 for buttons ".btn-zoom-in & .btn-zoom-out" (skin.css)
...
Otherwise, the ".block-button-center" block partially overlaps with other buttons.
2024-10-10 16:24:14 +03:00
IgorA100
fb19016564
Fix: Specify 'mode'=>'mp4' for getStreamSrc() Otherwise video.js sometimes cannot determine that it is a file recording that is being played, and not a direct viewing. (event.php)
2024-10-08 19:58:14 +03:00
IgorA100
4d38ecd06e
Fix: incorrect placement of brackets (event.php)
...
Because of this it is not possible to switch to the "Codec = MGPEG" mode
The error appeared here: 2229e880b1
2024-10-08 19:49:25 +03:00
Isaac Connor
abd3097af3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-03 14:42:57 -04:00
Isaac Connor
e306dcf972
Merge pull request #4163 from IgorA100/patch-180200
...
Chore: Removed the use of the "delay" constant as it is no longer used when starting monitors on the Montage page
2024-10-03 06:51:14 -04:00
IgorA100
5ae6e0e846
Declared variable "h" (event.js)
...
Closed: https://forums.zoneminder.com/viewtopic.php?p=135715&sid=593ae02225002db4f98a48b0ae3e8e18#p135715
2024-10-03 11:56:53 +03:00
Isaac Connor
daffe0294b
Add ONVIF as a Notes filter
2024-10-02 16:16:53 -04:00
Isaac Connor
87e0a092b7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-02 14:23:10 -04:00
Isaac Connor
b89d404181
Update bootstrap-table to 1.23.5
2024-10-02 14:23:03 -04:00
Isaac Connor
8cd7e872f3
Set option help color to be the same as buttons
2024-10-02 14:22:14 -04:00
IgorA100
18d5c88c64
Update montage.js
2024-10-02 19:41:07 +03:00
IgorA100
5b02594928
Removed usage of "delay" constant as it is no longer used (montage.js)
2024-10-02 19:39:49 +03:00
IgorA100
5790a0d03b
Recovered spaces that I accidentally deleted (MonitorStream.js)
2024-10-02 19:35:54 +03:00
IgorA100
701d485773
Removed the "delay" argument from the "start" function as it is no longer used (MonitorStream.js)
2024-10-02 19:33:37 +03:00
IgorA100
95874af1a9
Fix: Scaling of control buttons (Zoom, Edit, etc.) located on the Stream depending on the width of the Stream on Event page witch use video.js (skin.js)
...
Fix to https://github.com/ZoneMinder/zoneminder/pull/4121/files
2024-10-02 15:16:18 +03:00
IgorA100
8843d8c18a
Fix: Restored monitors start with delay (MonitorStream.js)
...
Probably it broke at some point. Or maybe it never worked, but in montage.js monitors start with a delay:
"monitor.start(delay);"
2024-10-02 13:37:05 +03:00
Isaac Connor
19ea7339f4
set monitorStream gridstack
2024-10-01 17:23:03 -04:00
Isaac Connor
9555455c5d
Add defines for ANALYSING_NONE and ANALYSING_ALWAYS
2024-10-01 17:14:01 -04:00
Isaac Connor
35f2dee620
add setGridStack. Rework logic on enable/disable motion anf force/cancel alarm to match when using rtsp2web. Add support for score and analysing in status response.
2024-10-01 17:13:30 -04:00
Isaac Connor
4f03ce362d
Add analysing to stream data
2024-10-01 17:01:17 -04:00
Isaac Connor
045756c3fc
Remove obsolete ZM_WEB_RESIZE_CONSOLE
2024-10-01 16:29:22 -04:00
Isaac Connor
0780032149
Add score to monitorstream status
2024-10-01 16:28:56 -04:00
IPC
df5f76f43a
Improve logging, include event_id in TriggerOff
2024-10-01 13:40:37 -05:00
Isaac Connor
8592187288
Rough in an ajax interface for triggering
2024-10-01 12:19:03 -04:00
Isaac Connor
f0305072ef
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-01 12:18:27 -04:00
Isaac Connor
34e1512916
Add TRIGGER defines
2024-10-01 12:18:18 -04:00
Isaac Connor
eb117732a8
Rough in shm info and functions for triggering
2024-10-01 12:18:05 -04:00
Isaac Connor
5529d71a75
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-01 10:14:58 -04:00
Isaac Connor
100a321cf9
Fix ISE when auth is turned off.
2024-10-01 10:13:38 -04:00
IgorA100
0d3205c9eb
Update event.js
2024-10-01 13:32:12 +03:00
IgorA100
f530d096a6
When using video.js, the document will have both #videoobj and #wrapperEventVideo, but we only need #videoobj (event.js)
...
addEventListener should be used only for one block on the page, otherwise there will be problems.
Closed: https://forums.zoneminder.com/viewtopic.php?p=135677#p135677
2024-10-01 12:56:39 +03:00
Isaac Connor
1f5ef16160
Move url declaration down to where it is used and remove old window.location code
2024-09-30 11:43:09 -04:00
Isaac Connor
506cdc5e66
Only show non-deleted monitors
2024-09-30 09:32:35 -04:00
