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
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
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
Isaac Connor
3b379e99c0
Introduce detaintPathAllowAbsolute. Use it to protect against Path Traversal in files view. Fixes GHSA-8fw2-wh82-vv4h
2024-09-30 06:42:10 -04:00
Isaac Connor
7aabf146ba
Try to do something useful with error messages from SQL, but since storage isn't a real view, it won't be shown.
2024-09-30 06:34:15 -04:00
Isaac Connor
07fcb72e3b
Use the same filter on Storage Name as we use in Monitor Name.
2024-09-30 06:33:09 -04:00
Isaac Connor
97b7ae9c5f
Use htmlspecialchars on Message to prevent Stored Cross-Site Scripting. Fixes GHSA-rqxv-447h-g7jx
2024-09-30 06:23:22 -04:00
IgorA100
64e1926e00
Added missing function "thisClickOnTimeline" in skin.js
...
Closed https://forums.zoneminder.com/viewtopic.php?p=135662#p135662
2024-09-29 11:34:52 +03:00
IgorA100
0617e011fa
Changed the declaration of the variable "pix" (event.js)
...
Closed: https://forums.zoneminder.com/viewtopic.php?p=135657#p135657
2024-09-29 00:48:33 +03:00
Isaac Connor
3e320c59fd
Add missing )
2024-09-28 09:14:21 -04:00
Isaac Connor
c6e5ff43e7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-27 16:01:20 -04:00
Isaac Connor
2229e880b1
Add video.js support for av1
2024-09-27 16:00:53 -04:00
Isaac Connor
d1c140e0a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-27 10:01:15 -04:00
IgorA100
202fc31abb
Fix: Added declaration of variables "futNone, indexPlus" (event.js)
...
Closed: https://forums.zoneminder.com/viewtopic.php?p=135636&sid=0e728ac75cf2a1ce0b42380582f5b928#p135636
2024-09-27 11:13:41 +03:00
Isaac Connor
cdf5485036
Merge pull request #4124 from IgorA100/patch-167
...
Minor styling improvements for mobile devices. ".sticky #mfbpanel" height no more than 40% of the screen (skin.css)
2024-09-26 16:54:08 -04:00
Isaac Connor
40f319cc8e
Fix map not loading
2024-09-26 16:13:34 -04:00
IgorA100
d4277bdb45
Fix: Declared variable "spanTime" (event.js)
...
Closed https://forums.zoneminder.com/viewtopic.php?t=33468&sid=1a292ca9e8daa501e2c411ce76d7e8c4
2024-09-26 16:34:52 +03:00
Isaac Connor
0ee28cad06
FIx command => streamCommand. Fixes #4150
2024-09-26 07:50:01 -04:00
Isaac Connor
d8cfce4c4a
INstead of the code in c9aa03d, just set updateScale.
2024-09-26 07:14:19 -04:00
Isaac Connor
f4830b1c14
Revert "You can't change size in a ResizeObserver. So do what we do in montage, just add the affected element to an array and deal with it in an interval"
...
This reverts commit c9aa03dc55
2024-09-26 07:10:47 -04:00
Isaac Connor
0f2201d538
Fix eslint
2024-09-25 15:17:59 -04:00
Isaac Connor
3a58ca5ad3
code improvements and tidy ups
...
In ResizingObserver, check for existence of div. The outgoing monitor may fire a change after it's html is gone.
When becoming visible again only restart stream if Are You Still Watching is not being displayed
2024-09-25 15:09:42 -04:00
Isaac Connor
53ffcd4121
In play/pause, start/stop rtsp2web as well as zms stream. Also stop status requests. Rework the enable/disable alarms and force alarm buttons when using rtsp2web.
2024-09-25 14:54:58 -04:00
Isaac Connor
564e521c8c
Fix eslint
2024-09-25 10:48:27 -04:00
Isaac Connor
c9aa03dc55
You can't change size in a ResizeObserver. So do what we do in montage, just add the affected element to an array and deal with it in an interval
2024-09-25 10:35:43 -04:00
Isaac Connor
689881d105
Use monitorStream.play and pause instead of assuming zms
2024-09-24 17:29:21 -04:00
Isaac Connor
ab1b67893a
Remove unused getStream and watchdog stuff. When AYSW modal fires, pause cycle as well
2024-09-24 17:27:43 -04:00
Isaac Connor
d216c4cf47
Remove STATE_TAPE
2024-09-24 17:26:55 -04:00
Isaac Connor
d513451e3f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-23 10:13:22 -04:00
Isaac Connor
194337c247
Upgrade to bootstrap-table-1.23.3
2024-09-23 10:13:13 -04:00
IgorA100
016524b729
When resizing the browser window, execute "isOutOfViewport" (montage.js)
2024-09-23 13:41:56 +03:00
