19ea7339f4
set monitorStream gridstack
2024-10-01 17:23:03 -04:00
9555455c5d
Add defines for ANALYSING_NONE and ANALYSING_ALWAYS
2024-10-01 17:14:01 -04:00
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
4f03ce362d
Add analysing to stream data
2024-10-01 17:01:17 -04:00
045756c3fc
Remove obsolete ZM_WEB_RESIZE_CONSOLE
2024-10-01 16:29:22 -04:00
0780032149
Add score to monitorstream status
2024-10-01 16:28:56 -04:00
df5f76f43a
Improve logging, include event_id in TriggerOff
2024-10-01 13:40:37 -05:00
8592187288
Rough in an ajax interface for triggering
2024-10-01 12:19:03 -04:00
f0305072ef
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-01 12:18:27 -04:00
34e1512916
Add TRIGGER defines
2024-10-01 12:18:18 -04:00
eb117732a8
Rough in shm info and functions for triggering
2024-10-01 12:18:05 -04:00
5529d71a75
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-01 10:14:58 -04:00
100a321cf9
Fix ISE when auth is turned off.
2024-10-01 10:13:38 -04:00
0d3205c9eb
Update event.js
2024-10-01 13:32:12 +03:00
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
1f5ef16160
Move url declaration down to where it is used and remove old window.location code
2024-09-30 11:43:09 -04:00
506cdc5e66
Only show non-deleted monitors
2024-09-30 09:32:35 -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
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
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
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
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
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
564e521c8c
Fix eslint
2024-09-25 10:48:27 -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
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
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
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
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
42edacbc6b
Fix: Support STICKY mode for isOutOfViewport (montage.js)
2024-09-21 20:46:45 +03:00
2f013e0443
GIve event title an id, so we can update it
2024-09-21 09:42:44 -04:00
852af8ee98
Code cleanups, apply use strict, comments, update event title when switching events.
2024-09-21 09:42:31 -04:00
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
b5cec40955
Fix(events): Remember column visibility changes
2024-09-20 15:43:27 -04:00
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
c37d773eba
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-19 18:30:42 -04:00
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
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
18b1d0a932
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-18 09:49:53 -04:00
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
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
8c96d3004b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-18 09:33:49 -04:00
b5f393d960
prevent fatal php crash when maxfps is '' but forcing it to 0
2024-09-18 09:10:43 -04:00
334d840425
Restored accidentally deleted block (skin.css)
2024-09-18 15:04:40 +03:00
05f40a55f6
Merge branch 'master' into patch-167
2024-09-18 15:01:01 +03:00
d358d02987
Chore: Fix space (skin.js)
2024-09-18 14:56:34 +03:00
0eb916e748
Added fullscreen mode on double click on playing event when using MP4 (video.js) (event.js)
...
In addition to #4120
2024-09-18 14:51:59 +03:00
ca5911f551
Changed double-click analysis on mobile devices, added double-click processing on MP4 images (video.js) (skin.js)
2024-09-18 14:44:18 +03:00
0f37a71338
Removed redundant comments (skin.css)
2024-09-18 13:35:49 +03:00
6feffbaefa
Max height limit for .sticky #toolbar & .sticky #mfbpanel (skin.css)
2024-09-18 13:34:18 +03:00
52a5bf2a1f
Chore: Eslint (panzoom.js)
2024-09-18 12:30:04 +03:00
edf7f808b0
Fix: Panning didn't work when using "preventDefault" (panzoom.js)
...
This happened after PR #4137
When Scale panZoom > 1, you need to use "preventDefault" for Panning to work correctly. But at the same time (if Scale panZoom > 1), clicking on the progress bar generated by video.js will not work.
In principle, this is not critical, because when increasing, the progress bar generated by video.js usually goes beyond the visible boundaries.
2024-09-18 12:23:33 +03:00
328ce9fc0c
Make no Status record found a debug instead of warning
2024-09-17 11:17:50 -04:00
0ecb9a7754
Fix: Disabled preventDefault() when initializing PanZoom (panzoom.js)
2024-09-17 17:42:41 +03:00
1cda0a8723
Chore: code optimization (event.js)
2024-09-17 15:06:38 +03:00
6aa59d4170
Feat: Progress bar now works when viewing MP4 via video.js (event.js)
2024-09-17 14:55:57 +03:00
b59c2f564c
Chore: Remove extra space (panzoom.js)
2024-09-17 10:53:49 +03:00
6f50c7169e
Fix: When executing "setTouchAction: function(el)" check if the element is passed to the function (panzoom.js)
2024-09-17 10:51:57 +03:00
9f2c36be6e
Hide stream quality if using video tag
2024-09-16 14:15:38 -04:00
d99233782a
Add overflow hidden to timeline spans so that if locale format adds am/pm and the width is small it doesn't wrap.
2024-09-16 14:15:16 -04:00
8780a9cafc
Fix eslint
2024-09-16 13:45:00 -04:00
8565554b36
Fix missing }, implement getStream, add a check for 0 height
2024-09-16 09:24:50 -04:00
f25ced8410
Merge pull request #4133 from IgorA100/patch-498306
...
Fix: Don't specify "sizeToContent: true" when initializing GridStack on Montage page
2024-09-15 18:40:27 -04:00
e94448db8a
Run "setRatioForMonitor" before calling "initGridStack()" (montage.js)
...
Necessary for more correct sorting when calling "initGridStack()"
- Replaced the variable name "objLiveStream" with "objStream" in the "setRatioForMonitor" function
2024-09-15 23:18:10 +03:00
6d5bbfec85
Merge branch 'master' into patch-164
2024-09-15 13:23:33 +03:00
69156f2fb9
Don't specify "sizeToContent: true" when initializing GridStack (montage.js)
...
Additional verification is required, including on Custom layouts
Possible closure #4127
2024-09-15 01:29:15 +03:00
6b036f9e8a
Use an actual flag insead of begin and end comparison for when to output partial content because the partial code start from 0
2024-09-14 07:44:22 -04:00
c1da5e485f
Remove duplication of progressbar and videoFeedStream div
2024-09-14 07:44:22 -04:00
0ac755164b
Add margin between buttons.
2024-09-13 18:34:17 -04:00
6629e27f89
Don't do bulk frame calculation if we already have the exact frame wanted
2024-09-13 18:27:17 -04:00
2b1b38007a
Allow setting of layout in request
2024-09-13 15:44:32 -04:00
0ac7434590
Further deprecate ZM_BASE_URL. Ssee #3761
2024-09-13 09:54:41 -04:00
528b155714
Merge blocks of output_link_if_exists
2024-09-12 09:21:19 -04:00
9e9d47d8b7
Split xhtmlHeaders into Start and End functions so that views that want to include more css in the head can do so.
2024-09-11 12:02:03 -04:00
8120481d96
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-09 14:11:44 -04:00
d30a0ae3d2
Handle when no videos found a little more gracefully
2024-09-09 14:11:37 -04:00
a2e06fe846
Add missing const making js fail when deleting a rule
2024-09-09 11:25:28 -04:00
cf7e76e06f
Make button have line-height 18.5px, which makes them the same height as a button containing an md-18 material icon. This fixes the All Events button on the watch page not being the same height as the buttons next to it.
2024-09-09 10:58:39 -04:00
19882b0625
Added Japanese translation of placeholders.
2024-09-09 02:10:30 +00:00
11ddfc0e49
Fix spelling mistake
2024-09-06 17:19:51 -04:00
0f722c11fc
Notes can be null and should not be passed to htmlspecialchars
2024-09-06 15:00:46 -04:00
fe18e01856
Add title to timeline toggle button
2024-09-06 12:06:51 -04:00
80b000cb2a
Only start stream on scroll if not already started
2024-09-06 09:34:13 -04:00
2ca08fb546
Track started state for RTSP2Web and Janus as well
2024-09-06 09:33:55 -04:00
5906896ee1
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-06 09:27:05 -04:00
e3dfcffd00
When becoming visible, only start visible monitors
2024-09-06 09:27:00 -04:00
30e6ad0118
Merge pull request #4126 from designet-inc-oss/translate_lang_ja
...
Update Japanese translation file.
2024-09-06 09:18:39 -04:00
152e77adc0
Apply a max-width of 300px to monitor filters so that they all fit on one line on 1920px monitor
2024-09-05 09:23:12 -04:00
c45a2af08b
Revert lack of src tag on event image
2024-09-05 09:18:41 -04:00
08d2f44613
Allow further query parameters after view in HomeView
2024-09-04 16:52:59 -04:00
ade2f2e0c7
Fix eslint
2024-09-03 14:59:16 -04:00
7f2b95b387
Implement onscroll and ability to detect when a stream is off-screen. Only start visible monitors.
2024-09-03 14:56:33 -04:00
b64461d518
Merge branch 'master' into only_stream_visible
2024-09-03 14:51:36 -04:00
2df332a4d0
Use const/let instead of var and apply use strict
2024-09-03 10:14:49 -04:00
b0735e22b0
Fix execute text input flow
2024-09-03 10:14:29 -04:00
b66e04024f
Test for Path being empty to avoid warnings about passing null being deprecated
2024-09-03 09:39:03 -04:00
5bf2432b2f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-09-01 18:00:55 -04:00
13042f13bf
Fix periods to underscores in cookie and use COOKIE instead of COOKIES. Should fix defaulting pageSize to ZM_WEB_EVENTS_PER_PAGE
2024-09-01 18:00:44 -04:00
2ebdc06405
Update Japanese translation file.
2024-08-30 01:21:04 +00:00
e910259db0
Merge pull request #4122 from IgorA100/patch-165
...
Feat: Added support for full screen when double clicking on Stream on Watch page
2024-08-27 09:55:03 -04:00
c9817824d4
Fixed handling on Event page (skin.js)
2024-08-24 11:47:38 +03:00
634d718359
".sticky #mfbpanel" height no more than 40% of the screen (skin.css)
...
Relevant for mobile devices.
2024-08-23 23:40:44 +03:00
713b8f8bce
Added style for buttons (skin.css)
...
For montage page:
button.btn.btn-view-watch
button.btn.btn-fullscreen
2024-08-23 17:34:26 +03:00
7002f11b72
Moved styles for Control button block in the Stream image to global skin.css from montage.css
2024-08-23 17:30:57 +03:00
4d50977274
Moved styles for Control button block in the Stream image to global skin.css from watch.css
2024-08-23 17:23:04 +03:00
0ade8d634a
Moved styles for Control button block in the Stream image to global skin.css from event.css
2024-08-23 17:16:54 +03:00
c3ecec057a
Moved here styles for Control button block in the Stream image (skin.css)
2024-08-23 17:12:56 +03:00
7956c38e86
Remove extra space (watch.js)
2024-08-23 16:05:45 +03:00
28a1338299
Feat: Added support for full screen when double clicking on Stream on Watch page (watch.js)
...
Similar to #4120
2024-08-23 16:03:57 +03:00
316ca0b1da
Removed extra space (montage.js)
2024-08-23 15:52:05 +03:00
4fb5c228cf
Buttons are no larger than 100px, otherwise they are large when viewed full-screen (skin.js)
2024-08-23 15:49:47 +03:00
61d177ded7
Execute monitorsSetScale() when changing the size of "#liveStreamX" (watch.js)
2024-08-23 15:44:36 +03:00
2d37c9a309
It is necessary to change the height position "#ratioControl" (montage.js)
2024-08-23 15:03:08 +03:00
685a59fa78
Added scaling of buttons (Zoom, Edit, etc.) controls located on the Stream depending on the width of the Stream (watch.js)
2024-08-23 11:49:40 +03:00
ac841c55c7
Added scaling of buttons (Zoom, Edit, etc.) controls located on the Stream depending on the width of the Stream (event.js)
2024-08-23 11:45:36 +03:00
9d7569d31d
Added scaling of buttons (Zoom, Edit, etc.) controls located on the Stream depending on the width of the Stream (montage.js)
2024-08-23 11:44:26 +03:00
aed3c3be4b
Faet: Added a function to scale control buttons located on the Stream depending on the width of the Stream (skin.js)
2024-08-23 11:37:41 +03:00
1e4bb4798e
Update auth in zms url when scaling as it may have been running for a while and need updating
2024-08-22 14:57:28 -04:00
4f59d15972
Fix: Image scaling for some mobile devices in fullscreen mode (skin.js)
2024-08-22 13:52:03 +03:00
4911e962fa
Chore: Fix space & semi (skin.js)
2024-08-22 12:19:11 +03:00
79c8042b85
Added event listener for double click (event.js)
2024-08-22 12:11:09 +03:00
ff0367d3a2
Feat: Added functions for full screen when double clicking on Stream (skin.js)
2024-08-22 11:57:00 +03:00
0717a2d324
Chore: Removed extra spaces (panzoom.js)
2024-08-20 13:07:00 +03:00
f2323426a0
chore: remove console.log (panzoom.js)
2024-08-20 13:03:08 +03:00
b0511e31fa
chore: Enable "touchAction" if Zoom=1 and disable if Zoom<>1 (panzoom.js)
...
Enable "touchAction" if Zoom=1 and disable if Zoom<>1
This will allow canvas panning when capturing an image on mobile devices with Zoom=1
The issue may be closed: https://forums.zoneminder.com/viewtopic.php?p=135128&sid=7e7685052e5f107a364dfd445565643f#p135128
2024-08-20 12:53:23 +03:00
e65d3be4da
Merge pull request #4096 from IgorA100/patch-160
...
Chore: Code optimization (skin.js)
2024-08-19 19:16:25 -04:00
0ded4b8a12
Merge pull request #4094 from IgorA100/patch-158
...
Updated language pack (ru_ru, en_gb)
2024-08-19 19:15:57 -04:00
802a0854b5
Add getAnalysingStrings and getRecordingStrings and fix getStatusStrings, removing Tape
2024-08-18 12:18:44 -04:00
2a7030beac
Remove STATE_TAPE. It no longer exists
2024-08-18 12:18:44 -04:00
c8cce78669
Add a filter flip button to show/hide the filters
2024-08-16 18:48:50 -04:00
Isaac Connor
IPC
IgorA100
Isaac Connor
Simpler1
DesigNET