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
IgorA100
563a5450fd
Update montage.js
2024-09-23 13:19:18 +03:00
IgorA100
d53c509e73
Fix: isOutOfViewport calculation of the block bottom for sticky mode (montage.js)
2024-09-23 11:47:24 +03:00
Isaac Connor
da4636d11d
Make clean button always visible
2024-09-22 11:13:04 -04:00
Isaac Connor
6a672c4627
Height will always be true to do px being appended. Leave it as number until setting height.
2024-09-22 10:57:42 -04:00
IgorA100
42edacbc6b
Fix: Support STICKY mode for isOutOfViewport (montage.js)
2024-09-21 20:46:45 +03:00
Isaac Connor
2f013e0443
GIve event title an id, so we can update it
2024-09-21 09:42:44 -04:00
Isaac Connor
852af8ee98
Code cleanups, apply use strict, comments, update event title when switching events.
2024-09-21 09:42:31 -04:00
Simpler1
d05cccb2dd
fix(events): Initial hidden columns when cookie doesn't exist
...
The name of the cookie is
zmEventsTable.bs.table.hiddenColumns
not
zmEventsTable.bs.table.columns
2024-09-20 16:13:15 -04:00
Simpler1
b5cec40955
Fix(events): Remember column visibility changes
2024-09-20 15:43:27 -04:00
IgorA100
6d7ee93fc3
Fix: The double click to go fullscreen should only happen if not shift/ctl modifiers are active (skin.js)
...
Close #4141
2024-09-20 17:21:51 +03:00
Isaac Connor
c37d773eba
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-19 18:30:42 -04:00
Isaac Connor
05554757bc
Don't use a define for MAX_PRESETS so that we can include control_functions multiple times
2024-09-19 17:43:17 -04:00
Isaac Connor
a6f7d1aa3c
Merge pull request #4138 from IgorA100/patch-976391
...
Fix: PanZoom Panning didn't work when using "preventDefault"
2024-09-18 16:01:47 -04:00
Isaac Connor
18b1d0a932
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-18 09:49:53 -04:00
Isaac Connor
dfe132caa1
Merge pull request #4139 from IgorA100/patch-641230
...
Changed double-click analysis on mobile devices, added double-click processing on MP4 images (video.js) (skin.js)
2024-09-18 09:42:07 -04:00
Isaac Connor
eb6d2bf5a6
Merge pull request #4136 from IgorA100/patch-5887
...
Feat: Progress bar now works when viewing MP4 via video.js on Event page
2024-09-18 09:40:07 -04:00
