506cdc5e66
Only show non-deleted monitors
2024-09-30 09:32:35 -04:00
3ed1eae9ce
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-30 09:08:56 -04:00
d19d1e3ada
Correct version, remove cambozola
2024-09-30 09:08:51 -04:00
4907937c4f
Bump version for vulnerability visibility
2024-09-30 09:08:11 -04:00
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
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
07fcb72e3b
Use the same filter on Storage Name as we use in Monitor Name.
2024-09-30 06:33:09 -04:00
97b7ae9c5f
Use htmlspecialchars on Message to prevent Stored Cross-Site Scripting. Fixes GHSA-rqxv-447h-g7jx
2024-09-30 06:23:22 -04:00
00baa36446
Merge pull request #4157 from IgorA100/patch-480012
...
Added missing function "thisClickOnTimeline" in skin.js
2024-09-30 06:02:07 -04:00
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
819812bbeb
Merge pull request #4156 from IgorA100/patch-455917
...
Fix: Changed the declaration of the variable "pix" (event.js)
2024-09-28 17:50:14 -04:00
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
3e320c59fd
Add missing )
2024-09-28 09:14:21 -04:00
33ede2f7d1
FIx floating point exception
2024-09-27 16:17:09 -04:00
c6e5ff43e7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-27 16:01:20 -04:00
2229e880b1
Add video.js support for av1
2024-09-27 16:00:53 -04:00
d1c140e0a1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-27 10:01:15 -04:00
3802ec17d3
Add test for 0 duration may fix floating point exceptions
2024-09-27 10:01:09 -04:00
0a069ee5cb
Merge pull request #4154 from IgorA100/patch-849650
...
Fix: Added declaration of variables "futNone, indexPlus" (event.js)
2024-09-27 08:41:53 -04:00
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
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
40f319cc8e
Fix map not loading
2024-09-26 16:13:34 -04:00
bcf076eb63
Merge pull request #4152 from IgorA100/patch-710662
...
Fix: Declared variable "spanTime" (event.js)
2024-09-26 09:40:06 -04:00
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
0ee28cad06
FIx command => streamCommand. Fixes #4150
2024-09-26 07:50:01 -04:00
d8cfce4c4a
INstead of the code in c9aa03d, just set updateScale.
2024-09-26 07:14:19 -04:00
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
0f2201d538
Fix eslint
2024-09-25 15:17:59 -04:00
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
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
e7d4fa334d
Initialize lastPTS and only set lastAudioPTS if the stream is audio.
2024-09-25 10:53:47 -04:00
564e521c8c
Fix eslint
2024-09-25 10:48:27 -04:00
a6db032301
Remove tools dir from .gitignore
2024-09-25 10:44:42 -04:00
d6f28f5c62
Update eslintignore to ignore bootstrap-table 1.23.3. Remove mootools reference
2024-09-25 10:44:28 -04:00
529c90dc3a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-25 10:35:48 -04:00
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
bf7920bad8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-24 19:30:47 -04:00
07d221569d
Let higher ups deal with non-video non-audio packets. Might fix a memleak
2024-09-24 19:30:30 -04:00
689881d105
Use monitorStream.play and pause instead of assuming zms
2024-09-24 17:29:21 -04:00
ab1b67893a
Remove unused getStream and watchdog stuff. When AYSW modal fires, pause cycle as well
2024-09-24 17:27:43 -04:00
d216c4cf47
Remove STATE_TAPE
2024-09-24 17:26:55 -04:00
37fef75eff
Handle 0 frame_mod
2024-09-24 17:23:23 -04:00
4af6e6eee0
Do not output anything to stdout when logging is happening when the db is closed.
2024-09-23 11:43:55 -04:00
d513451e3f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-23 10:13:22 -04:00
194337c247
Upgrade to bootstrap-table-1.23.3
2024-09-23 10:13:13 -04:00
53df3a69b7
Merge pull request #4149 from IgorA100/patch-87725
...
Fix: isOutOfViewport calculation of the block bottom for sticky mode & change calculation "out.all" on Montage page
2024-09-23 09:46:26 -04:00
016524b729
When resizing the browser window, execute "isOutOfViewport" (montage.js)
2024-09-23 13:41:56 +03:00
563a5450fd
Update montage.js
2024-09-23 13:19:18 +03:00
d53c509e73
Fix: isOutOfViewport calculation of the block bottom for sticky mode (montage.js)
2024-09-23 11:47:24 +03:00
da4636d11d
Make clean button always visible
2024-09-22 11:13:04 -04:00
Isaac Connor
Isaac Connor
IgorA100